diff options
| -rw-r--r-- | themes/Sylvia/theme.css | 7 | ||||
| -rw-r--r-- | themes/default/local_head.tpl | 2 | ||||
| -rw-r--r-- | themes/default/template/comment_list.tpl | 12 | ||||
| -rw-r--r-- | themes/default/template/picture.tpl | 34 | ||||
| -rw-r--r-- | themes/default/template/picture_nav_buttons.tpl | 8 | ||||
| -rw-r--r-- | themes/default/theme.css | 54 | ||||
| -rw-r--r-- | themes/elegant/theme.css | 19 |
7 files changed, 45 insertions, 91 deletions
diff --git a/themes/Sylvia/theme.css b/themes/Sylvia/theme.css index e4e892a62..a016ca354 100644 --- a/themes/Sylvia/theme.css +++ b/themes/Sylvia/theme.css @@ -285,11 +285,11 @@ .content .commentElement.even { background-color: #111; } -.content .commentElement div.illustration { +.content .commentElement .illustration { padding: 0 0 0 10px; margin: 0 !important; } -.content .commentElement div.illustration a { +.content .commentElement .illustration a { display: block; margin: 0; padding:20px 0 0 8px; @@ -355,9 +355,6 @@ padding: 15px 2px 6px 12px; border: 1px solid #666; } -#thePicturePage .commentElement .date, #thePicturePage .commentElementy .author { - font-weight:bold; -} #thePicturePage .commentsList { padding-left: 12px; padding-right: 12px; diff --git a/themes/default/local_head.tpl b/themes/default/local_head.tpl index 38bb4ec0e..2ff76b316 100644 --- a/themes/default/local_head.tpl +++ b/themes/default/local_head.tpl @@ -7,5 +7,3 @@ <![endif]--> {combine_css path="themes/default/print.css" order=-10} {/if} - -{if !isset($MENUBAR)}<style type="text/css">.content {ldelim} margin-left:auto !important; }</style>{/if}
\ No newline at end of file diff --git a/themes/default/template/comment_list.tpl b/themes/default/template/comment_list.tpl index 315cbfe07..b73cc39e2 100644 --- a/themes/default/template/comment_list.tpl +++ b/themes/default/template/comment_list.tpl @@ -1,18 +1,17 @@ {if isset($comment_derivative_params)} {strip}{html_style} -.commentElement DIV.illustration{ldelim} - width: {$comment_derivative_params->max_width()+5}px; +.commentElement .illustration{ldelim} + width: {$comment_derivative_params->max_width()+5}px } .content .commentElement .description{ldelim} - height: {$comment_derivative_params->max_height()+5}px; + height: {$comment_derivative_params->max_height()+5}px } {/html_style}{/strip} {/if} <ul class="commentsList"> {foreach from=$comments item=comment name=comment_loop} -<li> - <div class="commentElement {if $smarty.foreach.comment_loop.index is odd}odd{else}even{/if}"> +<li class="commentElement {if $smarty.foreach.comment_loop.index is odd}odd{else}even{/if}"> {if isset($comment.src_image)} <div class="illustration"> <a href="{$comment.U_PICTURE}"> @@ -41,7 +40,7 @@ </div> {/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)} <a name="edit_comment"></a> <form method="post" action="{$comment.U_EDIT}" class="filter" id="editComment"> @@ -57,7 +56,6 @@ <blockquote><div>{$comment.CONTENT}</div></blockquote> {/if} </div> - </div> </li> {/foreach} </ul> diff --git a/themes/default/template/picture.tpl b/themes/default/template/picture.tpl index 723c0bc8c..ee96dac63 100644 --- a/themes/default/template/picture.tpl +++ b/themes/default/template/picture.tpl @@ -58,7 +58,7 @@ jQuery("#derivativeSwitchBox").on('mouseleave click', function() { <div id="derivativeSwitchBox" class="switchBox" style="display:none"> <div class="switchBoxTitle">{'Photo sizes'|@translate}</div> {foreach from=$current.unique_derivatives item=derivative key=derivative_type} -<span class="switchCheck" id="derivativeChecked{$derivative_type}"{if $derivative->get_type() ne $current.selected_derivative->get_type()} style="visibility:hidden"{/if}>✔ </span> +<span class="switchCheck" id="derivativeChecked{$derivative_type}"{if $derivative->get_type() ne $current.selected_derivative->get_type()} style="visibility:hidden"{/if}>✔ </span> <a href="javascript:changeImgSrc('{$derivative->get_url()|@escape:javascript}','{$derivative_type}','{$derivative->get_type()}')"> {$derivative->get_type()|@translate}<span class="derivativeSizeDetails"> ({$derivative->get_size_hr()})</span> </a><br> @@ -138,10 +138,10 @@ y.callService( </p> {/if} -</div><!-- +</div> ---><div id="infoSwitcher"></div><!-- ---><div id="imageInfos"> +<div id="infoSwitcher"></div> +<div id="imageInfos"> {if $DISPLAY_NAV_THUMB} <div class="navThumbs"> {if isset($previous)} @@ -159,7 +159,7 @@ y.callService( </div> {/if} -<dl id="standard" class="imageInfoTable infoTable"> +<dl id="standard" class="imageInfoTable"> {strip} {if $display_info.author and isset($INFO_AUTHOR)} <div id="Author" class="imageInfo"> @@ -277,8 +277,8 @@ y.callService( <div id="Privacy" class="imageInfo"><div class="relSwitchBox"> <dt><a id="privacyLevelLink" href="javascript:togglePrivacyLevelBox()">{'Who can see this photo?'|@translate}</a></dt> <dd> -{combine_script id='core.scripts' require='jquery' load='async' path='themes/default/js/scripts.js'} -{footer_script} +{combine_script id='core.scripts' load='async' path='themes/default/js/scripts.js'} +{footer_script require='jquery'} {literal}function setPrivacyLevel(rootUrl, id, level) { var y = new PwgWS(rootUrl); @@ -309,7 +309,7 @@ function togglePrivacyLevelBox() } {/literal} {/footer_script} - + <div id="privacyLevelBox" class="switchBox" onclick="togglePrivacyLevelBox()" style="display:none" onmouseout="e=event.toElement||event.relatedTarget;e.parentNode==this||e==this||togglePrivacyLevelBox()"> {foreach from=$available_permission_levels item=label key=level} <span id="levelCheck{$level}" class="switchCheck" {if $level != $current.level} style="visibility:hidden"{/if}>✔ </span> @@ -324,7 +324,7 @@ function togglePrivacyLevelBox() </dl> {if isset($metadata)} -<dl id="Metadata" class="imageInfoTable infoTable2"> +<dl id="Metadata" class="imageInfoTable"> {foreach from=$metadata item=meta} <h3>{$meta.TITLE}</h3> {foreach from=$meta.lines item=value key=label} @@ -341,25 +341,21 @@ function togglePrivacyLevelBox() {if isset($COMMENT_COUNT)} <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> - {else} - <h3><span class="noCommentText">{$pwg->l10n_dec('%d comment', '%d comments',$COMMENT_COUNT)}</span></h3> - {/if} - + <h3>{$pwg->l10n_dec('%d comment', '%d comments',$COMMENT_COUNT)}</h3> + <div id="pictureComments"> {if isset($comment_add)} <div id="commentAdd"> <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} <p><label>{'Author'|@translate} :</label></p> <p><input type="text" name="author" /></p> + <p><label>{'Comment'|@translate} :</label></p> {/if} - <p><label>{'Comment'|@translate} :</label></p> - <p><textarea name="content" id="contentid" rows="10" cols="50">{$comment_add.CONTENT}</textarea></p> + <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}" /> - <input class="submit" type="submit" value="{'Submit'|@translate}"></p> + <input class="submit" type="submit" value="{'Submit'|@translate}"></p> </form> </div> {/if} diff --git a/themes/default/template/picture_nav_buttons.tpl b/themes/default/template/picture_nav_buttons.tpl index 921a1de81..e6b2a1e1f 100644 --- a/themes/default/template/picture_nav_buttons.tpl +++ b/themes/default/template/picture_nav_buttons.tpl @@ -30,7 +30,7 @@ <span class="pwg-icon pwg-icon-repeat-stop"> </span><span class="pwg-button-text">{'Not repeat the slideshow'|@translate}</span> </a> {/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"> <span class="pwg-icon pwg-icon-arrowstop-w"> </span><span class="pwg-button-text">{'First'|@translate}</span> </a> @@ -38,7 +38,7 @@ <span class="pwg-state-disabled pwg-button"> <span class="pwg-icon pwg-icon-arrowstop-w"> </span><span class="pwg-button-text">{'First'|@translate}</span> </span> -{/if}{/strip}--> +{/if}{/strip}-->*} {strip}{if isset($previous)} <a href="{$previous.U_IMG}" title="{'Previous'|@translate} : {$previous.TITLE}" class="pwg-state-default pwg-button"> <span class="pwg-icon pwg-icon-arrow-w"> </span><span class="pwg-button-text">{'Previous'|@translate}</span> @@ -72,7 +72,7 @@ <span class="pwg-icon pwg-icon-arrow-e"> </span><span class="pwg-button-text">{'Next'|@translate}</span> </span> {/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"> <span class="pwg-icon pwg-icon-arrowstop-e"></span><span class="pwg-button-text">{'Last'|@translate}</span> </a> @@ -80,7 +80,7 @@ <span class="pwg-state-disabled pwg-button pwg-button-icon-right"> <span class="pwg-icon pwg-icon-arrowstop-e"> </span><span class="pwg-button-text">{'Last'|@translate}</span> </span> -{/if}{/strip}--> +{/if}{/strip}-->*} {/if} </div> {strip} diff --git a/themes/default/theme.css b/themes/default/theme.css index ab418542b..f04d37679 100644 --- a/themes/default/theme.css +++ b/themes/default/theme.css @@ -269,30 +269,19 @@ TD.calDayHead { width: 100%; } -.commentsList LI { - margin: 0; - padding: 0; - float: left; - width:99%; -} - .commentElement { - display:block; - padding: 2px 0 0 2px; margin: 5px; + padding: 2px 0 0 2px; + float: left; + width:99%; } .commentElement .description { - font-size: 100%; overflow: auto; /*width: inherit;*/ } -.commentElement .description P { - margin: 0; -} - -.commentElement DIV.illustration { +.commentElement .illustration { text-align: left; margin: 2px 0 0 2px; float: left; @@ -411,13 +400,7 @@ TD.calDayHead { margin: 5px 5px 0 10px; } -.infoTable .label { - font-weight: bold; - text-align: right; - padding-right: 0.5em; -} - -.infoTable UL { +.imageInfoTable UL { /*this is the album list*/ margin: 0; padding: 0 0 0 1em; list-style-type: square; @@ -452,8 +435,6 @@ TD.calDayHead { clear: none; } -.noCommentText {display:none;} - /** * Default Layout */ @@ -824,30 +805,27 @@ LEGEND { #commentAdd input[type="text"], #commentAdd textarea { - min-width: 100%; max-width: 100%; width: 100%; - font-family: Arial,Helvetica,sans-serif; - font-size: 100%; } -#pictureCommentList li { - clear: both; - display: block; - padding: 0.5em 0; - margin-bottom: 5px; + +#pictureCommentList .commentElement { 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;} + +.commentAuthor { + font-weight: bold; +} + +.commentDate { + font-style: italic +} + #pictureCommentList .commentsOrder { float: left; margin-bottom: 5px;} #pictureCommentList .navigationBar { float: right; margin-bottom: 5px;} #pictureComments h4 { margin: 0;} #pictureComments form p { margin: 5px 0; text-align: left;} #pictureComments form p textarea { margin: 10px 0;} -#pictureComments INPUT { margin: 10px;} #pictureComments INPUT[type=submit] { margin: 0;} /* image info table */ diff --git a/themes/elegant/theme.css b/themes/elegant/theme.css index d2b30ae40..199398406 100644 --- a/themes/elegant/theme.css +++ b/themes/elegant/theme.css @@ -11,11 +11,10 @@ html, body { background-color: #111;} #imageInfos, #infoSwitcher.infohidden { background-color: #333;} #thePicturePage #comments { background-color: #333;} #pictureCommentList li { background-color: #444;} -#pictureCommentList .commentElement { background-color: transparent;} .calendarTitle { background-color: #222;} .switchBox, .header_notes { background-color: #555;} -.thumbnailCategory, .commentElement { background-color: #333;} +.thumbnailCategory { background-color: #333;} .message { background-color: #666;} INPUT[type="text"], INPUT[type="password"], @@ -162,7 +161,7 @@ a:hover { border-bottom: none;} #thumbnails { padding-top: 5px;} .thumbnails IMG { margin-bottom: 0; vertical-align: middle;} .thumbnailCategory DIV.illustration, -.commentElement DIV.illustration { margin: 2px; text-align: center;} +.commentElement .illustration { margin: 2px; text-align: center;} /* picture page */ @@ -238,7 +237,6 @@ a:hover { border-bottom: none;} #thePicturePage #comments form { margin: 10px 0;} #thePicturePage #comments fieldset { margin: 0 1em;} -.noCommentText { display:block;} .commentshidden #pictureComments { display: none;} .commentContent .comments_toggle { cursor: pointer;} @@ -254,18 +252,7 @@ a:hover { border-bottom: none;} font-family: Arial,Helvetica,sans-serif; 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 .navigationBar { float: right; margin-bottom: 5px;} #pictureComments h4 { margin: 0;} |