Skip to content

Commit

Permalink
feature 2588: template modification for v2.4
Browse files Browse the repository at this point in the history 
-> new class .switchBox for all boxes (sortOrder, derivative, etc...)
-> new classes to help layout in switchBoxes:
    - .switchCheck for the check character
    - .switchSelected for the selected option
    - .switchUnselected for all other options
-> new menubar.tpl with empty div #menuSwitcher

git-svn-id: http://piwigo.org/svn/trunk@13729 68402e56-0260-453c-a942-63ccdbb3a9ee
  • Loading branch information
Zaphod committed Mar 25, 2012
1 parent 3d04cdd commit b1041fb
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 21 deletions.
2 changes: 1 addition & 1 deletion themes/Sylvia/theme.css
View file
Expand Up @@ -476,7 +476,7 @@ A:hover .pwg-icon {
background-color:#666;
}

#derivativeSwitchBox, #sortOrderBox {
.switchBox {
background-color: #222222;
border: 1px solid #FF3363;
border-radius: 0 15px 0 15px;
Expand Down
4 changes: 2 additions & 2 deletions themes/clear/theme.css
View file
Expand Up @@ -14,12 +14,12 @@ H2, #menubar DT, #imageHeaderBar, #imageToolBar A:hover {
background-color: #d3d3d3;
}

#menubar DL, .content, #imageToolBar, #derivativeSwitchBox, #sortOrderBox, .header_notes {
#menubar DL, .content, #imageToolBar, .switchBox, .header_notes {
background-color: #eeeeee;
}

/* borders */
#menubar DL, .content, #imageToolBar, #derivativeSwitchBox, #sortOrderBox {
#menubar DL, .content, #imageToolBar, .switchBox {
border: 1px solid #d3d3d3;
}

Expand Down
4 changes: 2 additions & 2 deletions themes/dark/theme.css
View file
Expand Up @@ -17,7 +17,7 @@ BODY, H3, #imageToolBar A:hover {
background-color: #2f2f2f;
}

#menubar DL, .content, #imageToolBar, #imageHeaderBar, #derivativeSwitchBox, #sortOrderBox, .header_notes {
#menubar DL, .content, #imageToolBar, #imageHeaderBar, .switchBox, .header_notes {
background-color: #505050;
}

Expand All @@ -30,7 +30,7 @@ BODY, H3, #imageToolBar A:hover {
}

/* borders */
#menubar DL, .content, #derivativeSwitchBox, #sortOrderBox{
#menubar DL, .content, .switchBox {
border: 1px solid #000;
}

Expand Down
12 changes: 6 additions & 6 deletions themes/default/template/index.tpl
View file
Expand Up @@ -7,13 +7,13 @@
<li>{strip}<a href="javascript:toggleSortOrderBox()" id="sortOrderLink" title="{'Sort order'|@translate}" class="pwg-state-default pwg-button" rel="nofollow">
<span class="pwg-icon pwg-icon-sort">&nbsp;</span><span class="pwg-button-text">{'Sort order'|@translate}</span>
</a>
<div id="sortOrderBox" style="display:none; text-align:left" onclick="toggleSortOrderBox()" onmouseout="e=event.toElement||event.relatedTarget;e.parentNode==this||e==this||toggleSortOrderBox()">
<div id="sortOrderBox" class="switchBox" style="display:none; text-align:left" onclick="toggleSortOrderBox()" onmouseout="e=event.toElement||event.relatedTarget;e.parentNode==this||e==this||toggleSortOrderBox()">
<div class="switchBoxTitle">{'Sort order'|@translate}</div>
{foreach from=$image_orders item=image_order name=loop}{if !$smarty.foreach.loop.first}<br>{/if}
{if $image_order.SELECTED}
<span>&#x2714; {$image_order.DISPLAY}</span>
<span class="switchCheck">&#x2714; </span><span class="switchSelected">{$image_order.DISPLAY}</span>
{else}
<a href="{$image_order.URL}" rel="nofollow">{$image_order.DISPLAY}</a>
<a href="{$image_order.URL}" class="switchUnselected" rel="nofollow">{$image_order.DISPLAY}</a>
{/if}
{/foreach}
</div>
Expand All @@ -38,13 +38,13 @@ function toggleSortOrderBox() {
<li>{strip}<a href="javascript:toggleImageDerivativesBox()" id="derivativeChooseLink" title="{'Photo sizes'|@translate}" class="pwg-state-default pwg-button" rel="nofollow">
<span class="pwg-icon pwg-icon-sizes">&nbsp;</span><span class="pwg-button-text">{'Photo sizes'|@translate}</span>
</a>
<div id="derivativeSwitchBox" style="display:none; text-align:left" onclick="toggleImageDerivativesBox()" onmouseout="e=event.toElement||event.relatedTarget;e.parentNode==this||e==this||toggleImageDerivativesBox()">
<div id="derivativeSwitchBox" class="switchBox" style="display:none; text-align:left" onclick="toggleImageDerivativesBox()" onmouseout="e=event.toElement||event.relatedTarget;e.parentNode==this||e==this||toggleImageDerivativesBox()">
<div class="switchBoxTitle">{'Photo sizes'|@translate}</div>
{foreach from=$image_derivatives item=image_derivative name=loop}{if !$smarty.foreach.loop.first}<br>{/if}
{if $image_derivative.SELECTED}
<span>&#x2714; {$image_derivative.DISPLAY}</span>
<span class="switchCheck">&#x2714; </span><span class="switchSelected">{$image_derivative.DISPLAY}</span>
{else}
<a href="{$image_derivative.URL}" rel="nofollow">{$image_derivative.DISPLAY}</a>
<a href="{$image_derivative.URL}" class="switchUnselected" rel="nofollow">{$image_derivative.DISPLAY}</a>
{/if}
{/foreach}
</div>
Expand Down
2 changes: 1 addition & 1 deletion themes/default/template/menubar.tpl
View file
Expand Up @@ -9,5 +9,5 @@
{/if}
</dl>
{/foreach}
</div>
</div><div id="menuSwitcher"></div>
{/if}
16 changes: 12 additions & 4 deletions themes/default/template/picture.tpl
View file
Expand Up @@ -31,7 +31,9 @@ function changeImgSrc(url,typeSave,typeMap)
}
jQuery('.derivativeChecked').hide();
jQuery('#derivativeChecked'+typeSave).show();
document.cookie = 'picture_deriv='+typeSave+';path={/literal}{$COOKIE_PATH}{literal}';
jQuery('#derivativeSiwtchBox .switchSelected').addClass('switchUnselected').removeClass('switchSelected');
jQuery('#derivativeName'+typeSave).addClass('switchSelected').removeClass('switchUnselected');
document.cookie = 'picture_deriv='+typeSave+';path={/literal}{$COOKIE_PATH}{literal}';
}

function toggleDerivativeSwitchBox()
Expand All @@ -41,7 +43,7 @@ function toggleDerivativeSwitchBox()
if (elt.style.display==="none")
{
elt.style.position = "absolute";
elt.style.left = (ePos.offsetLeft+10)+"px";
elt.style.left = (ePos.offsetLeft)+"px";
elt.style.top = (ePos.offsetTop+ePos.offsetHeight)+"px";
elt.style.display="";
}
Expand All @@ -51,10 +53,16 @@ function toggleDerivativeSwitchBox()
{/literal}{/footer_script}
{strip}<a id="derivativeSwitchLink" href="javascript:toggleDerivativeSwitchBox()" title="{'Photo sizes'|@translate}" class="pwg-state-default pwg-button" rel="nofollow">
<span class="pwg-icon pwg-icon-sizes">&nbsp;</span><span class="pwg-button-text">{'Photo sizes'|@translate}</span></a>
<div id="derivativeSwitchBox" onclick="toggleDerivativeSwitchBox()" style="display:none">
<div id="derivativeSwitchBox" class="switchBox" onclick="toggleDerivativeSwitchBox()" style="display:none" onmouseout="e=event.toElement||event.relatedTarget;e.parentNode==this||e==this||toggleDerivativeSwitchBox()">
<div class="switchBoxTitle">{'Photo sizes'|@translate}</div>
{foreach from=$current.unique_derivatives item=derivative key=derivative_type}
<span class="derivativeChecked" id="derivativeChecked{$derivative->get_type()}" {if $derivative->get_type() ne $current.selected_derivative->get_type()}style="display:none"{/if}>&#x2714;</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>
<span class="derivativeChecked switchCheck"
id="derivativeChecked{$derivative_type}" {if $derivative->get_type() ne $current.selected_derivative->get_type()}style="display:none"{/if}>&#x2714; </span>
<a href="javascript:changeImgSrc('{$derivative->get_url()|@escape:javascript}','{$derivative_type}','{$derivative->get_type()}')"
id="derivativeName{$derivative_type}"
class="{if $derivative->get_type() == $current.selected_derivative->get_type()}switchSelected{else}switchUnselected{/if}">
{$derivative->get_type()|@translate}<span class="derivativeSizeDetails"> ({$derivative->get_size_hr()})</span>
</a><br>
{/foreach}
{if isset($U_ORIGINAL)}
<a href="javascript:phpWGOpenWindow('{$U_ORIGINAL}','xxx','scrollbars=yes,toolbar=no,status=no,resizable=yes')" rel="nofollow">{'Original'|@translate}</a>
Expand Down
8 changes: 4 additions & 4 deletions themes/default/template/picture_nav_buttons.tpl
View file
Expand Up @@ -30,15 +30,15 @@
<span class="pwg-icon pwg-icon-repeat-stop">&nbsp;</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">&nbsp;</span><span class="pwg-button-text">{'First'|@translate}</span>
</a>
{else}
<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>
{/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">&nbsp;</span><span class="pwg-button-text">{'Previous'|@translate}</span>
Expand Down Expand Up @@ -72,15 +72,15 @@
<span class="pwg-icon pwg-icon-arrow-e">&nbsp;</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>
{else}
<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>
{/if}{/strip}
{/if}{/strip}-->
{/if}
</div>
{strip}
Expand Down
2 changes: 1 addition & 1 deletion themes/default/theme.css
View file
Expand Up @@ -381,7 +381,7 @@ TD.calDayHead {
#imageToolBar .navigationButtons { float: right; }
#imageToolBar .pwg-button {width:42px;}

#derivativeSwitchBox, #sortOrderBox {
.switchBox {
padding: 0.5em 10px;
border-radius: 4px;
z-index: 100;
Expand Down

0 comments on commit b1041fb

Please sign in to comment.