From 92b2486dab471fdeff07e1168777841474660acb Mon Sep 17 00:00:00 2001 From: Matthias Mees Date: Wed, 6 Feb 2013 17:32:06 +0100 Subject: [PATCH] More submit/cancel states for buttons and buttonized links. Maybe even all of them? --- include/admin/tpl/category.inc.tpl | 2 +- include/admin/tpl/comments.inc.tpl | 2 +- include/admin/tpl/groups.inc.tpl | 2 +- include/admin/tpl/images.inc.tpl | 6 +++--- include/admin/tpl/show_plugins.fnc.tpl | 2 +- include/admin/tpl/users.inc.tpl | 2 +- templates/2k11/admin/media_pane.tpl | 2 +- templates/2k11/admin/style.css | 11 ++++++++--- 8 files changed, 17 insertions(+), 12 deletions(-) diff --git a/include/admin/tpl/category.inc.tpl b/include/admin/tpl/category.inc.tpl index d405d2da..5ed1b32a 100644 --- a/include/admin/tpl/category.inc.tpl +++ b/include/admin/tpl/category.inc.tpl @@ -39,7 +39,7 @@ - + {/if} {/if} diff --git a/include/admin/tpl/comments.inc.tpl b/include/admin/tpl/comments.inc.tpl index 082c505b..3f887414 100644 --- a/include/admin/tpl/comments.inc.tpl +++ b/include/admin/tpl/comments.inc.tpl @@ -164,7 +164,7 @@ {/if}
- +
{* TODO: Clone pagination using JS *} diff --git a/include/admin/tpl/groups.inc.tpl b/include/admin/tpl/groups.inc.tpl index 68f6de38..bdc64630 100644 --- a/include/admin/tpl/groups.inc.tpl +++ b/include/admin/tpl/groups.inc.tpl @@ -142,7 +142,7 @@
- +
{/if} diff --git a/include/admin/tpl/images.inc.tpl b/include/admin/tpl/images.inc.tpl index 4e97da98..e407a8f2 100644 --- a/include/admin/tpl/images.inc.tpl +++ b/include/admin/tpl/images.inc.tpl @@ -56,8 +56,8 @@
{/if} @@ -164,7 +164,7 @@ {* I think this is redudant:

{$CONST.CONFIRM_DELETE_DIRECTORY|sprintf:$dir|escape:'html'}

*}
- +
{/if} diff --git a/include/admin/tpl/show_plugins.fnc.tpl b/include/admin/tpl/show_plugins.fnc.tpl index d84d0733..2b4a197e 100644 --- a/include/admin/tpl/show_plugins.fnc.tpl +++ b/include/admin/tpl/show_plugins.fnc.tpl @@ -79,7 +79,7 @@ {$CONST.PLUGIN_AVAILABLE_COUNT|sprintf:$total}
- +
diff --git a/include/admin/tpl/users.inc.tpl b/include/admin/tpl/users.inc.tpl index 5cbbca46..0c2544ae 100644 --- a/include/admin/tpl/users.inc.tpl +++ b/include/admin/tpl/users.inc.tpl @@ -90,7 +90,7 @@
- +
diff --git a/templates/2k11/admin/media_pane.tpl b/templates/2k11/admin/media_pane.tpl index f8c0686d..f5409d1a 100644 --- a/templates/2k11/admin/media_pane.tpl +++ b/templates/2k11/admin/media_pane.tpl @@ -164,7 +164,7 @@ {if $smarty.get.serendipity.adminModule == 'media'}
- +
{/if} diff --git a/templates/2k11/admin/style.css b/templates/2k11/admin/style.css index de92221d..c98e3b90 100644 --- a/templates/2k11/admin/style.css +++ b/templates/2k11/admin/style.css @@ -561,7 +561,9 @@ input[type="submit"] { .state_cancel, .state_cancel:visited, -input[type="reset"] { +input[type="reset"], +input[type="submit"].state_cancel, +input[type="submit"].state_cancel:visited { background: #b94a48; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #cc7a79), color-stop(100%, #b94a48)); background-image: -webkit-linear-gradient(#cc7a79, #b94a48); @@ -594,7 +596,9 @@ input[type="submit"]:hover { .state_cancel:hover, .state_cancel:focus, -input[type="reset"]:hover { +input[type="reset"]:hover, +input[type="submit"].state_cancel:hover, +input[type="submit"].state_cancel:focus { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #cc7a79), color-stop(1px, #c26260), color-stop(100%, #a2403e)); background-image: -webkit-linear-gradient(#cc7a79, #c26260 1px, #a2403e); background-image: -moz-linear-gradient(#cc7a79, #c26260 1px, #a2403e); @@ -628,7 +632,8 @@ input[type="submit"]:active { } .state_cancel:active, -input[type="reset"]:active { +input[type="reset"]:active +input[type="submit"].state_cancel:active { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #cc7a79), color-stop(1px, #b94a48), color-stop(100%, #c26260)); background-image: -webkit-linear-gradient(#cc7a79, #b94a48 1px, #c26260); background-image: -moz-linear-gradient(#cc7a79, #b94a48 1px, #c26260);