Use new show hide buttons.

This commit is contained in:
Matthias Mees 2014-03-01 15:51:44 +01:00
parent b48f49c444
commit dd013f3a70
8 changed files with 35 additions and 35 deletions

View File

@ -64,7 +64,7 @@
</div> </div>
<h3 class="toggle_headline"> <h3 class="toggle_headline">
<button class="show_config_option icon_link {if $newSub}show_config_option_now{/if}" type="button" data-href="#category_subcats" title="{$CONST.TOGGLE_OPTION}"><span class="icon-plus"></span> {$CONST.PARENT_CATEGORY}</button> <button class="show_config_option icon_link {if $newSub}show_config_option_now{/if}" type="button" data-href="#category_subcats" title="{$CONST.TOGGLE_OPTION}"><span class="icon-right-dir"></span> {$CONST.PARENT_CATEGORY}</button>
</h3> </h3>
<div id="category_subcats" class="clearfix additional_info"> <div id="category_subcats" class="clearfix additional_info">
@ -99,7 +99,7 @@
</div> </div>
<h3 class="toggle_headline"> <h3 class="toggle_headline">
<button class="show_config_option icon_link" type="button" data-href="#category_permissions" title="{$CONST.TOGGLE_OPTION}"><span class="icon-plus"></span> {$CONST.PERMISSIONS}</button> <button class="show_config_option icon_link" type="button" data-href="#category_permissions" title="{$CONST.TOGGLE_OPTION}"><span class="icon-right-dir"></span> {$CONST.PERMISSIONS}</button>
</h3> </h3>
<div id="category_permissions" class="clearfix additional_info"> <div id="category_permissions" class="clearfix additional_info">
@ -125,7 +125,7 @@
</div> </div>
<h3 class="toggle_headline"> <h3 class="toggle_headline">
<button class="show_config_option icon_link" type="button" data-href="#category_preview" title="{$CONST.TOGGLE_OPTION}"><span class="icon-plus"></span> {$CONST.CATEGORY} {$CONST.IMAGE}</button> <button class="show_config_option icon_link" type="button" data-href="#category_preview" title="{$CONST.TOGGLE_OPTION}"><span class="icon-right-dir"></span> {$CONST.CATEGORY} {$CONST.IMAGE}</button>
</h3> </h3>
<div id="category_preview" class="clearfix additional_info"> <div id="category_preview" class="clearfix additional_info">

View File

@ -156,7 +156,7 @@
<li><a class="button_link comments_delete" href="?serendipity[action]=admin&amp;serendipity[adminModule]=comments&amp;serendipity[adminAction]=delete&amp;serendipity[id]={$comment.id}&amp;serendipity[entry_id]={$comment.entry_id}&amp;{$urltoken}" data-delmsg='{($CONST.COMMENT_DELETE_CONFIRM|sprintf:$comment.id:$comment.author)|escape}' title="{$CONST.DELETE}"><span class="icon-trash"></span><span class="visuallyhidden"> {$CONST.DELETE}</span></a> <li><a class="button_link comments_delete" href="?serendipity[action]=admin&amp;serendipity[adminModule]=comments&amp;serendipity[adminAction]=delete&amp;serendipity[id]={$comment.id}&amp;serendipity[entry_id]={$comment.entry_id}&amp;{$urltoken}" data-delmsg='{($CONST.COMMENT_DELETE_CONFIRM|sprintf:$comment.id:$comment.author)|escape}' title="{$CONST.DELETE}"><span class="icon-trash"></span><span class="visuallyhidden"> {$CONST.DELETE}</span></a>
</li> </li>
{if $comment.excerpt} {if $comment.excerpt}
<li><button class="button_link toggle_comment_full" type="button" data-href="#c{$comment.id}_full" title="{$CONST.TOGGLE_ALL}"><span class="icon-plus"></span><span class="visuallyhidden"> {$CONST.TOGGLE_ALL}</span></button></li> <li><button class="button_link toggle_comment_full" type="button" data-href="#c{$comment.id}_full" title="{$CONST.TOGGLE_ALL}"><span class="icon-right-dir"></span><span class="visuallyhidden"> {$CONST.TOGGLE_ALL}</span></button></li>
{/if} {/if}
</ul> </ul>
{$comment.action_more} {$comment.action_more}

View File

@ -5,7 +5,7 @@
{$formToken} {$formToken}
{/if} {/if}
{if $config|@sizeof > 1 AND $allowToggle} {if $config|@sizeof > 1 AND $allowToggle}
<a id="show_config_all" class="button_link" href="#serendipity_config_options" title="{$CONST.TOGGLE_ALL}"><span class="icon-plus"></span><span class="visuallyhidden"> {$CONST.TOGGLE_ALL}</span></a> <a id="show_config_all" class="button_link" href="#serendipity_config_options" title="{$CONST.TOGGLE_ALL}"><span class="icon-right-dir"></span><span class="visuallyhidden"> {$CONST.TOGGLE_ALL}</span></a>
{/if} {/if}
<div id="serendipity_config_options"> <div id="serendipity_config_options">
{foreach $config as $category} {foreach $config as $category}
@ -13,7 +13,7 @@
{if $config|@sizeof > 1} {if $config|@sizeof > 1}
{if $allowToggle} {if $allowToggle}
<h3 class="toggle_headline"> <h3 class="toggle_headline">
<button id="optionel{$category@iteration}" class="show_config_option icon_link" type="button" data-href="#el{$category@index}" title="{$CONST.TOGGLE_OPTION}"><span class="icon-plus"></span> {$category.title}</button> <button id="optionel{$category@iteration}" class="show_config_option icon_link" type="button" data-href="#el{$category@index}" title="{$CONST.TOGGLE_OPTION}"><span class="icon-right-dir"></span> {$category.title}</button>
</h3> </h3>
{else} {else}
<h3>{$category.title}</h3> <h3>{$category.title}</h3>

View File

@ -61,7 +61,7 @@
</div> </div>
<fieldset id="edit_entry_metadata" class="clearfix"> <fieldset id="edit_entry_metadata" class="clearfix">
<span class="wrap_legend"><legend><button id="toggle_metadata" class="button_link" type="button"><span class="icon-plus"></span><span class="visuallyhidden"> {$CONST.TOGGLE_ALL}</span></button> Entry metadata</legend></span> {* i18n *} <span class="wrap_legend"><legend><button id="toggle_metadata" class="button_link" type="button"><span class="icon-right-dir"></span><span class="visuallyhidden"> {$CONST.TOGGLE_ALL}</span></button> Entry metadata</legend></span> {* i18n *}
<div id="meta_data" class="additional_info"> <div id="meta_data" class="additional_info">
{if $entry_vars.allowDateManipulation} {if $entry_vars.allowDateManipulation}
@ -115,7 +115,7 @@
{capture name='advanced_options'}{$entry_vars.entry|@serendipity_refhookPlugin:'backend_display'}{/capture} {capture name='advanced_options'}{$entry_vars.entry|@serendipity_refhookPlugin:'backend_display'}{/capture}
{if ! empty($smarty.capture.advanced_options) } {if ! empty($smarty.capture.advanced_options) }
<fieldset id="advanced_options"> <fieldset id="advanced_options">
<span class="wrap_legend"><legend><button id="toggle_advanced" class="button_link" type="button"><span class="icon-plus"></span><span class="visuallyhidden"> {$CONST.TOGGLE_ALL}</span></button> {$CONST.ADVANCED_OPTIONS}</legend></span> <span class="wrap_legend"><legend><button id="toggle_advanced" class="button_link" type="button"><span class="icon-right-dir"></span><span class="visuallyhidden"> {$CONST.TOGGLE_ALL}</span></button> {$CONST.ADVANCED_OPTIONS}</legend></span>
<div id="adv_opts" class="additional_info"> <div id="adv_opts" class="additional_info">
{$smarty.capture.advanced_options} {$smarty.capture.advanced_options}
</div> </div>

View File

@ -86,7 +86,7 @@
</div> </div>
<h3 class="toggle_headline"> <h3 class="toggle_headline">
<button class="show_config_option icon_link" type="button" data-href="#directory_permissions" title="{$CONST.TOGGLE_OPTION}"><span class="icon-plus"></span> {$CONST.PERMISSIONS}</button> <button class="show_config_option icon_link" type="button" data-href="#directory_permissions" title="{$CONST.TOGGLE_OPTION}"><span class="icon-right-dir"></span> {$CONST.PERMISSIONS}</button>
</h3> </h3>
<div id="directory_permissions" class="clearfix additional_info"> <div id="directory_permissions" class="clearfix additional_info">

View File

@ -41,7 +41,7 @@
<li><a class="button_link comments_delete" href="?serendipity[action]=admin&amp;serendipity[adminModule]=comments&amp;serendipity[adminAction]=delete&amp;serendipity[id]={$comment.id}&amp;serendipity[entry_id]={$comment.entry_id}&amp;{$urltoken}" data-delmsg='{($CONST.COMMENT_DELETE_CONFIRM|sprintf:$comment.id:$comment.author)|escape}' title="{$CONST.DELETE}"><span class="icon-trash"></span><span class="visuallyhidden"> {$CONST.DELETE}</span></a> <li><a class="button_link comments_delete" href="?serendipity[action]=admin&amp;serendipity[adminModule]=comments&amp;serendipity[adminAction]=delete&amp;serendipity[id]={$comment.id}&amp;serendipity[entry_id]={$comment.entry_id}&amp;{$urltoken}" data-delmsg='{($CONST.COMMENT_DELETE_CONFIRM|sprintf:$comment.id:$comment.author)|escape}' title="{$CONST.DELETE}"><span class="icon-trash"></span><span class="visuallyhidden"> {$CONST.DELETE}</span></a>
</li> </li>
{if $comment.excerpt} {if $comment.excerpt}
<li><button class="button_link toggle_comment_full" type="button" data-href="#c{$comment.id}_full" title="{$CONST.TOGGLE_ALL}"><span class="icon-plus"></span><span class="visuallyhidden"> {$CONST.TOGGLE_ALL}</span></button></li> <li><button class="button_link toggle_comment_full" type="button" data-href="#c{$comment.id}_full" title="{$CONST.TOGGLE_ALL}"><span class="icon-right-dir"></span><span class="visuallyhidden"> {$CONST.TOGGLE_ALL}</span></button></li>
{/if} {/if}
</ul> </ul>
</li> </li>

View File

@ -8,13 +8,13 @@
{/if} {/if}
{if is_array($config_groups)} {if is_array($config_groups)}
<button id="show_config_all" class="button_link" type="button" data-href="#serendipity_config_options" title="{$CONST.TOGGLE_ALL}"> <button id="show_config_all" class="button_link" type="button" data-href="#serendipity_config_options" title="{$CONST.TOGGLE_ALL}">
<span class="icon-plus"></span><span class="visuallyhidden"> {$CONST.TOGGLE_ALL}</span> <span class="icon-right-dir"></span><span class="visuallyhidden"> {$CONST.TOGGLE_ALL}</span>
</button> </button>
<div id="serendipity_config_options"> <div id="serendipity_config_options">
{foreach $config_groups AS $config_header => $config_groupkeys} {foreach $config_groups AS $config_header => $config_groupkeys}
<div class="configuration_group"> <div class="configuration_group">
<h3 class="toggle_headline"><button id="optionel{$config_groupkeys@iteration}" class="show_config_option" type="button" data-href="#el{$config_groupkeys@iteration}" title="{$CONST.TOGGLE_OPTION}"><span class="icon-plus"></span> {$config_header}</button></h3> <h3 class="toggle_headline"><button id="optionel{$config_groupkeys@iteration}" class="show_config_option" type="button" data-href="#el{$config_groupkeys@iteration}" title="{$CONST.TOGGLE_OPTION}"><span class="icon-right-dir"></span> {$config_header}</button></h3>
<fieldset id="el{$config_groupkeys@iteration}" class="config_optiongroup{if $config_groupkeys@last} config_optiongroup_last{/if} additional_info"> <fieldset id="el{$config_groupkeys@iteration}" class="config_optiongroup{if $config_groupkeys@last} config_optiongroup_last{/if} additional_info">
{foreach $config_groupkeys AS $config_groupkey} {foreach $config_groupkeys AS $config_groupkey}

View File

@ -362,7 +362,7 @@
if ($('#toggle_extended').length == 0 && $('#tools_extended').length != 0) { if ($('#toggle_extended').length == 0 && $('#tools_extended').length != 0) {
// this function got called on load of the editor // this function got called on load of the editor
var toggleButton = '#toggle_extended'; var toggleButton = '#toggle_extended';
$('textarea[name="serendipity[extended]"]').parent().prepend('<a id="toggle_extended" class="button_link" href="#serendipity[extended]"><span class="icon-minus"></span><span class="visuallyhidden"> {$CONST.TOGGLE_ALL}</span></a>'); $('textarea[name="serendipity[extended]"]').parent().prepend('<a id="toggle_extended" class="button_link" href="#serendipity[extended]"><span class="icon-down-dir"></span><span class="visuallyhidden"> {$CONST.TOGGLE_ALL}</span></a>');
$(toggleButton).click(function(e) { $(toggleButton).click(function(e) {
e.preventDefault(); e.preventDefault();
serendipity.toggle_extended(true); serendipity.toggle_extended(true);
@ -376,12 +376,12 @@
if ($('textarea[name="serendipity[extended]"]:hidden').length > 0) { if ($('textarea[name="serendipity[extended]"]:hidden').length > 0) {
$('textarea[name="serendipity[extended]"]').show(); // use name selector instead of id here; id does not work $('textarea[name="serendipity[extended]"]').show(); // use name selector instead of id here; id does not work
$('#tools_extended').show(); $('#tools_extended').show();
$('#toggle_extended').find('> .icon-plus').removeClass('icon-plus').addClass('icon-minus'); $('#toggle_extended').find('> .icon-right-dir').removeClass('icon-right-dir').addClass('icon-down-dir');
localStorage.show_extended_editor = "true"; localStorage.show_extended_editor = "true";
} else { } else {
$('textarea[name="serendipity[extended]"]').hide(); $('textarea[name="serendipity[extended]"]').hide();
$('#tools_extended').hide(); $('#tools_extended').hide();
$('#toggle_extended').find('> .icon-minus').removeClass('icon-minus').addClass('icon-plus'); $('#toggle_extended').find('> .icon-down-dir').removeClass('icon-down-dir').addClass('icon-right-dir');
localStorage.show_extended_editor = "false"; localStorage.show_extended_editor = "false";
} }
if (setCookie) { if (setCookie) {
@ -396,7 +396,7 @@
// this function got called on load of the editor // this function got called on load of the editor
var toggleButton = '#toggle_' + id; var toggleButton = '#toggle_' + id;
$('#'+id).before('<button id="toggle_' + id + '" class="button_link" type="button" href="#' + id + '"><span class="icon-plus"></span><span class="visuallyhidden"> {$CONST.TOGGLE_ALL}</span></button>'); $('#'+id).before('<button id="toggle_' + id + '" class="button_link" type="button" href="#' + id + '"><span class="icon-right-dir"></span><span class="visuallyhidden"> {$CONST.TOGGLE_ALL}</span></button>');
$(toggleButton).click(function(e) { $(toggleButton).click(function(e) {
e.preventDefault(); e.preventDefault();
@ -411,7 +411,7 @@
// when loading the page new for the preview and more than one category was // when loading the page new for the preview and more than one category was
// selected, collapsing the category-selector would lose those categories // selected, collapsing the category-selector would lose those categories
$('#'+id).attr("size", $('#'+id).children().size); $('#'+id).attr("size", $('#'+id).children().size);
$('#toggle_' + id).find('> .icon-plus').removeClass('icon-plus').addClass('icon-minus'); $('#toggle_' + id).find('> .icon-right-dir').removeClass('icon-right-dir').addClass('icon-down-dir');
return return
} }
@ -428,12 +428,12 @@
} }
$('#'+id).removeAttr("multiple"); $('#'+id).removeAttr("multiple");
$('#'+id).removeAttr("size"); $('#'+id).removeAttr("size");
$('#toggle_' + id).find('> .icon-minus').removeClass('icon-minus').addClass('icon-plus'); $('#toggle_' + id).find('> .icon-down-dir').removeClass('icon-down-dir').addClass('icon-right-dir');
} else { } else {
$('#'+id).attr("multiple", ""); $('#'+id).attr("multiple", "");
$('#'+id).attr("size", $('#'+id).children().size); $('#'+id).attr("size", $('#'+id).children().size);
$('#toggle_' + id).find('> .icon-plus').removeClass('icon-plus').addClass('icon-minus'); $('#toggle_' + id).find('> .icon-right-dir').removeClass('icon-right-dir').addClass('icon-down-dir');
var selected_categories = categoryselector_stored_categories; var selected_categories = categoryselector_stored_categories;
if (selected_categories != null) { if (selected_categories != null) {
@ -810,11 +810,11 @@ var AccessifyHTML5 = function (defaults, more_fixes) {
var $el = $(this); var $el = $(this);
var $toggleIcon = $el.find('> span'); var $toggleIcon = $el.find('> span');
var $toggleState = $toggleIcon.attr('class'); var $toggleState = $toggleIcon.attr('class');
if($toggleState == 'icon-minus') { if($toggleState == 'icon-down-dir') {
$toggleIcon.removeClass('icon-minus').addClass('icon-plus'); $toggleIcon.removeClass('icon-down-dir').addClass('icon-right-dir');
localStorage.show_advanced_options = "false"; localStorage.show_advanced_options = "false";
} else { } else {
$toggleIcon.removeClass('icon-plus').addClass('icon-minus'); $toggleIcon.removeClass('icon-right-dir').addClass('icon-down-dir');
localStorage.show_advanced_options = "true"; localStorage.show_advanced_options = "true";
} }
$('#meta_data').toggleClass('additional_info'); $('#meta_data').toggleClass('additional_info');
@ -844,11 +844,11 @@ var AccessifyHTML5 = function (defaults, more_fixes) {
var $el = $(this); var $el = $(this);
var $toggleIcon = $el.find('> span'); var $toggleIcon = $el.find('> span');
var $toggleState = $toggleIcon.attr('class'); var $toggleState = $toggleIcon.attr('class');
if($toggleState == 'icon-minus') { if($toggleState == 'icon-down-dir') {
$toggleIcon.removeClass('icon-minus').addClass('icon-plus'); $toggleIcon.removeClass('icon-down-dir').addClass('icon-right-dir');
localStorage.show_advanced_options = "false"; localStorage.show_advanced_options = "false";
} else { } else {
$toggleIcon.removeClass('icon-plus').addClass('icon-minus'); $toggleIcon.removeClass('icon-right-dir').addClass('icon-down-dir');
localStorage.show_advanced_options = "true"; localStorage.show_advanced_options = "true";
} }
$('#adv_opts').toggleClass('additional_info'); $('#adv_opts').toggleClass('additional_info');
@ -876,10 +876,10 @@ var AccessifyHTML5 = function (defaults, more_fixes) {
} }
var $toggleIcon = $el.find('> span'); var $toggleIcon = $el.find('> span');
var $toggleState = $toggleIcon.attr('class'); var $toggleState = $toggleIcon.attr('class');
if($toggleState == 'icon-minus') { if($toggleState == 'icon-down-dir') {
$toggleIcon.removeClass('icon-minus').addClass('icon-plus'); $toggleIcon.removeClass('icon-down-dir').addClass('icon-right-dir');
} else { } else {
$toggleIcon.removeClass('icon-plus').addClass('icon-minus'); $toggleIcon.removeClass('icon-right-dir').addClass('icon-down-dir');
} }
$($toggled).toggleClass('additional_info'); $($toggled).toggleClass('additional_info');
e.preventDefault(); e.preventDefault();
@ -895,14 +895,14 @@ var AccessifyHTML5 = function (defaults, more_fixes) {
var $toggleIcons = $($container).find('.show_config_option > span'); var $toggleIcons = $($container).find('.show_config_option > span');
var $toggleOption = $($container).find('.config_optiongroup'); var $toggleOption = $($container).find('.config_optiongroup');
if(optsCollapsed) { if(optsCollapsed) {
$toggleIcons.removeClass('icon-plus').addClass('icon-minus'); $toggleIcons.removeClass('icon-right-dir').addClass('icon-down-dir');
$toggleOption.removeClass('additional_info'); $toggleOption.removeClass('additional_info');
$toggleIcon.removeClass('icon-plus').addClass('icon-minus'); $toggleIcon.removeClass('icon-right-dir').addClass('icon-down-dir');
optsCollapsed = false; optsCollapsed = false;
} else { } else {
$toggleIcons.removeClass('icon-minus').addClass('icon-plus'); $toggleIcons.removeClass('icon-down-dir').addClass('icon-right-dir');
$toggleOption.addClass('additional_info'); $toggleOption.addClass('additional_info');
$toggleIcon.removeClass('icon-minus').addClass('icon-plus'); $toggleIcon.removeClass('icon-down-dir').addClass('icon-right-dir');
optsCollapsed = true; optsCollapsed = true;
} }
$(this).toggleClass('active'); $(this).toggleClass('active');
@ -1124,10 +1124,10 @@ var AccessifyHTML5 = function (defaults, more_fixes) {
$toggles.prev().toggleClass('additional_info'); $toggles.prev().toggleClass('additional_info');
var $toggleIcon = $el.find('> span'); var $toggleIcon = $el.find('> span');
var $toggleState = $toggleIcon.attr('class'); var $toggleState = $toggleIcon.attr('class');
if($toggleState == 'icon-minus') { if($toggleState == 'icon-down-dir') {
$toggleIcon.removeClass('icon-minus').addClass('icon-plus'); $toggleIcon.removeClass('icon-down-dir').addClass('icon-right-dir');
} else { } else {
$toggleIcon.removeClass('icon-plus').addClass('icon-minus'); $toggleIcon.removeClass('icon-right-dir').addClass('icon-down-dir');
} }
e.preventDefault(); e.preventDefault();
}); });