archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

removed unused css, merged some css, etc...

Browse source 
git-svn-id: http://piwigo.org/svn/trunk@13801 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices 2012-03-29 19:34:00 +00:00
commit 0929426813
7 changed files with 45 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

7
themes/Sylvia/theme.css
View file

@ -285,11 +285,11 @@
.content .commentElement.even { .content .commentElement.even {
background-color: #111; background-color: #111;
} }
.content .commentElement div.illustration { .content .commentElement .illustration {
padding: 0 0 0 10px; padding: 0 0 0 10px;
margin: 0 !important; margin: 0 !important;
} }
.content .commentElement div.illustration a { .content .commentElement .illustration a {
display: block; display: block;
margin: 0; margin: 0;
padding:20px 0 0 8px; padding:20px 0 0 8px;
@ -355,9 +355,6 @@
padding: 15px 2px 6px 12px; padding: 15px 2px 6px 12px;
border: 1px solid #666; border: 1px solid #666;
} }
#thePicturePage .commentElement .date, #thePicturePage .commentElementy .author {
font-weight:bold;
}
#thePicturePage .commentsList { #thePicturePage .commentsList {
padding-left: 12px; padding-left: 12px;
padding-right: 12px; padding-right: 12px;

2
themes/default/local_head.tpl
View file

@ -7,5 +7,3 @@
<![endif]--> <![endif]-->
{combine_css path="themes/default/print.css" order=-10} {combine_css path="themes/default/print.css" order=-10}
{/if} {/if}
{if !isset($MENUBAR)}<style type="text/css">.content {ldelim} margin-left:auto !important; }</style>{/if}

12
themes/default/template/comment_list.tpl
View file

@ -1,18 +1,17 @@
{if isset($comment_derivative_params)} {if isset($comment_derivative_params)}
{strip}{html_style} {strip}{html_style}
.commentElement DIV.illustration{ldelim} .commentElement .illustration{ldelim}
width: {$comment_derivative_params->max_width()+5}px; width: {$comment_derivative_params->max_width()+5}px
} }
.content .commentElement .description{ldelim} .content .commentElement .description{ldelim}
height: {$comment_derivative_params->max_height()+5}px; height: {$comment_derivative_params->max_height()+5}px
} }
{/html_style}{/strip} {/html_style}{/strip}
{/if} {/if}
<ul class="commentsList"> <ul class="commentsList">
{foreach from=$comments item=comment name=comment_loop} {foreach from=$comments item=comment name=comment_loop}
<li> <li class="commentElement {if $smarty.foreach.comment_loop.index is odd}odd{else}even{/if}">
<div class="commentElement {if $smarty.foreach.comment_loop.index is odd}odd{else}even{/if}">
{if isset($comment.src_image)} {if isset($comment.src_image)}
<div class="illustration"> <div class="illustration">
<a href="{$comment.U_PICTURE}"> <a href="{$comment.U_PICTURE}">
@ -41,7 +40,7 @@
</div> </div>
{/if} {/if}
<span class="author">{$comment.AUTHOR}</span> - <span class="date">{$comment.DATE}</span> <span class="commentAuthor">{$comment.AUTHOR}</span> - <span class="commentDate">{$comment.DATE}</span>
{if isset($comment.IN_EDIT)} {if isset($comment.IN_EDIT)}
<a name="edit_comment"></a> <a name="edit_comment"></a>
<form method="post" action="{$comment.U_EDIT}" class="filter" id="editComment"> <form method="post" action="{$comment.U_EDIT}" class="filter" id="editComment">
@ -57,7 +56,6 @@
<blockquote><div>{$comment.CONTENT}</div></blockquote> <blockquote><div>{$comment.CONTENT}</div></blockquote>
{/if} {/if}
</div> </div>
</div>
</li> </li>
{/foreach} {/foreach}
</ul> </ul>

24
themes/default/template/picture.tpl
View file

@ -138,10 +138,10 @@ y.callService(
</p> </p>
{/if} {/if}
</div><!-- </div>
--><div id="infoSwitcher"></div><!-- <div id="infoSwitcher"></div>
--><div id="imageInfos"> <div id="imageInfos">
{if $DISPLAY_NAV_THUMB} {if $DISPLAY_NAV_THUMB}
<div class="navThumbs"> <div class="navThumbs">
{if isset($previous)} {if isset($previous)}
@ -159,7 +159,7 @@ y.callService(
</div> </div>
{/if} {/if}
<dl id="standard" class="imageInfoTable infoTable"> <dl id="standard" class="imageInfoTable">
{strip} {strip}
{if $display_info.author and isset($INFO_AUTHOR)} {if $display_info.author and isset($INFO_AUTHOR)}
<div id="Author" class="imageInfo"> <div id="Author" class="imageInfo">
@ -277,8 +277,8 @@ y.callService(
<div id="Privacy" class="imageInfo"><div class="relSwitchBox"> <div id="Privacy" class="imageInfo"><div class="relSwitchBox">
<dt><a id="privacyLevelLink" href="javascript:togglePrivacyLevelBox()">{'Who can see this photo?'|@translate}</a></dt> <dt><a id="privacyLevelLink" href="javascript:togglePrivacyLevelBox()">{'Who can see this photo?'|@translate}</a></dt>
<dd> <dd>
{combine_script id='core.scripts' require='jquery' load='async' path='themes/default/js/scripts.js'} {combine_script id='core.scripts' load='async' path='themes/default/js/scripts.js'}
{footer_script} {footer_script require='jquery'}
{literal}function setPrivacyLevel(rootUrl, id, level) {literal}function setPrivacyLevel(rootUrl, id, level)
{ {
var y = new PwgWS(rootUrl); var y = new PwgWS(rootUrl);
@ -324,7 +324,7 @@ function togglePrivacyLevelBox()
</dl> </dl>
{if isset($metadata)} {if isset($metadata)}
<dl id="Metadata" class="imageInfoTable infoTable2"> <dl id="Metadata" class="imageInfoTable">
{foreach from=$metadata item=meta} {foreach from=$metadata item=meta}
<h3>{$meta.TITLE}</h3> <h3>{$meta.TITLE}</h3>
{foreach from=$meta.lines item=value key=label} {foreach from=$meta.lines item=value key=label}
@ -341,23 +341,19 @@ function togglePrivacyLevelBox()
{if isset($COMMENT_COUNT)} {if isset($COMMENT_COUNT)}
<div id="comments" {if (!isset($comment_add) && ($COMMENT_COUNT == 0))}class="noCommentContent"{else}class="commentContent"{/if}><div id="commentsSwitcher"></div> <div id="comments" {if (!isset($comment_add) && ($COMMENT_COUNT == 0))}class="noCommentContent"{else}class="commentContent"{/if}><div id="commentsSwitcher"></div>
{if $COMMENT_COUNT > 0}
<h3>{$pwg->l10n_dec('%d comment', '%d comments',$COMMENT_COUNT)}</h3> <h3>{$pwg->l10n_dec('%d comment', '%d comments',$COMMENT_COUNT)}</h3>
{else}
<h3><span class="noCommentText">{$pwg->l10n_dec('%d comment', '%d comments',$COMMENT_COUNT)}</span></h3>
{/if}
<div id="pictureComments"> <div id="pictureComments">
{if isset($comment_add)} {if isset($comment_add)}
<div id="commentAdd"> <div id="commentAdd">
<h4>{'Add a comment'|@translate}</h4> <h4>{'Add a comment'|@translate}</h4>
<form method="post" action="{$comment_add.F_ACTION}" class="filter" id="addComment" > <form method="post" action="{$comment_add.F_ACTION}" id="addComment" >
{if $comment_add.SHOW_AUTHOR} {if $comment_add.SHOW_AUTHOR}
<p><label>{'Author'|@translate}&nbsp;:</label></p> <p><label>{'Author'|@translate}&nbsp;:</label></p>
<p><input type="text" name="author" /></p> <p><input type="text" name="author" /></p>
{/if}
<p><label>{'Comment'|@translate}&nbsp;:</label></p> <p><label>{'Comment'|@translate}&nbsp;:</label></p>
<p><textarea name="content" id="contentid" rows="10" cols="50">{$comment_add.CONTENT}</textarea></p> {/if}
<p><textarea name="content" id="contentid" rows="5" cols="50">{$comment_add.CONTENT}</textarea></p>
<p><input type="hidden" name="key" value="{$comment_add.KEY}" /> <p><input type="hidden" name="key" value="{$comment_add.KEY}" />
<input class="submit" type="submit" value="{'Submit'|@translate}"></p> <input class="submit" type="submit" value="{'Submit'|@translate}"></p>
</form> </form>

8
themes/default/template/picture_nav_buttons.tpl
View file

@ -30,7 +30,7 @@
<span class="pwg-icon pwg-icon-repeat-stop">&nbsp;</span><span class="pwg-button-text">{'Not repeat the slideshow'|@translate}</span> <span class="pwg-icon pwg-icon-repeat-stop">&nbsp;</span><span class="pwg-button-text">{'Not repeat the slideshow'|@translate}</span>
</a> </a>
{/if} {/if}
<!--{strip}{if isset($first)} {*<!--{strip}{if isset($first)}
<a href="{$first.U_IMG}" title="{'First'|@translate} : {$first.TITLE}" class="pwg-state-default pwg-button"> <a href="{$first.U_IMG}" title="{'First'|@translate} : {$first.TITLE}" class="pwg-state-default pwg-button">
<span class="pwg-icon pwg-icon-arrowstop-w">&nbsp;</span><span class="pwg-button-text">{'First'|@translate}</span> <span class="pwg-icon pwg-icon-arrowstop-w">&nbsp;</span><span class="pwg-button-text">{'First'|@translate}</span>
</a> </a>
@ -38,7 +38,7 @@
<span class="pwg-state-disabled pwg-button"> <span class="pwg-state-disabled pwg-button">
<span class="pwg-icon pwg-icon-arrowstop-w">&nbsp;</span><span class="pwg-button-text">{'First'|@translate}</span> <span class="pwg-icon pwg-icon-arrowstop-w">&nbsp;</span><span class="pwg-button-text">{'First'|@translate}</span>
</span> </span>
{/if}{/strip}--> {/if}{/strip}-->*}
{strip}{if isset($previous)} {strip}{if isset($previous)}
<a href="{$previous.U_IMG}" title="{'Previous'|@translate} : {$previous.TITLE}" class="pwg-state-default pwg-button"> <a href="{$previous.U_IMG}" title="{'Previous'|@translate} : {$previous.TITLE}" class="pwg-state-default pwg-button">
<span class="pwg-icon pwg-icon-arrow-w">&nbsp;</span><span class="pwg-button-text">{'Previous'|@translate}</span> <span class="pwg-icon pwg-icon-arrow-w">&nbsp;</span><span class="pwg-button-text">{'Previous'|@translate}</span>
@ -72,7 +72,7 @@
<span class="pwg-icon pwg-icon-arrow-e">&nbsp;</span><span class="pwg-button-text">{'Next'|@translate}</span> <span class="pwg-icon pwg-icon-arrow-e">&nbsp;</span><span class="pwg-button-text">{'Next'|@translate}</span>
</span> </span>
{/if}{/strip} {/if}{/strip}
<!--{strip}{if isset($last)} {*<!--{strip}{if isset($last)}
<a href="{$last.U_IMG}" title="{'Last'|@translate} : {$last.TITLE}" class="pwg-state-default pwg-button pwg-button-icon-right"> <a href="{$last.U_IMG}" title="{'Last'|@translate} : {$last.TITLE}" class="pwg-state-default pwg-button pwg-button-icon-right">
<span class="pwg-icon pwg-icon-arrowstop-e"></span><span class="pwg-button-text">{'Last'|@translate}</span> <span class="pwg-icon pwg-icon-arrowstop-e"></span><span class="pwg-button-text">{'Last'|@translate}</span>
</a> </a>
@ -80,7 +80,7 @@
<span class="pwg-state-disabled pwg-button pwg-button-icon-right"> <span class="pwg-state-disabled pwg-button pwg-button-icon-right">
<span class="pwg-icon pwg-icon-arrowstop-e">&nbsp;</span><span class="pwg-button-text">{'Last'|@translate}</span> <span class="pwg-icon pwg-icon-arrowstop-e">&nbsp;</span><span class="pwg-button-text">{'Last'|@translate}</span>
</span> </span>
{/if}{/strip}--> {/if}{/strip}-->*}
{/if} {/if}
</div> </div>
{strip} {strip}

54
themes/default/theme.css
View file

@ -269,30 +269,19 @@ TD.calDayHead {
width: 100%; width: 100%;
} }
.commentsList LI { .commentElement {
margin: 0; margin: 5px;
padding: 0; padding: 2px 0 0 2px;
float: left; float: left;
width:99%; width:99%;
} }
.commentElement {
display:block;
padding: 2px 0 0 2px;
margin: 5px;
}
.commentElement .description { .commentElement .description {
font-size: 100%;
overflow: auto; overflow: auto;
/*width: inherit;*/ /*width: inherit;*/
} }
.commentElement .description P { .commentElement .illustration {
margin: 0;
}
.commentElement DIV.illustration {
text-align: left; text-align: left;
margin: 2px 0 0 2px; margin: 2px 0 0 2px;
float: left; float: left;
@ -411,13 +400,7 @@ TD.calDayHead {
margin: 5px 5px 0 10px; margin: 5px 5px 0 10px;
} }
.infoTable .label { .imageInfoTable UL { /*this is the album list*/
font-weight: bold;
text-align: right;
padding-right: 0.5em;
}
.infoTable UL {
margin: 0; margin: 0;
padding: 0 0 0 1em; padding: 0 0 0 1em;
list-style-type: square; list-style-type: square;
@ -452,8 +435,6 @@ TD.calDayHead {
clear: none; clear: none;
} }
.noCommentText {display:none;}
/** /**
* Default Layout * Default Layout
*/ */
@ -824,30 +805,27 @@ LEGEND {
#commentAdd input[type="text"], #commentAdd input[type="text"],
#commentAdd textarea { #commentAdd textarea {
min-width: 100%;
max-width: 100%; max-width: 100%;
width: 100%; width: 100%;
font-family: Arial,Helvetica,sans-serif;
font-size: 100%;
} }
#pictureCommentList li {
clear: both; #pictureCommentList .commentElement {
display: block;
padding: 0.5em 0;
margin-bottom: 5px;
border-radius: 5px; border-radius: 5px;
width: 100%;
} }
#pictureCommentList ul { list-style: none; padding: 0;}
#pictureCommentList li ul { list-style-type: none; padding: 4px;} .commentAuthor {
#pictureCommentList .author { font-weight: bold;} font-weight: bold;
#pictureCommentList .date { font-style: italic;} }
.commentDate {
font-style: italic
}
#pictureCommentList .commentsOrder { float: left; margin-bottom: 5px;} #pictureCommentList .commentsOrder { float: left; margin-bottom: 5px;}
#pictureCommentList .navigationBar { float: right; margin-bottom: 5px;} #pictureCommentList .navigationBar { float: right; margin-bottom: 5px;}
#pictureComments h4 { margin: 0;} #pictureComments h4 { margin: 0;}
#pictureComments form p { margin: 5px 0; text-align: left;} #pictureComments form p { margin: 5px 0; text-align: left;}
#pictureComments form p textarea { margin: 10px 0;} #pictureComments form p textarea { margin: 10px 0;}
#pictureComments INPUT { margin: 10px;}
#pictureComments INPUT[type=submit] { margin: 0;} #pictureComments INPUT[type=submit] { margin: 0;}
/* image info table */ /* image info table */

19
themes/elegant/theme.css
View file

@ -11,11 +11,10 @@ html, body { background-color: #111;}
#imageInfos, #infoSwitcher.infohidden { background-color: #333;} #imageInfos, #infoSwitcher.infohidden { background-color: #333;}
#thePicturePage #comments { background-color: #333;} #thePicturePage #comments { background-color: #333;}
#pictureCommentList li { background-color: #444;} #pictureCommentList li { background-color: #444;}
#pictureCommentList .commentElement { background-color: transparent;}
.calendarTitle { background-color: #222;} .calendarTitle { background-color: #222;}
.switchBox, .header_notes { background-color: #555;} .switchBox, .header_notes { background-color: #555;}
.thumbnailCategory, .commentElement { background-color: #333;} .thumbnailCategory { background-color: #333;}
.message { background-color: #666;} .message { background-color: #666;}
INPUT[type="text"], INPUT[type="password"], INPUT[type="text"], INPUT[type="password"],
@ -162,7 +161,7 @@ a:hover { border-bottom: none;}
#thumbnails { padding-top: 5px;} #thumbnails { padding-top: 5px;}
.thumbnails IMG { margin-bottom: 0; vertical-align: middle;} .thumbnails IMG { margin-bottom: 0; vertical-align: middle;}
.thumbnailCategory DIV.illustration, .thumbnailCategory DIV.illustration,
.commentElement DIV.illustration { margin: 2px; text-align: center;} .commentElement .illustration { margin: 2px; text-align: center;}
/* picture page */ /* picture page */
@ -238,7 +237,6 @@ a:hover { border-bottom: none;}
#thePicturePage #comments form { margin: 10px 0;} #thePicturePage #comments form { margin: 10px 0;}
#thePicturePage #comments fieldset { margin: 0 1em;} #thePicturePage #comments fieldset { margin: 0 1em;}
.noCommentText { display:block;}
.commentshidden #pictureComments { display: none;} .commentshidden #pictureComments { display: none;}
.commentContent .comments_toggle { cursor: pointer;} .commentContent .comments_toggle { cursor: pointer;}
@ -254,18 +252,7 @@ a:hover { border-bottom: none;}
font-family: Arial,Helvetica,sans-serif; font-family: Arial,Helvetica,sans-serif;
font-size: 100%; font-size: 100%;
} }
#pictureCommentList li {
clear: both;
display: block;
padding: 0.5em 0;
margin-bottom: 5px;
border-radius: 5px;
width: 100%;
}
#pictureCommentList ul { list-style: none; padding: 0;}
#pictureCommentList li ul { list-style-type: none; padding: 4px;}
#pictureCommentList .author { font-weight: bold;}
#pictureCommentList .date { font-style: italic;}
#pictureCommentList .commentsOrder { float: left; margin-bottom: 5px;} #pictureCommentList .commentsOrder { float: left; margin-bottom: 5px;}
#pictureCommentList .navigationBar { float: right; margin-bottom: 5px;} #pictureCommentList .navigationBar { float: right; margin-bottom: 5px;}
#pictureComments h4 { margin: 0;} #pictureComments h4 { margin: 0;}