From c1238a7043096397130d69e99a74901dc9dba64e Mon Sep 17 00:00:00 2001 From: chris2tof Date: Thu, 29 Dec 2011 15:35:13 +0800 Subject: [PATCH] Prefix ids with "back_" in back-end layout to avoid conflict with site's ids --- app/assets/javascripts/side_bar_history.js | 2 +- app/assets/stylesheets/admin_back_end.css.erb | 40 +++++++++---------- app/assets/stylesheets/sidebar.css.erb | 24 +++++------ app/assets/stylesheets/site_items.css.erb | 26 ++++++------ app/views/admin/links/create.js.erb | 2 +- app/views/admin/links/delete.js.erb | 2 +- app/views/admin/pages/create.js.erb | 2 +- app/views/admin/pages/delete.js.erb | 2 +- app/views/layouts/admin.html.erb | 10 ++--- app/views/layouts/site_editor.html.erb | 10 ++--- 10 files changed, 60 insertions(+), 60 deletions(-) diff --git a/app/assets/javascripts/side_bar_history.js b/app/assets/javascripts/side_bar_history.js index 5ac212a8..c3c7a486 100644 --- a/app/assets/javascripts/side_bar_history.js +++ b/app/assets/javascripts/side_bar_history.js @@ -1,5 +1,5 @@ $(function () { - $('#panel_sidebar a, #panel_main a.nav').live('click', + $('#back_sidebar a, #panel_main a.nav').live('click', function () { $.getScript(this.href); history.pushState(null, document.title, this.href); diff --git a/app/assets/stylesheets/admin_back_end.css.erb b/app/assets/stylesheets/admin_back_end.css.erb index 42b6453e..405281b4 100644 --- a/app/assets/stylesheets/admin_back_end.css.erb +++ b/app/assets/stylesheets/admin_back_end.css.erb @@ -13,7 +13,7 @@ body{ font-family: Helvetica, '微軟正黑體'; } -#panel_banner_link{ +#back_banner_link{ background: url(<%= asset_path "orbitbar1.png" %>) repeat-x scroll 0 0; height: 50px; left: 0; @@ -29,7 +29,7 @@ body{ top: 1px; width: 250px; } -#orbit{ +#back_orbit{ background: url(<%= asset_path "bar_orbit.png" %>) no-repeat scroll 0 0 transparent; cursor:pointer; height: 43px; @@ -37,11 +37,11 @@ body{ position: relative; width: 41px; } -#orbit:hover{ +#back_orbit:hover{ background-position:0 -43px; box-shadow: 0 3px 3px #000000; } -#orbit:hover #orblist{ +#back_orbit:hover #orblist{ display:block; } #orblist{ @@ -102,10 +102,10 @@ body{ .lang a:hover{ text-decoration:underline; } -#content{ +#back_content{ height: 100%; } -#panel_footer{ +#back_footer{ background-color: #101010; bottom: 0; color: #FFFFFF; @@ -131,7 +131,7 @@ body{ width: 154px; } /* -#sidebar { +#back_sidebar { background: url(<%= asset_path "75.png" %>) repeat scroll left top transparent; box-shadow: 3px 0 4px #472A12; border-right: 1px solid #121212; @@ -141,7 +141,7 @@ body{ top: 0; width: 220px; } -#sidebar h1 { +#back_sidebar h1 { background: url(<%= asset_path "h1_bg.png" %>) repeat-x scroll left top transparent; border-bottom: 1px solid #1B1B1B; border-top: 1px solid #424344; @@ -154,60 +154,60 @@ body{ padding-left: 10px; text-shadow: 0 -1px 0 #000000; } -#sidebar .list { +#back_sidebar .list { color:#fff; font-size:12px; background:url(<%= asset_path "line.png" %>) repeat-x left bottom; } -#sidebar .list li { +#back_sidebar .list li { background:url(<%= asset_path "sidebar_li.jpg" %>) repeat-x left top; border-top:1px solid #424344; border-bottom:1px solid #000000; } -#sidebar .list li:hover { +#back_sidebar .list li:hover { background-position:left bottom; border-top:1px solid #406cc3; border-bottom:1px solid #242628; } -#sidebar .list li a { +#back_sidebar .list li a { display: block; padding: 7px 0 6px 12px; color:#c4c4c4; } -#sidebar .list li a span { +#back_sidebar .list li a span { background:url(<%= asset_path "add_mamber.png" %>) left top no-repeat; text-shadow: 0px 1px 0px #000; line-height: 18px; padding: 2px 0 1px 35px; } -#sidebar .list li a:hover span { +#back_sidebar .list li a:hover span { background-position:left bottom; color:#eeeeee; } -#sidebar .users .list .set_1 { +#back_sidebar .users .list .set_1 { background-position:left bottom; border-top:1px solid #406cc3; border-bottom:1px solid #242628; } -#sidebar .users .list .set_1 a span { +#back_sidebar .users .list .set_1 a span { background-position:left bottom; color:#eeeeee; } -#sidebar .roles .list .set_2 { +#back_sidebar .roles .list .set_2 { background-position:left bottom; border-top:1px solid #406cc3; border-bottom:1px solid #242628; } -#sidebar .roles .list .set_2 a span { +#back_sidebar .roles .list .set_2 a span { background-position:left bottom; color:#eeeeee; } -#sidebar .infos .list .set_3 { +#back_sidebar .infos .list .set_3 { background-position:left bottom; border-top:1px solid #406cc3; border-bottom:1px solid #242628; } -#sidebar .infos .list .set_3 a span { +#back_sidebar .infos .list .set_3 a span { background-position:left bottom; color:#eeeeee; } diff --git a/app/assets/stylesheets/sidebar.css.erb b/app/assets/stylesheets/sidebar.css.erb index a42490ea..a0457476 100644 --- a/app/assets/stylesheets/sidebar.css.erb +++ b/app/assets/stylesheets/sidebar.css.erb @@ -1,5 +1,5 @@ -#sidebar { +#back_sidebar { background: url(<%= asset_path "75.png" %>) repeat scroll left top transparent; box-shadow: 3px 0 4px #472A12; border-right: 1px solid #121212; @@ -10,7 +10,7 @@ width: 220px; } -#sidebar h1 { +#back_sidebar h1 { background: url(<%= asset_path "h1_bg.png" %>) repeat-x scroll left top transparent; border-bottom: 1px solid #1B1B1B; border-top: 1px solid #424344; @@ -23,51 +23,51 @@ padding-left: 10px; text-shadow: 0 -1px 0 #000000; } -#sidebar .list { +#back_sidebar .list { color:#fff; font-size:12px; background:url(<%= asset_path "line.png" %>) repeat-x left bottom; } -#sidebar .list li { +#back_sidebar .list li { background:url(<%= asset_path "sidebar_li.jpg" %>) repeat-x left top; border-top:1px solid #424344; border-bottom:1px solid #000000; } -#sidebar .list li:hover { +#back_sidebar .list li:hover { background-position:left bottom; border-top:1px solid #406cc3; border-bottom:1px solid #242628; } -#sidebar .list li a { +#back_sidebar .list li a { display: block; padding: 7px 0 6px 12px; color:#c4c4c4; } -#sidebar .list li a span { +#back_sidebar .list li a span { background:url(<%= asset_path "add_mamber.png" %>) left top no-repeat; text-shadow: 0px 1px 0px #000; line-height: 18px; padding: 2px 0 1px 35px; } -#sidebar .list li a:hover span { +#back_sidebar .list li a:hover span { background-position:left bottom; color:#eeeeee; } -#sidebar .users .list .set_1 { +#back_sidebar .users .list .set_1 { background-position:left bottom; border-top:1px solid #406cc3; border-bottom:1px solid #242628; } -#sidebar .users .list .set_1 a span { +#back_sidebar .users .list .set_1 a span { background-position:left bottom; color:#eeeeee; } -#sidebar .roles .list .set_2 { +#back_sidebar .roles .list .set_2 { background-position:left bottom; border-top:1px solid #406cc3; border-bottom:1px solid #242628; } -#sidebar .roles .list .set_2 a span { +#back_sidebar .roles .list .set_2 a span { background-position:left bottom; color:#eeeeee; } diff --git a/app/assets/stylesheets/site_items.css.erb b/app/assets/stylesheets/site_items.css.erb index a4c5926f..151dabde 100644 --- a/app/assets/stylesheets/site_items.css.erb +++ b/app/assets/stylesheets/site_items.css.erb @@ -12,7 +12,7 @@ body{ color: #000000; font-family: Helvetica, '微軟正黑體'; } -#panel_banner_link{ +#back_banner_link{ background: url(<%= asset_path "orbitbar1.png" %>) repeat-x scroll 0 0; height: 50px; left: 0; @@ -28,7 +28,7 @@ body{ top: 1px; width: 250px; } -#orbit{ +#back_orbit{ background: url(<%= asset_path "bar_orbit.png" %>) no-repeat scroll 0 0 transparent; cursor:pointer; height: 43px; @@ -36,11 +36,11 @@ body{ position: relative; width: 41px; } -#orbit:hover{ +#back_orbit:hover{ background-position:0 -43px; box-shadow: 0 3px 3px #000000; } -#orbit:hover #orblist{ +#back_orbit:hover #orblist{ display:block; } #orblist{ @@ -101,10 +101,10 @@ body{ .lang a:hover{ text-decoration:underline; } -#content{ +#back_content{ height: 100%; } -#panel_footer{ +#back_footer{ background-color: #101010; bottom: 0; color: #FFFFFF; @@ -118,15 +118,15 @@ body{ .items_setup{ padding:42px 0 0 0; } -#sidebar .items_setup .list li{ +#back_sidebar .items_setup .list li{ padding: 6px 0 7px 5px; } -#sidebar .items_setup .list li a{ +#back_sidebar .items_setup .list li a{ display: inline; font-size: 0.9em; padding: 0; } -#sidebar .items_setup .list li a span{ +#back_sidebar .items_setup .list li a span{ background:none; padding:0; text-shadow:none; @@ -429,17 +429,17 @@ p{ margin:0 0 10px; } -#sidebar .items_setup .list li{ +#back_sidebar .items_setup .list li{ background:url(<%= asset_path "sidebar_li2.jpg" %>) repeat left top; border:none; padding: 0 0 0 5px; } -#sidebar .items_setup .list li a{ +#back_sidebar .items_setup .list li a{ line-height:31px; } -#sidebar .items_setup .list li:hover{ +#back_sidebar .items_setup .list li:hover{ background:url(<%= asset_path "sidebar_li2.jpg" %>) repeat left top; border:none; } -#sidebar .items_setup ul .list { +#back_sidebar .items_setup ul .list { } \ No newline at end of file diff --git a/app/views/admin/links/create.js.erb b/app/views/admin/links/create.js.erb index 67f6cc13..1580a6d5 100644 --- a/app/views/admin/links/create.js.erb +++ b/app/views/admin/links/create.js.erb @@ -1,3 +1,3 @@ -$('#panel_sidebar').html("<%= escape_javascript(render(:partial => 'admin/items/site_map_left_bar')) %>"); +$('#back_sidebar').html("<%= escape_javascript(render(:partial => 'admin/items/site_map_left_bar')) %>"); $('#panel_main').html("<%= escape_javascript(render(:partial => 'admin/links/show')) %>"); history.pushState(null, document.title, "<%= escape_javascript(admin_link_url(@item)) %>"); \ No newline at end of file diff --git a/app/views/admin/links/delete.js.erb b/app/views/admin/links/delete.js.erb index e17801e6..b1739526 100644 --- a/app/views/admin/links/delete.js.erb +++ b/app/views/admin/links/delete.js.erb @@ -1 +1 @@ -$('#panel_sidebar').html("<%= escape_javascript(render(:partial => 'admin/items/site_map_left_bar')) %>"); \ No newline at end of file +$('#back_sidebar').html("<%= escape_javascript(render(:partial => 'admin/items/site_map_left_bar')) %>"); \ No newline at end of file diff --git a/app/views/admin/pages/create.js.erb b/app/views/admin/pages/create.js.erb index ef5f7879..52b35e8d 100644 --- a/app/views/admin/pages/create.js.erb +++ b/app/views/admin/pages/create.js.erb @@ -1,3 +1,3 @@ -$('#panel_sidebar').html("<%= escape_javascript(render(:partial => 'admin/items/site_map_left_bar')) %>"); +$('#back_sidebar').html("<%= escape_javascript(render(:partial => 'admin/items/site_map_left_bar')) %>"); $('#panel_main').html("<%= escape_javascript(render(:partial => 'admin/pages/show')) %>"); history.pushState(null, document.title, "<%= escape_javascript(admin_page_url(@item)) %>"); \ No newline at end of file diff --git a/app/views/admin/pages/delete.js.erb b/app/views/admin/pages/delete.js.erb index e17801e6..b1739526 100644 --- a/app/views/admin/pages/delete.js.erb +++ b/app/views/admin/pages/delete.js.erb @@ -1 +1 @@ -$('#panel_sidebar').html("<%= escape_javascript(render(:partial => 'admin/items/site_map_left_bar')) %>"); \ No newline at end of file +$('#back_sidebar').html("<%= escape_javascript(render(:partial => 'admin/items/site_map_left_bar')) %>"); \ No newline at end of file diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb index c01962b9..63137048 100644 --- a/app/views/layouts/admin.html.erb +++ b/app/views/layouts/admin.html.erb @@ -11,21 +11,21 @@ <%= csrf_meta_tag %> -