diff options
author | flop25 <flop25@piwigo.org> | 2013-05-06 18:34:56 +0000 |
---|---|---|
committer | flop25 <flop25@piwigo.org> | 2013-05-06 18:34:56 +0000 |
commit | 5a0bd85b80001fb104f9ff419862d00bbe544039 (patch) | |
tree | 6bca87146e3370f81bcea27aba5116be7f9a8f83 /admin | |
parent | 9547e03a57b98d65402be2998cca9ff863b96f87 (diff) |
bug:2890
for "Manage Permissions" and "Manage the members", don't display the button "apply action" button and style as a button the links
git-svn-id: http://piwigo.org/svn/trunk@22516 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin')
-rw-r--r-- | admin/themes/clear/theme.css | 4 | ||||
-rw-r--r-- | admin/themes/default/template/group_list.tpl | 2 | ||||
-rw-r--r-- | admin/themes/roma/theme.css | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/admin/themes/clear/theme.css b/admin/themes/clear/theme.css index 174d9a8dd..374ec3437 100644 --- a/admin/themes/clear/theme.css +++ b/admin/themes/clear/theme.css @@ -293,7 +293,7 @@ UL.thumbnails li.rank-of-image {background-color: #ddd;} #pwgMain {padding-left:0} -input[type="submit"], input[type="button"], input[type="reset"], a.bigButton { +.grp_action A, input[type="submit"], input[type="button"], input[type="reset"], a.bigButton { font-size:12px; font-weight:bold; letter-spacing:1px; @@ -307,7 +307,7 @@ input[type="submit"], input[type="button"], input[type="reset"], a.bigButton { margin-left:0; } -input[type="submit"]:hover, input[type="button"]:hover, input[type="reset"]:hover, a.bigButton:hover { +.grp_action A:hover, input[type="submit"]:hover, input[type="button"]:hover, input[type="reset"]:hover, a.bigButton:hover { cursor: pointer; background-color:#ff7700; color:white; diff --git a/admin/themes/default/template/group_list.tpl b/admin/themes/default/template/group_list.tpl index 64a41236a..44c1437c9 100644 --- a/admin/themes/default/template/group_list.tpl +++ b/admin/themes/default/template/group_list.tpl @@ -33,7 +33,7 @@ $(document).ready(function() { $("select[name=selectAction]").change(function () { $("[id^=action_]").hide(); $("#action_"+$(this).prop("value")).show(); - if ($(this).val() != -1) { + if ($(this).val() != -1 && $(this).val() !="manage_pemissions" && $(this).val() !="manage_members" ) { $("#applyActionBlock").show(); } else { diff --git a/admin/themes/roma/theme.css b/admin/themes/roma/theme.css index 6622fdd2b..489dc125d 100644 --- a/admin/themes/roma/theme.css +++ b/admin/themes/roma/theme.css @@ -24,7 +24,7 @@ option[disabled] { background-color: #999; color: #444; } input[type="radio"], input[type="checkbox"] { background-color: transparent; } /* INPUT[type="checkbox"], INPUT[type="radio"] { color:#999; background-color: #eee; } */ -INPUT[type="submit"], INPUT[type="reset"] { color:#999; border: 1px solid #666; background-color: #444; padding: 1px 15px; } +.grp_action A, INPUT[type="submit"], INPUT[type="reset"] { color:#999; border: 1px solid #666; background-color: #444; padding: 1px 15px; } h2 { color: #ccc; } @@ -73,7 +73,7 @@ UL.thumbnails span.wrap2 { background-image: url(images/fillet.png); background-repeat: repeat-x; } /* borders */ fieldset { border: 2px solid #333; } -INPUT, SELECT, TEXTAREA { border: 1px solid #666; } +.grp_action A, INPUT, SELECT, TEXTAREA { border: 1px solid #666; } input:focus, select:focus, textarea:focus { background-color: #444; color: #999; @@ -211,9 +211,9 @@ body .ui-resizable-autohide .ui-resizable-handle { display: none; } /* use 'body #ui-datepicker-div .ui-datepicker-current-day { background-color: #111 !important; border-color: #444; border-top-color: #111; border-left-color: #111;} #ui-datepicker-div .ui-datepicker-days-cell { background-color:#444; border:1px solid #222; border-top-color: #444; border-left-color: #444;} INPUT[type="text"].large { width: 317px; } -input[type="button"], input[type="submit"], input[type="reset"] { +.grp_action A, input[type="button"], input[type="submit"], input[type="reset"] { color:#ff3363; background-color:#222; border-color: #ff3363; } -input[type="button"]:hover, input[type="submit"]:hover, input[type="reset"]:hover { +.grp_action A:hover, input[type="button"]:hover, input[type="submit"]:hover, input[type="reset"]:hover { color:#999; border-color: #666; } .bigbutton { background:transparent url(images/quickLocalSync_inactiv.png) no-repeat scroll left top; display: block; color:#111; font-size:28px; height:161px; margin: 0 20px 0 auto; padding:0 18px 0; text-align:center; width:625px; |