From fc591ee308a05d0b68435f6f732a16654f9a4c3d Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Fri, 23 Dec 2011 18:02:45 +0800 Subject: [PATCH] Ray's back_end modification before sub_roles --- .rvmrc | 2 +- app/assets/images/h1_bg.png | Bin 958 -> 983 bytes app/assets/images/icon.png | Bin 6608 -> 6869 bytes app/assets/images/sidebar_li2.jpg | Bin 0 -> 342 bytes app/assets/stylesheets/admin.css.erb | 19 +- app/assets/stylesheets/admin_back_end.css.erb | 117 +++- app/assets/stylesheets/sidebar.css.erb | 85 +++ app/assets/stylesheets/site_assets.css.erb | 3 + app/assets/stylesheets/site_designs.css.erb | 26 + app/assets/stylesheets/site_edition.css.erb | 229 -------- app/assets/stylesheets/site_editor.css.erb | 4 +- app/assets/stylesheets/site_items.css.erb | 445 ++++++++++++++ app/helpers/admin/item_helper.rb | 2 +- app/views/admin/assets/admin_back_end.css.erb | 548 ++++++++++++++++++ app/views/admin/assets/edit.html.erb | 20 +- app/views/admin/assets/index.html.erb | 78 +-- app/views/admin/assets/new.html.erb | 20 +- app/views/admin/designs/index.html.erb | 34 +- app/views/admin/designs/new.html.erb | 21 +- .../admin/designs/upload_package.html.erb | 14 +- .../admin/items/_site_map_left_bar.html.erb | 4 +- app/views/admin/purchases/index.html.erb | 53 +- app/views/admin/sites/index.html.erb | 66 ++- app/views/admin/translations/edit.html.erb | 8 +- app/views/admin/translations/index.html.erb | 139 ++--- .../admin/user_attribute_models/edit.html.erb | 12 +- .../user_attribute_models/edit.html.erb.back | 14 + .../user_attribute_models/index.html.erb | 2 +- .../admin/user_attribute_models/new.html.erb | 2 +- app/views/admin/users/_side_bar.html.erb | 20 +- app/views/admin/users/edit.html.erb | 2 +- app/views/admin/users/index.html.erb | 2 +- app/views/admin/users/new.html.erb | 2 +- app/views/admin/users/show.html.erb | 2 +- app/views/layouts/admin.html.erb | 62 +- app/views/layouts/site_editor.html.erb | 18 +- config/config.yml | 2 +- config/locales/en.yml | 2 + config/locales/zh_tw.yml | 2 + 39 files changed, 1542 insertions(+), 539 deletions(-) create mode 100644 app/assets/images/sidebar_li2.jpg create mode 100644 app/assets/stylesheets/sidebar.css.erb create mode 100644 app/assets/stylesheets/site_assets.css.erb create mode 100644 app/assets/stylesheets/site_designs.css.erb delete mode 100644 app/assets/stylesheets/site_edition.css.erb create mode 100644 app/assets/stylesheets/site_items.css.erb create mode 100644 app/views/admin/assets/admin_back_end.css.erb create mode 100644 app/views/admin/user_attribute_models/edit.html.erb.back diff --git a/.rvmrc b/.rvmrc index fe5e9622f..15cdbf2b4 100644 --- a/.rvmrc +++ b/.rvmrc @@ -1 +1 @@ -rvm ruby-1.9.2-p290@orbit +rvm use ruby-1.9.2-p290@orbit diff --git a/app/assets/images/h1_bg.png b/app/assets/images/h1_bg.png index d6e901601b1f16ad722a053d914a8bfbbd99f810..bef4bbc81a172c3d34e6aad76d56eca341371d92 100644 GIT binary patch delta 319 zcmdnTew}@SIF|+o69WUohAZp}8x>WVVoc0T3@wZ;9F3gKO$-fP4K2-Gon0)=Or6Zl z9gU1koRt(RatnNYtz7bxOLJ56N<3X`m4G68DVZr&P`ysL^iE#HWB{|k0+%8sh2oN+ z)HJIU+!k2k(mPp?*(qJ))13oAA9;JaIEGZ*^6@>$d%%IisBFi!-|HWRYh>;D;wT`p z@pt9iCyWg4n@u)-{pESK^Wzr(tov2(lol0Fp1J$zzZEh+9=}?pEQ6=3pUXO@geCxogldog delta 294 zcmcc4zK?x^IF~2~69WSShkFRfC7_62N@j``RIdpxy^|L)8Ne(s#HC0{p|~U{ zHO(pow*^MH^iI}ecJiCefASR2M@F75jv*DdLb?v}GAIZflDZc3{l3?eM?XJ=dYzi# v-H>xy@obUI@mpV~?tgb%aeJ;DBOAjkcjcYe4l8N^bu)On`njxgN@xNApHx}U diff --git a/app/assets/images/icon.png b/app/assets/images/icon.png index a3fc685b1225d5d403ba543798749d631c6f410a..ab0afc4df44c81fadf09ac7dc890dd2d57a5e048 100644 GIT binary patch delta 3971 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/-MJ^$Z0n>Tox z?0>F6&}u}k?|zn9Nz!zoo+?v)t`Hh0bQESd&>X#cDHV?74Nx;@!!?33I5^$1lbY_= zH9v9W%a<=A<~cg(rj3`j%C%eiejXk(L#_6}7}M}ueR7jRPKg3uoHl} zaW6Hk4E#;2VREAo;(Gc)%l;0-BqwUk*mPtYV{!eRO^_-sniPTHl^q~9vg>VgA$lx) z3U3Bt*=U|uP(%&=77CHDU#8{{qk delta 3710 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 literal 0 HcmV?d00001 diff --git a/app/assets/stylesheets/admin.css.erb b/app/assets/stylesheets/admin.css.erb index 59324e972..9cbbb22b0 100644 --- a/app/assets/stylesheets/admin.css.erb +++ b/app/assets/stylesheets/admin.css.erb @@ -1,9 +1,12 @@ -/* - *This is a manifest file that'll automatically include all the stylesheets available in this directory - *and any sub-directories. You're free to add application-wide styles to this file and they'll appear at - *the top of the compiled file, but it's generally better to create a new file per style scope. - *= require reset - *= require_self - *= require message - *= require admin_back_end +/* + *This is a manifest file that'll automatically include all the stylesheets available in this directory + *and any sub-directories. You're free to add application-wide styles to this file and they'll appear at + *the top of the compiled file, but it's generally better to create a new file per style scope. + *= require reset + *= require_self + *= require message + *= require admin_back_end + *= require sidebar + *= require site_designs + *= require site_assets */ \ No newline at end of file diff --git a/app/assets/stylesheets/admin_back_end.css.erb b/app/assets/stylesheets/admin_back_end.css.erb index 89f2c874b..a350fc218 100644 --- a/app/assets/stylesheets/admin_back_end.css.erb +++ b/app/assets/stylesheets/admin_back_end.css.erb @@ -4,7 +4,7 @@ html, body{ padding: 0; } html{ - background: url(<%= asset_path "body.jpg" %>) no-repeat scroll 0 0 transparent; + background: url(<%= asset_path "body.jpg" %>) no-repeat fixed 0 0 transparent; background-size: cover; } @@ -116,16 +116,6 @@ body{ left: 0; box-shadow: 0 -3px 4px #000; } -#sidebar { - background: url(<%= asset_path "75.png" %>) repeat scroll left top transparent; - box-shadow: 3px 0 4px #472A12; - border-right: 1px solid #121212; - height: 100%; - left: 0; - position: fixed; - top: 0; - width: 220px; -} #search { background: url(<%= asset_path "search_block_bg.jpg" %>) repeat-x scroll left top transparent; height: 20px; @@ -140,7 +130,18 @@ body{ padding: 0 20px; width: 154px; } -h1 { +/* +#sidebar { + background: url(<%= asset_path "75.png" %>) repeat scroll left top transparent; + box-shadow: 3px 0 4px #472A12; + border-right: 1px solid #121212; + height: 100%; + left: 0; + position: fixed; + top: 0; + width: 220px; +} +#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; @@ -153,33 +154,33 @@ h1 { padding-left: 10px; text-shadow: 0 -1px 0 #000000; } -.member_setup .list { +#sidebar .list { color:#fff; font-size:12px; background:url(<%= asset_path "line.png" %>) repeat-x left bottom; } -.member_setup .list li { +#sidebar .list li { background:url(<%= asset_path "sidebar_li.jpg" %>) repeat-x left top; border-top:1px solid #424344; border-bottom:1px solid #000000; } -.member_setup .list li:hover { +#sidebar .list li:hover { background-position:left bottom; border-top:1px solid #406cc3; border-bottom:1px solid #242628; } -.member_setup .list li a { +#sidebar .list li a { display: block; padding: 7px 0 6px 12px; color:#c4c4c4; } -.member_setup .list li a span { +#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; } -.member_setup .list li a:hover span { +#sidebar .list li a:hover span { background-position:left bottom; color:#eeeeee; } @@ -210,6 +211,7 @@ h1 { background-position:left bottom; color:#eeeeee; } +*/ .main { height: 100%; margin-left: 260px; @@ -262,7 +264,7 @@ h1 { background:-moz-linear-gradient( center top, #000000 5%, #4f4f4f 100% ); filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#000000', endColorstr='#4f4f4f'); } -.button_bar a:last-child { +.button_bar a:last-child, .button_bar input { border-right:none; -moz-box-shadow:none; -webkit-box-shadow:none; @@ -285,6 +287,30 @@ h1 { .button_bar a:hover { color:#FFFFFF; } +.button_bar input { + background-color:transparent; + text-decoration:none; + text-shadow:0px -1px 0px #000000; + font-size:12px; + color:#EDEDED; + border-right:1px solid #555; + border-top:none; + border-left:none; + border-bottom:none; + -moz-box-shadow:1px 0px 0px black; + -webkit-box-shadow:1px 0px 0px black; + box-shadow:1px 0px 0px black; + padding: 3px 10px 1px; + display: inline-block; + float: left; +} +.button_bar input:focus { + padding: 4px 10px 0px !important; + text-shadow:0px 1px 0px #000000; + background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #000000), color-stop(1, #4f4f4f) ); + background:-moz-linear-gradient( center top, #000000 5%, #4f4f4f 100% ); + filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#000000', endColorstr='#4f4f4f'); +} .up { margin:10px 0; } @@ -413,19 +439,44 @@ h1 { .main table { width:100%; } + +.main th { + color:#fff; +} .main td { padding-left:20px; color:#fff; font-size:14px; - line-height:40px; + line-height:20px; +} +.main tr.have td{ + background: url(<%= asset_path "75.png" %>) repeat left top; + padding-bottom: 10px; + padding-top: 10px; + vertical-align: middle; +} +.main tr.have td:first-child{ + border-radius: 5px 0 0 5px; + -moz-border-radius: 5px 0 0 5px; + -webkit-border-radius: 5px 0 0 5px; +} +.main tr.have td:last-child{ + border-radius: 0 5px 5px 0; + -moz-border-radius: 0 5px 5px 0; + -webkit-border-radius: 0 5px 5px 0; } .main thead td { line-height:40px; font-size:16px; text-shadow: 0px 1px 1px #3e2914; } +.main thead th { + line-height:40px; + font-size:16px; + text-shadow: 0px 1px 1px #3e2914; +} .main thead td.action { - width:15% + width:140px; } .main tbody td.roles { background-image: url(<%= asset_path "roles_type.jpg" %>); @@ -442,7 +493,7 @@ h1 { display: inline-block; height: 19px; margin-right: 10px; - top: 8px; + outline:none; text-indent: -9999px; width: 19px; position: relative; @@ -465,6 +516,12 @@ h1 { .main tbody td.action a.delete:hover { background-position: -38px -19px; } +.main tbody td.action a.download { + background-position: -74px top; +} +.main tbody td.action a.download:hover { + background-position: -74px -19px; +} .main tbody td.action a.switch { background: url(<%= asset_path "switch.png" %>) no-repeat left 3px; width: 40px; @@ -476,10 +533,6 @@ h1 { background-position: -38px -19px; } .main tbody tr.have { - background: url(<%= asset_path "75.png" %>) repeat left top; - -moz-box-shadow: 0px 0px 6px #291508; /* Firefox */ - -webkit-box-shadow: 0px 0px 6px #291508;/* Safari 和 Chrome */ - box-shadow: 0px 0px 6px #291508; /* Opera 10.5 + */ } .main tbody tr.disable { opacity: 0.7; @@ -487,4 +540,16 @@ h1 { .main tbody tr { background:none; height:15px; +} +.main tbody tr.have .assets_pic { + height: 40px; + overflow: hidden; + width: 40px; + position: relative; +} +.main tbody tr.have .assets_pic img { + left: -15%; + position: absolute; + top: -15%; + width: 130%; } \ No newline at end of file diff --git a/app/assets/stylesheets/sidebar.css.erb b/app/assets/stylesheets/sidebar.css.erb new file mode 100644 index 000000000..a42490ea7 --- /dev/null +++ b/app/assets/stylesheets/sidebar.css.erb @@ -0,0 +1,85 @@ + +#sidebar { + background: url(<%= asset_path "75.png" %>) repeat scroll left top transparent; + box-shadow: 3px 0 4px #472A12; + border-right: 1px solid #121212; + height: 100%; + left: 0; + position: fixed; + top: 0; + width: 220px; +} + +#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; + color: #FFFFFF; + font-size: 16px; + font-weight: normal; + height: 40px; + line-height: 40px; + margin: 0; + padding-left: 10px; + text-shadow: 0 -1px 0 #000000; +} +#sidebar .list { + color:#fff; + font-size:12px; + background:url(<%= asset_path "line.png" %>) repeat-x left bottom; +} +#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 { + background-position:left bottom; + border-top:1px solid #406cc3; + border-bottom:1px solid #242628; +} +#sidebar .list li a { + display: block; + padding: 7px 0 6px 12px; + color:#c4c4c4; +} +#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 { + background-position:left bottom; + color:#eeeeee; +} +#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 { + background-position:left bottom; + color:#eeeeee; +} +#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 { + background-position:left bottom; + color:#eeeeee; +} +#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 { + background-position:left bottom; + color:#eeeeee; +} +#sidebar .translations_setup { + margin-top: 42px; +} \ No newline at end of file diff --git a/app/assets/stylesheets/site_assets.css.erb b/app/assets/stylesheets/site_assets.css.erb new file mode 100644 index 000000000..cd5e882d5 --- /dev/null +++ b/app/assets/stylesheets/site_assets.css.erb @@ -0,0 +1,3 @@ +.assets_setup{ + padding:42px 0 0 0; +} \ No newline at end of file diff --git a/app/assets/stylesheets/site_designs.css.erb b/app/assets/stylesheets/site_designs.css.erb new file mode 100644 index 000000000..cf8442d0c --- /dev/null +++ b/app/assets/stylesheets/site_designs.css.erb @@ -0,0 +1,26 @@ +.designs_setup{ + padding:42px 0 0 0; +} +.main2{ + padding:70px 0 0 0; +} + + +#sidebar .list li a span { + background:none; + padding: 0; +} + +h1{ + color:#fff; + margin:0 0 20px; +} +form p{ + margin:0 0 10px; +} +form label{ + color: #FFFFFF; + display: block; + width: 100px; +} + diff --git a/app/assets/stylesheets/site_edition.css.erb b/app/assets/stylesheets/site_edition.css.erb deleted file mode 100644 index fb469a0e7..000000000 --- a/app/assets/stylesheets/site_edition.css.erb +++ /dev/null @@ -1,229 +0,0 @@ -html, body{ - height: 100%; - margin: 0; - padding: 0; -} -html{ - background: url(<%= asset_path "body.jpg" %>) no-repeat scroll 0 0 transparent; - background-size: cover; -} -body{ - color: #000000; - font-family: helvetica,arial,sans-serif; - margin: 0; - padding: 0; -} - -#panel_banner_link{ - background: url(<%= asset_path "orbitbar1.png" %>) repeat-x scroll 0 0; - height: 52px; - left: 0; - position: absolute; - top: 0; - width: 100%; -} -.hmenu{ - height: 40px; - position: absolute; - right: 0; - top: 1px; - width: 250px; -} - - -#orbit{ - background: url(<%= asset_path "bar_orbit.png" %>) no-repeat scroll 0 0 transparent; - cursor:pointer; - height: 43px; - left: 10px; - position: relative; - width: 41px; -} - -#orbit:hover{ - background-position:0 -43px; - box-shadow: 0 3px 3px #000000; -} -#orbit:hover #orblist{ - display:block; -} -#orblist{ - background: none repeat scroll 0 0 #FFFFFF; - border-radius: 0 3px 3px 3px; - box-shadow: 0 3px 3px #000000; - display: none; - margin: 0; - padding: 10px; - position: absolute; - top: 43px; - width: 130px; - z-index:10; -} -#orblist li{ - border-bottom:1px solid #aaa; - list-style:none; -} -.orblink{ - color: #333333; - display: block; - font: 12px/100% arial,sans-serif; - padding: 5px; - text-decoration: none; -} -.orblink:hover{ - background:#eee; - color:#333; -} - -#log_out a{ - background: url(<%= asset_path "service_btn.png" %>) no-repeat scroll right 0 transparent; - border: medium none !important; - display: block !important; - height: 40px !important; - line-height: normal !important; - padding: 0 !important; - position: absolute; - right: 0px; - text-indent: -10000px; - top: 0px; - width: 43px !important; -} -#log_out a:hover{ - background: url(<%= asset_path "service_btn.png" %>) no-repeat scroll right bottom transparent !important; -} -.lang{ - color: #FFFFFF; - font-size: 15px; - line-height: 40px; - position: absolute; - right: 55px; - top: 0; -} - -.lang a{ - color:#fff; - text-decoration:none; -} - -.lang a:hover{ - text-decoration:underline; -} - -#panel_container{ - height: 100%; -} - -#panel_container h1{ - font: 28px/100% helvetica,arial,sans-serif; - margin: 0 0 20px; - padding: 0; -} - -#panel_header{ - background: none repeat scroll 0 0 #F1F1F1; - border-bottom: 1px solid #818181; - padding: 10px; -} -#panel_header:after { - content: "."; - display: block; - height: 0; - clear: both; - visibility: hidden; -} -#panel_header #panel_nav{ - margin:0; - padding:0; - width:100%; -} - -#panel_header #panel_nav li{ - float: left; - list-style: none outside none; -} - -#panel_header #panel_nav li a{ - background: none repeat scroll 0 0 #fff; - border-radius: 13px 13px 13px 13px; - border: 1px solid #D6D6D6; - color: #000000; - float: left; - font-size:15px; - margin: 0 20px 0 0; - padding: 5px 10px; - text-decoration: none; -} - -#panel_header #panel_nav li a:hover{ - background: none repeat scroll 0 0 #818181; - border-radius: 13px 13px 13px 13px; - color: #fff; -} - -#panel_content{ - height: 100%; -} - - - -#panel_sidebar2{ - background: none repeat scroll 0 0 rgba(0, 0, 0, 0.75); - box-shadow: 3px 0 3px #000000; - float: left; - height: 100%; - width: 16%; -} -#panel_sidebar{ - padding: 62px 0 0; -} -#panel_sidebar ul{ - background: none repeat scroll 0 0 #13547C; - margin: 0; - padding: 0 0 0 10px; -} -#panel_sidebar ul li{ - background: none repeat scroll 0 0 #13547C; - border-top: 1px solid #145B87; - color: #FFFFFF; - font-size: 11px; - line-height: 29px; - list-style: none outside none; -} -#panel_sidebar li ul{ -} -#panel_sidebar li ul ul{ -} -#panel_sidebar a{ - color: #FFFFFF; - font-size: 11px; - text-decoration: none; -} -#panel_sidebar a:hover{} -#panel_main2{ - background:#fff; - float: left; - height: 100%; - padding: 0 1%; - width: 82%; -} -#panel_main{ - padding: 62px 0 0; -} - -#panel_main p label{ - display: block; - padding: 3px; -} -#panel_main .translation_missing{ - float: left; - padding: 3px; - width: 100px; - -} -.text{ - border: 1px solid #818181; - border-radius: 3px 3px 3px 3px; - font: 12px/100% helvetica,arial,sans-serif; - padding: 3px; - width: 205px; -} \ No newline at end of file diff --git a/app/assets/stylesheets/site_editor.css.erb b/app/assets/stylesheets/site_editor.css.erb index 859c1e790..1e16ea3f4 100644 --- a/app/assets/stylesheets/site_editor.css.erb +++ b/app/assets/stylesheets/site_editor.css.erb @@ -2,7 +2,9 @@ *This is a manifest file that'll automatically include all the stylesheets available in this directory *and any sub-directories. You're free to add application-wide styles to this file and they'll appear at *the top of the compiled file, but it's generally better to create a new file per style scope. + *= require reset *= require_self *= require message - *= require site_edition + *= require site_items + *= require sidebar */ \ No newline at end of file diff --git a/app/assets/stylesheets/site_items.css.erb b/app/assets/stylesheets/site_items.css.erb new file mode 100644 index 000000000..a4c5926fb --- /dev/null +++ b/app/assets/stylesheets/site_items.css.erb @@ -0,0 +1,445 @@ +html, body{ + height: 100%; + margin: 0; + padding: 0; +} +html{ + background: url(<%= asset_path "body.jpg" %>) no-repeat fixed 0 0 transparent; + background-size: cover; +} + +body{ + color: #000000; + font-family: Helvetica, '微軟正黑體'; +} +#panel_banner_link{ + background: url(<%= asset_path "orbitbar1.png" %>) repeat-x scroll 0 0; + height: 50px; + left: 0; + position: fixed; + top: 0; + width: 100%; + z-index: 5; +} +.hmenu{ + height: 40px; + position: absolute; + right: 0; + top: 1px; + width: 250px; +} +#orbit{ + background: url(<%= asset_path "bar_orbit.png" %>) no-repeat scroll 0 0 transparent; + cursor:pointer; + height: 43px; + left: 10px; + position: relative; + width: 41px; +} +#orbit:hover{ + background-position:0 -43px; + box-shadow: 0 3px 3px #000000; +} +#orbit:hover #orblist{ + display:block; +} +#orblist{ + background: none repeat scroll 0 0 #FFFFFF; + border-radius: 0 3px 3px 3px; + box-shadow: 0 3px 3px #000000; + display: none; + margin: 0; + padding: 10px; + position: absolute; + top: 43px; + width: 130px; +} +#orblist li{ + border-bottom:1px solid #aaa; + list-style:none; +} +.orblink{ + color: #333333; + display: block; + font: 12px/100% arial,sans-serif; + padding: 5px; + text-decoration: none; +} +.orblink:hover{ + background:#eee; + color:#333; +} + +#log_out a{ + background: url(<%= asset_path "service_btn.png" %>) no-repeat scroll right 0 transparent; + border: medium none !important; + display: block !important; + height: 40px !important; + line-height: normal !important; + padding: 0 !important; + position: absolute; + right: 0px; + text-indent: -10000px; + top: 0px; + width: 43px !important; +} +#log_out a:hover{ + background: url(<%= asset_path "service_btn.png" %>) no-repeat scroll right bottom transparent !important; +} +.lang{ + color: #FFFFFF; + font-size: 15px; + line-height: 40px; + position: absolute; + right: 55px; + top: 0; +} +.lang a{ + color:#fff; + text-decoration:none; +} +.lang a:hover{ + text-decoration:underline; +} +#content{ + height: 100%; +} +#panel_footer{ + background-color: #101010; + bottom: 0; + color: #FFFFFF; + font-size: 11px; + padding: 10px; + position: fixed; + width: 100%; + left: 0; + box-shadow: 0 -3px 4px #000; +} +.items_setup{ + padding:42px 0 0 0; +} +#sidebar .items_setup .list li{ + padding: 6px 0 7px 5px; +} +#sidebar .items_setup .list li a{ + display: inline; + font-size: 0.9em; + padding: 0; +} +#sidebar .items_setup .list li a span{ + background:none; + padding:0; + text-shadow:none; +} +.main { + background: none repeat scroll 0 0 #FFFFFF; + height: 100%; + margin-left: 220px; + padding: 0 40px; + position: relative; +} +.main_list { + padding-top: 70px; +} +.main_list ul { + clear:both; +} +#porfile { + padding-top: 100px; +} +/*add_buttom*/ +.button_bar { + float: right; + -moz-box-shadow:inset 0px 1px 0px 0px #666, 0px 0px 3px black; + -webkit-box-shadow:inset 0px 1px 0px 0px #666, 0px 0px 3px black; + box-shadow:inset 0px 1px 0px 0px #666, 0px 0px 3px black; + background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #4f4f4f), color-stop(1, #000000) ); + background:-moz-linear-gradient( center top, #4f4f4f 5%, #000000 100% ); + filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#4f4f4f', endColorstr='#000000'); + background-color:#4f4f4f; + -moz-border-radius:5px; + -webkit-border-radius:5px; + border-radius:5px; + display:inline-block; + padding:0; + margin:10px 0 60px; +} +.button_bar a { + text-decoration:none; + text-shadow:0px -1px 0px #000000; + font-size:12px; + color:#EDEDED; + border-right:1px solid #555; + -moz-box-shadow:1px 0px 0px black; + -webkit-box-shadow:1px 0px 0px black; + box-shadow:1px 0px 0px black; + padding: 6px 10px 4px; + display: inline-block; + float: left; +} +.button_bar a:active { + padding: 7px 10px 3px !important; + text-shadow:0px 1px 0px #000000; + background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #000000), color-stop(1, #4f4f4f) ); + background:-moz-linear-gradient( center top, #000000 5%, #4f4f4f 100% ); + filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#000000', endColorstr='#4f4f4f'); +} +.button_bar a:last-child { + border-right:none; + -moz-box-shadow:none; + -webkit-box-shadow:none; + box-shadow:none; + -moz-border-radius:0px 5px 5px 0px; + -webkit-border-radius:0px 5px 5px 0px; + border-radius:0px 5px 5px 0px; +} +.button_bar a:first-child { + -moz-border-radius:5px 0px 0px 5px; + -webkit-border-radius:5px 0px 0px 5px; + border-radius:5px 0px 0px 5px; +} +.button_bar a.new { + padding: 5px 10px; + -moz-border-radius:5px; + -webkit-border-radius:5px; + border-radius:5px; +} +.button_bar a:hover { + color:#FFFFFF; +} +.up { + margin:10px 0; +} +#person { + left: 245px; + position: fixed; + text-align: center; + top: 75px; + width: 140px; + background-color:#FFF; + padding:15px; + border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + -moz-box-shadow: 0px 0px 4px #180902; /* Firefox */ + -webkit-box-shadow: 0px 0px 4px #180902;/* Safari 和 Chrome */ + box-shadow: 0px 0px 4px #180902; /* Opera 10.5 + */ +} +#file { + display:none; +} +#person img { +} +.user_mail { + border: medium none; + border:1px solid #DDDDDD; + color: #666666; + font-size: 12px; + width: 140px; +} +#person label { + display: block; + margin: 15px 0 0; +} +#person label input { +} +#person label #user_admin { + float:right; + margin: 0; +} +#person label span { + text-align:left; + font-size:11px; + color:#888; + display:block; +} +#person select { + border: 1px solid #DDDDDD; + padding: 0; + width: 140px; +} +#porfile .users{ + margin-left: 180px; +} +.roles_block { + background: url(<%= asset_path "75.png" %>) repeat left top; + min-width:710px; + margin-bottom:50px; + position:relative; + padding-bottom: 20px; + border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + -moz-box-shadow: 0px 0px 4px #180902; /* Firefox */ + -webkit-box-shadow: 0px 0px 4px #180902;/* Safari 和 Chrome */ + box-shadow: 0px 0px 4px #180902; /* Opera 10.5 + */ +} +.roles_block h2 { + color: #FFFFFF; + font-weight: normal; + margin: 0; + padding: 0; + position: absolute; + text-shadow: 0 3px 2px #000000; + top: -30px; +} +.main hr { + height:8px; + border:none; + margin:0; + border-radius: 5px 5px 0px 0px; + -moz-border-radius: 5px 5px 0px 0px; + -webkit-border-radius: 5px 5px 0px 0px; + border-bottom:1px solid #000; +} +.main2{ + padding:70px 0 0; +} +#basic_block hr { + background-color: #666666; +} +#teacher_block hr { + background-color: #0071A9; +} +#student_block hr { + background-color: #AF0045; +} +.info_input { + padding:10px 20px; +} +.info_input table { + color:#fff; + width:100%; + font-size:14px; +} +.info_input table td { + padding:5px 10px 5px 0; + width: 10%; +} +.info_input .list_head { + background:url(<%= asset_path "line.png" %>) left bottom repeat-x; +} +.info_input .list_head td { +} +.info_input .list_item { + color:#AEAEAE; +} +.info_input .add { + display:block; + padding-left:22px; + font-size:12px; + line-height:21px; + height:19px; + background:url(<%= asset_path "icon.png" %>) no-repeat -59px 0; + margin-top: 10px; + color: #DDDDDD; +} + +.main table { + width:100%; +} +.main td { + padding-left:20px; + color:#fff; + font-size:14px; + line-height:40px; +} +.main tr.have td{ + background: url(<%= asset_path "75.png" %>) repeat left top; +} +.main tr.have td:first-child{ + border-radius: 5px 0 0 5px; + -moz-border-radius: 5px 0 0 5px; + -webkit-border-radius: 5px 0 0 5px; +} +.main tr.have td:last-child{ + border-radius: 0 5px 5px 0; + -moz-border-radius: 0 5px 5px 0; + -webkit-border-radius: 0 5px 5px 0; +} +.main thead td { + line-height:40px; + font-size:16px; + text-shadow: 0px 1px 1px #3e2914; +} +.main thead td.action { + width:140px; +} +.main tbody td.roles { + background-image: url(<%= asset_path "roles_type.jpg" %>); + background-repeat: repeat-x; +} +.main tbody td.teacher { + background-position: 0 -54px; +} +.main tbody td.student { + background-position: 0 -5px; +} +.main tbody td.action a { + background-image: url(<%= asset_path "icon.png" %>); + display: inline-block; + height: 19px; + margin-right: 10px; + top: 8px; + text-indent: -9999px; + width: 19px; + position: relative; +} +.main tbody td.action a.show { + background-position: left top; +} +.main tbody td.action a.show:hover { + background-position: left -19px; +} +.main tbody td.action a.edit { + background-position: -19px top; +} +.main tbody td.action a.edit:hover { + background-position: -19px -19px; +} +.main tbody td.action a.delete { + background-position: -38px top; +} +.main tbody td.action a.delete:hover { + background-position: -38px -19px; +} +.main tbody td.action a.switch { + background: url(<%= asset_path "switch.png" %>) no-repeat left 3px; + width: 40px; +} +.main tbody tr.disable td.action a.switch { + background-position:left bottom; +} +.main tbody td.action a.delete:hover { + background-position: -38px -19px; +} +.main tbody tr.have { +} +.main tbody tr.disable { + opacity: 0.7; +} +.main tbody tr { + background:none; + height:15px; +} +h1{ + margin:0 0 20px; +} +p{ + margin:0 0 10px; +} + +#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{ + line-height:31px; +} +#sidebar .items_setup .list li:hover{ + background:url(<%= asset_path "sidebar_li2.jpg" %>) repeat left top; + border:none; +} +#sidebar .items_setup ul .list { +} \ No newline at end of file diff --git a/app/helpers/admin/item_helper.rb b/app/helpers/admin/item_helper.rb index 2f2ec3b39..db75619be 100644 --- a/app/helpers/admin/item_helper.rb +++ b/app/helpers/admin/item_helper.rb @@ -9,7 +9,7 @@ module Admin::ItemHelper when 'Link' dest = admin_link_path(node) end - ret << "
    " + ret << "
      " ret << "
    • " ret << (link_to node.name, dest) ret << ' | ' << (link_to t('admin.edit'), eval("edit_admin_#{node._type.downcase}_path(node)")) if node._type.eql?('Page') diff --git a/app/views/admin/assets/admin_back_end.css.erb b/app/views/admin/assets/admin_back_end.css.erb new file mode 100644 index 000000000..11b801100 --- /dev/null +++ b/app/views/admin/assets/admin_back_end.css.erb @@ -0,0 +1,548 @@ +html, body{ + height: 100%; + margin: 0; + padding: 0; +} +html{ + background: url(<%= asset_path "body.jpg" %>) no-repeat fixed 0 0 transparent; + background-size: cover; +} + +body{ + color: #000000; + font-family: Helvetica, '微軟正黑體'; +} + +#panel_banner_link{ + background: url(<%= asset_path "orbitbar1.png" %>) repeat-x scroll 0 0; + height: 50px; + left: 0; + position: fixed; + top: 0; + width: 100%; + z-index: 5; +} +.hmenu{ + height: 40px; + position: absolute; + right: 0; + top: 1px; + width: 250px; +} +#orbit{ + background: url(<%= asset_path "bar_orbit.png" %>) no-repeat scroll 0 0 transparent; + cursor:pointer; + height: 43px; + left: 10px; + position: relative; + width: 41px; +} +#orbit:hover{ + background-position:0 -43px; + box-shadow: 0 3px 3px #000000; +} +#orbit:hover #orblist{ + display:block; +} +#orblist{ + background: none repeat scroll 0 0 #FFFFFF; + border-radius: 0 3px 3px 3px; + box-shadow: 0 3px 3px #000000; + display: none; + margin: 0; + padding: 10px; + position: absolute; + top: 43px; + width: 130px; +} +#orblist li{ + border-bottom:1px solid #aaa; + list-style:none; +} +.orblink{ + color: #333333; + display: block; + font: 12px/100% arial,sans-serif; + padding: 5px; + text-decoration: none; +} +.orblink:hover{ + background:#eee; + color:#333; +} + +#log_out a{ + background: url(<%= asset_path "service_btn.png" %>) no-repeat scroll right 0 transparent; + border: medium none !important; + display: block !important; + height: 40px !important; + line-height: normal !important; + padding: 0 !important; + position: absolute; + right: 0px; + text-indent: -10000px; + top: 0px; + width: 43px !important; +} +#log_out a:hover{ + background: url(<%= asset_path "service_btn.png" %>) no-repeat scroll right bottom transparent !important; +} +.lang{ + color: #FFFFFF; + font-size: 15px; + line-height: 40px; + position: absolute; + right: 55px; + top: 0; +} +.lang a{ + color:#fff; + text-decoration:none; +} +.lang a:hover{ + text-decoration:underline; +} +#content{ + height: 100%; +} +#panel_footer{ + background-color: #101010; + bottom: 0; + color: #FFFFFF; + font-size: 11px; + padding: 10px; + position: fixed; + width: 100%; + left: 0; + box-shadow: 0 -3px 4px #000; +} +#search { + background: url(<%= asset_path "search_block_bg.jpg" %>) repeat-x scroll left top transparent; + height: 20px; + margin-top: 43px; + padding: 15px 12px; +} +#search input { + background: url(<%= asset_path "search_bg.png" %>) no-repeat scroll left top transparent; + border: medium none; + font-family: Helvetica; + height: 20px; + padding: 0 20px; + width: 154px; +} +/* +#sidebar { + background: url(<%= asset_path "75.png" %>) repeat scroll left top transparent; + box-shadow: 3px 0 4px #472A12; + border-right: 1px solid #121212; + height: 100%; + left: 0; + position: fixed; + top: 0; + width: 220px; +} +#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; + color: #FFFFFF; + font-size: 12px; + font-weight: normal; + height: 21px; + line-height: 21px; + margin: 0; + padding-left: 10px; + text-shadow: 0 -1px 0 #000000; +} +#sidebar .list { + color:#fff; + font-size:12px; + background:url(<%= asset_path "line.png" %>) repeat-x left bottom; +} +#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 { + background-position:left bottom; + border-top:1px solid #406cc3; + border-bottom:1px solid #242628; +} +#sidebar .list li a { + display: block; + padding: 7px 0 6px 12px; + color:#c4c4c4; +} +#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 { + background-position:left bottom; + color:#eeeeee; +} +#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 { + background-position:left bottom; + color:#eeeeee; +} +#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 { + background-position:left bottom; + color:#eeeeee; +} +#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 { + background-position:left bottom; + color:#eeeeee; +} +*/ +.main { + height: 100%; + margin-left: 260px; + padding-right: 40px; + position: relative; +} +.main_list { + padding-top: 70px; +} +.main_list ul { + clear:both; +} +#porfile { + padding-top: 100px; +} +/*add_buttom*/ +.button_bar { + float: right; + -moz-box-shadow:inset 0px 1px 0px 0px #666, 0px 0px 3px black; + -webkit-box-shadow:inset 0px 1px 0px 0px #666, 0px 0px 3px black; + box-shadow:inset 0px 1px 0px 0px #666, 0px 0px 3px black; + background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #4f4f4f), color-stop(1, #000000) ); + background:-moz-linear-gradient( center top, #4f4f4f 5%, #000000 100% ); + filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#4f4f4f', endColorstr='#000000'); + background-color:#4f4f4f; + -moz-border-radius:5px; + -webkit-border-radius:5px; + border-radius:5px; + display:inline-block; + padding:0; + margin:10px 0 60px; +} +.button_bar a { + text-decoration:none; + text-shadow:0px -1px 0px #000000; + font-size:12px; + color:#EDEDED; + border-right:1px solid #555; + -moz-box-shadow:1px 0px 0px black; + -webkit-box-shadow:1px 0px 0px black; + box-shadow:1px 0px 0px black; + padding: 6px 10px 4px; + display: inline-block; + float: left; +} +.button_bar a:active { + padding: 7px 10px 3px !important; + text-shadow:0px 1px 0px #000000; + background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #000000), color-stop(1, #4f4f4f) ); + background:-moz-linear-gradient( center top, #000000 5%, #4f4f4f 100% ); + filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#000000', endColorstr='#4f4f4f'); +} +.button_bar a:last-child, .button_bar input { + border-right:none; + -moz-box-shadow:none; + -webkit-box-shadow:none; + box-shadow:none; + -moz-border-radius:0px 5px 5px 0px; + -webkit-border-radius:0px 5px 5px 0px; + border-radius:0px 5px 5px 0px; +} +.button_bar a:first-child { + -moz-border-radius:5px 0px 0px 5px; + -webkit-border-radius:5px 0px 0px 5px; + border-radius:5px 0px 0px 5px; +} +.button_bar a.new { + padding: 5px 10px; + -moz-border-radius:5px; + -webkit-border-radius:5px; + border-radius:5px; +} +.button_bar a:hover { + color:#FFFFFF; +} +.button_bar input { + background-color:transparent; + text-decoration:none; + text-shadow:0px -1px 0px #000000; + font-size:12px; + color:#EDEDED; + border-right:1px solid #555; + border-top:none; + border-left:none; + border-bottom:none; + -moz-box-shadow:1px 0px 0px black; + -webkit-box-shadow:1px 0px 0px black; + box-shadow:1px 0px 0px black; + padding: 3px 10px 1px; + display: inline-block; + float: left; +} +.up { + margin:10px 0; +} +#person { + left: 245px; + position: fixed; + text-align: center; + top: 75px; + width: 140px; + background-color:#FFF; + padding:15px; + border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + -moz-box-shadow: 0px 0px 4px #180902; /* Firefox */ + -webkit-box-shadow: 0px 0px 4px #180902;/* Safari 和 Chrome */ + box-shadow: 0px 0px 4px #180902; /* Opera 10.5 + */ +} +#file { + display:none; +} +#person img { +} +.user_mail { + border: medium none; + border:1px solid #DDDDDD; + color: #666666; + font-size: 12px; + width: 140px; +} +#person label { + display: block; + margin: 15px 0 0; +} +#person label input { +} +#person label #user_admin { + float:right; + margin: 0; +} +#person label span { + text-align:left; + font-size:11px; + color:#888; + display:block; +} +#person select { + border: 1px solid #DDDDDD; + padding: 0; + width: 140px; +} +#porfile .users{ + margin-left: 180px; +} +.roles_block { + background: url(<%= asset_path "75.png" %>) repeat left top; + min-width:710px; + margin-bottom:50px; + position:relative; + padding-bottom: 20px; + border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + -moz-box-shadow: 0px 0px 4px #180902; /* Firefox */ + -webkit-box-shadow: 0px 0px 4px #180902;/* Safari 和 Chrome */ + box-shadow: 0px 0px 4px #180902; /* Opera 10.5 + */ +} +.roles_block h2 { + color: #FFFFFF; + font-weight: normal; + margin: 0; + padding: 0; + position: absolute; + text-shadow: 0 3px 2px #000000; + top: -30px; +} +.main hr { + height:8px; + border:none; + margin:0; + border-radius: 5px 5px 0px 0px; + -moz-border-radius: 5px 5px 0px 0px; + -webkit-border-radius: 5px 5px 0px 0px; + border-bottom:1px solid #000; +} +#basic_block hr { + background-color: #666666; +} +#teacher_block hr { + background-color: #0071A9; +} +#student_block hr { + background-color: #AF0045; +} +.info_input { + padding:10px 20px; +} +.info_input table { + color:#fff; + width:100%; + font-size:14px; +} +.info_input table td { + padding:5px 10px 5px 0; + width: 10%; +} +.info_input .list_head { + background:url(<%= asset_path "line.png" %>) left bottom repeat-x; +} +.info_input .list_head td { +} +.info_input .list_item { + color:#AEAEAE; +} +.info_input .add { + display:block; + padding-left:22px; + font-size:12px; + line-height:21px; + height:19px; + background:url(<%= asset_path "icon.png" %>) no-repeat -59px 0; + margin-top: 10px; + color: #DDDDDD; +} + +.main table { + width:100%; +} + +.main th { + color:#fff; +} +.main td { + padding-left:20px; + color:#fff; + font-size:14px; + line-height:20px; +} +.main tr.have td{ + background: url(<%= asset_path "75.png" %>) repeat left top; + padding-bottom: 10px; + padding-top: 10px; + vertical-align: middle; +} +.main tr.have td:first-child{ + border-radius: 5px 0 0 5px; + -moz-border-radius: 5px 0 0 5px; + -webkit-border-radius: 5px 0 0 5px; +} +.main tr.have td:last-child{ + border-radius: 0 5px 5px 0; + -moz-border-radius: 0 5px 5px 0; + -webkit-border-radius: 0 5px 5px 0; +} +.main thead td { + line-height:40px; + font-size:16px; + text-shadow: 0px 1px 1px #3e2914; +} +.main thead th { + line-height:40px; + font-size:16px; + text-shadow: 0px 1px 1px #3e2914; +} +.main thead td.action { + width:140px; +} +.main tbody td.roles { + background-image: url(<%= asset_path "roles_type.jpg" %>); + background-repeat: repeat-x; +} +.main tbody td.teacher { + background-position: 0 -54px; +} +.main tbody td.student { + background-position: 0 -5px; +} +.main tbody td.action a { + background-image: url(<%= asset_path "icon.png" %>); + display: inline-block; + height: 19px; + margin-right: 10px; + outline:none; + text-indent: -9999px; + width: 19px; + position: relative; +} +.main tbody td.action a.show { + background-position: left top; +} +.main tbody td.action a.show:hover { + background-position: left -19px; +} +.main tbody td.action a.edit { + background-position: -19px top; +} +.main tbody td.action a.edit:hover { + background-position: -19px -19px; +} +.main tbody td.action a.delete { + background-position: -38px top; +} +.main tbody td.action a.delete:hover { + background-position: -38px -19px; +} +.main tbody td.action a.download { + background-position: -74px top; +} +.main tbody td.action a.download:hover { + background-position: -74px -19px; +} +.main tbody td.action a.switch { + background: url(<%= asset_path "switch.png" %>) no-repeat left 3px; + width: 40px; +} +.main tbody tr.disable td.action a.switch { + background-position:left bottom; +} +.main tbody td.action a.delete:hover { + background-position: -38px -19px; +} +.main tbody tr.have { +} +.main tbody tr.disable { + opacity: 0.7; +} +.main tbody tr { + background:none; + height:15px; +} +.main tbody tr.have .assets_pic { + height: 40px; + overflow: hidden; + width: 40px; + position: relative; +} +.main tbody tr.have .assets_pic img { + left: -15%; + position: absolute; + top: -15%; + width: 130%; +} \ No newline at end of file diff --git a/app/views/admin/assets/edit.html.erb b/app/views/admin/assets/edit.html.erb index 45b7f9783..6b2e5987e 100644 --- a/app/views/admin/assets/edit.html.erb +++ b/app/views/admin/assets/edit.html.erb @@ -1,10 +1,12 @@ -

      <%= t('editing_asset') %>

      +
      +

      <%= t('editing_asset') %>

      -<% form_for @asset, :url => admin_asset_path(@asset), :html => { :multipart => true } do |f| %> - <%= f.error_messages %> - <%= render :partial => "form", :locals => { :f => f } %> - -

      - <%= f.submit t('update') %> <%= link_back %> -

      -<% end %> + <% form_for @asset, :url => admin_asset_path(@asset), :html => { :multipart => true } do |f| %> + <%= f.error_messages %> + <%= render :partial => "form", :locals => { :f => f } %> + +

      + <%= f.submit t('update') %> <%= link_back %> +

      + <% end %> +
      \ No newline at end of file diff --git a/app/views/admin/assets/index.html.erb b/app/views/admin/assets/index.html.erb index a5b721ab0..a5d03e8df 100644 --- a/app/views/admin/assets/index.html.erb +++ b/app/views/admin/assets/index.html.erb @@ -1,34 +1,44 @@ -<% content_for :secondary do %> -
        -
      • <%= link_to t(:new_asset, :scope => :admin), new_admin_asset_path, :class => 'button positive' %>
        • -
      -<% end -%> - -

      <%= t('admin.list_assets') %>

      - - - - - - - - - - - - -<% @assets.each do |asset| %> - - - - - - - - - -<% end %> -
      <%= t('admin.id') %><%= t('admin.file_name') %><%= t('admin.description') %><%= t('admin.format') %><%= t('admin.orig_upload_file') %><%= t('admin.file_size') %><%= t('admin.action') %>
      <%= asset.id %><%= link_to asset.filename, asset.data.url, :target => '_blank' %><%= asset.description %><%= asset.data.file.content_type %><%= asset.data_filename %><%= number_to_human_size(asset.data.file.file_length) %> - <%= link_to t(:edit), edit_admin_asset_path(asset) %> | - <%= link_to t(:delete), admin_asset_path(asset), :confirm => t('sure?'), :method => :delete %> -
      +<% content_for :secondary do %> +
      +
        +
      • <%= link_to t(:new_asset, :scope => :admin), new_admin_asset_path, :class => 'button positive' %>
        • +
      +
      +<% end -%> + +
      +

      <%= t('admin.list_assets') %>

      + + + + + + + <% @assets.each do |asset| %> + + + + + + + + + + + + + <% end %> +
      <%= t('admin.id') %> + <%= t('admin.file_name') %> + <%= t('admin.description') %> + <%= t('admin.format') %> + <%= t('admin.orig_upload_file') %> + <%= t('admin.file_size') %> + <%= t('admin.action') %> +
      <%= asset.id %>
      <%= image_tag(asset.data.url) %>
      + <%#= link_to asset.filename, asset.data.url, :target => '_blank' %> +       		<%= asset.description %><%= asset.data.file.content_type %><%= asset.data_filename %><%= number_to_human_size(asset.data.file.file_length) %> + <%= link_to t(:edit), edit_admin_asset_path(asset), :class => 'edit' %> + <%= link_to t(:delete), admin_asset_path(asset), :confirm => t('sure?'), :method => :delete, :class => 'delete' %> +
      +
      \ No newline at end of file diff --git a/app/views/admin/assets/new.html.erb b/app/views/admin/assets/new.html.erb index 0461e607c..ad17dfa02 100644 --- a/app/views/admin/assets/new.html.erb +++ b/app/views/admin/assets/new.html.erb @@ -1,10 +1,12 @@ -

      <%= t('admin.new_asset') %>

      +
      +

      <%= t('admin.new_asset') %>

      -<%= form_for :asset, :url => admin_assets_path, :html => { :multipart => true } do |f| %> - <%= f.error_messages %> - <%= render :partial => "form", :locals => { :f => f } %> - -

      - <%= f.submit t('create') %> <%= link_back %> -

      -<% end %> + <%= form_for :asset, :url => admin_assets_path, :html => { :multipart => true } do |f| %> + <%= f.error_messages %> + <%= render :partial => "form", :locals => { :f => f } %> +
      + <%= link_back %> + <%= f.submit t('create') %> +
      + <% end %> +
      \ No newline at end of file diff --git a/app/views/admin/designs/index.html.erb b/app/views/admin/designs/index.html.erb index 76ebecf4c..d9c344374 100644 --- a/app/views/admin/designs/index.html.erb +++ b/app/views/admin/designs/index.html.erb @@ -1,31 +1,37 @@ <% content_for :secondary do %> -
        -
      • <%= link_to t('admin.new_design'), new_admin_design_path, :class => 'seclink1' %>
        • -
      • <%= link_to t('admin.upload_design'), upload_package_admin_designs_path, :class => 'seclink2' %>
        • -
      +
      +

      <%= t('admin.setup_designs') %>

      +
        +
      • <%= link_to content_tag(:span, t('admin.new_design')), new_admin_design_path, :class => 'seclink1' %>
        • +
      • <%= link_to content_tag(:span, t('admin.upload_design')), upload_package_admin_designs_path, :class => 'seclink2' %>
        • +
      +
      <% end -%> <%= flash_messages %> - +

      <%= t('admin.list_designs') %>

      + - - - - + + + + - + <% @designs.each do |design| %> - + - + <% end %>
      <%= t('admin.title') %><%= t('admin.author') %><%= t('admin.intro') %><%= t('admin.action') %><%= t('admin.title') %><%= t('admin.author') %><%= t('admin.intro') %><%= t('admin.action') %>
      <%= design.title %> <%= design.author %> <%= design.intro %> - <%= link_to t(:edit), edit_admin_design_path(design) %> | - <%= link_to t(:delete), admin_design_path(design), :confirm => t('sure?'), :method => :delete %> + + <%= link_to t(:edit), edit_admin_design_path(design), :class => 'edit' %> + <%= link_to t(:delete), admin_design_path(design), :confirm => t('sure?'), :method => :delete, :class => 'delete' %>
      +
      \ No newline at end of file diff --git a/app/views/admin/designs/new.html.erb b/app/views/admin/designs/new.html.erb index ded2237a4..003ac47ee 100644 --- a/app/views/admin/designs/new.html.erb +++ b/app/views/admin/designs/new.html.erb @@ -1,10 +1,13 @@ -

      <%= t('admin.new_design') %>

      +
      +

      <%= t('admin.new_design') %>

      -<%= form_for :design, :url => admin_designs_path do |f| %> - <%= f.error_messages %> - <%= render :partial => "form", :locals => { :f => f } %> - -

      - <%= f.submit t('create') %> <%= link_back %> -

      -<% end %> + <%= form_for :design, :url => admin_designs_path do |f| %> + <%= f.error_messages %> + <%= render :partial => "form", :locals => { :f => f } %> + +
      + <%= link_back %> + <%= f.submit t('create') %> +
      + <% end %> +
      \ No newline at end of file diff --git a/app/views/admin/designs/upload_package.html.erb b/app/views/admin/designs/upload_package.html.erb index 08ce91cf1..0c07de1ec 100644 --- a/app/views/admin/designs/upload_package.html.erb +++ b/app/views/admin/designs/upload_package.html.erb @@ -1,9 +1,11 @@ +
      + <%= form_tag '',:multipart => true,:action=>"post" do |f| %> -<%= form_tag '',:multipart => true,:action=>"post" do |f| %> +

      + <%= file_field :design,:package_file %> +

      + <%= submit_tag %> -

      -<%= file_field :design,:package_file %> -

      -<%= submit_tag %> + <% end %> -<% end %> +
      \ No newline at end of file diff --git a/app/views/admin/items/_site_map_left_bar.html.erb b/app/views/admin/items/_site_map_left_bar.html.erb index e82b4988f..8dbcb7227 100644 --- a/app/views/admin/items/_site_map_left_bar.html.erb +++ b/app/views/admin/items/_site_map_left_bar.html.erb @@ -1 +1,3 @@ -<%= render_node_and_children(Item.first(:conditions => {:parent_id => nil})) %> \ No newline at end of file +
      + <%= render_node_and_children(Item.first(:conditions => {:parent_id => nil})) %> +
      \ No newline at end of file diff --git a/app/views/admin/purchases/index.html.erb b/app/views/admin/purchases/index.html.erb index 1bd870e47..03427df6c 100644 --- a/app/views/admin/purchases/index.html.erb +++ b/app/views/admin/purchases/index.html.erb @@ -1,25 +1,28 @@ -

      <%= t('admin.list_puchases') %>

      - - - - - - - - - -<% @purchases.each do |purchase| %> - - - - - - -<% end %> -
      <%= t('admin.title') %><%= t('admin.intro') %><%= t('admin.author') %><%= t('admin.action') %>
      <%= purchase.title %><%= purchase.intro %><%= purchase.author %> - <% if purchase.downloaded %> - <%= t(:downloaded) %> - <% else %> - <%= link_to t(:download) , download_admin_purchase_path(purchase) %> - <% end %> -
      \ No newline at end of file +
      +

      <%= t('admin.list_puchases') %>

      + + + + + + + + + + <%# @purchases.each do |purchase| %> + <% purchase = PModuleApp.create(:title => 'title', :intro => 'is module', :author => 'me') %> + + + + + + + <%# end %> +
      <%= t('admin.title') %><%= t('admin.intro') %><%= t('admin.author') %><%= t('admin.action') %>
      <%= purchase.title %><%= purchase.intro %><%= purchase.author %> + <% if purchase.downloaded %> + <%= t(:downloaded) %> + <% else %> + <%= link_to t(:download) , download_admin_purchase_path(purchase), :class => 'download' %> + <% end %> +
      +
      \ No newline at end of file diff --git a/app/views/admin/sites/index.html.erb b/app/views/admin/sites/index.html.erb index ec22707c9..e42185bf2 100644 --- a/app/views/admin/sites/index.html.erb +++ b/app/views/admin/sites/index.html.erb @@ -1,33 +1,35 @@ -
      -

      Site Information

      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      School Name<%= @site.school %>
      Department<%= @site.department %>
      Versionv0.1
      Administratoradmin
      Visitor Counter2,201
      Registration Status<%= render 'registration' %>
      Updates<%= render 'update' %>
      +
      +
      +

      Site Information

      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      School Name<%= @site.school %>
      Department<%= @site.department %>
      Versionv0.1
      Administratoradmin
      Visitor Counter2,201
      Registration Status<%= render 'registration' %>
      Updates<%= render 'update' %>
      +
      \ No newline at end of file diff --git a/app/views/admin/translations/edit.html.erb b/app/views/admin/translations/edit.html.erb index 0850d633e..4dd56a010 100644 --- a/app/views/admin/translations/edit.html.erb +++ b/app/views/admin/translations/edit.html.erb @@ -1,5 +1,5 @@ +
      <%= form_tag admin_translation_path('all'), :method => :put do %> - <% if @language_i18n_variables.size > 0 %>
      @@ -30,6 +30,10 @@
      <% end %> - <%= submit_tag t('update') %> <%= link_back %> +
      + <%= link_back %> + <%= submit_tag t('update') %> +
      <% end %> +
      \ No newline at end of file diff --git a/app/views/admin/translations/index.html.erb b/app/views/admin/translations/index.html.erb index 07d76b5a0..a47aa52b3 100644 --- a/app/views/admin/translations/index.html.erb +++ b/app/views/admin/translations/index.html.erb @@ -1,67 +1,72 @@ -<% content_for :secondary do %> -
        -
      • <%= link_to t(:edit), edit_admin_translation_path('all'), :class => 'button positive' %>
        • -
      • - <%= t('admin.add_language') %>: - <%= form_tag admin_translation_path('add'), :method => :put do %> - <%= text_field_tag 'language', '', :style => "width:100px" %> - <%= submit_tag t(:add) %> - <% end %> -
        • -
      • - <%= t('admin.enable_language') %>: - <%= form_tag admin_translation_path('enable'), :method => :put do %> - <%= select_tag 'enable_language', options_for_select(@site_valid_locales - @site_in_use_locales), :style => "width:100px" %> - <%= submit_tag t(:enable) %> - <% end %> -
        • -
      • - <%= t('admin.disable_language') %>: - <%= form_tag admin_translation_path('disable'), :method => :put do %> - <%= select_tag 'disable_language', options_for_select(@site_in_use_locales), :style => "width:100px" %> - <%= submit_tag t(:disable) %> - <% end %> -
        • -
      • - <%= t('admin.delete_language') %>: - <%= form_tag admin_translation_path('delete'), :method => :put do %> - <%= select_tag 'delete_language', options_for_select(@site_valid_locales), :style => "width:100px" %> - <%= submit_tag t(:delete), :confirm => t('sure?') %> - <% end %> -
        • -
      -<% end -%> - -<% if @language_i18n_variables.size > 0 %> -
      - - <%= t('admin.language') %> - <%#= render :partial => 'action_bar' %> - -
      <%= render :partial => 'language' %>
      -
      -<% end %> - -<% if @user_info_model_i18n_variables.size > 0 %> -
      - - <%= t('admin.user_info') %> - <%#= render :partial => 'action_bar' %> - -
      <%= render :partial => 'user_attribute_model', :collection => @user_info_model_i18n_variables %>
      -
      -<% end %> - -<% if @user_role_model_i18n_variables.size > 0 %> -
      - - <%= t('admin.user_role') %> - <%#= render :partial => 'action_bar' %> - -
      <%= render :partial => 'user_attribute_model', :collection => @user_role_model_i18n_variables %>
      -
      -<% end %> - -<% content_for :page_specific_javascript do %> - <%= javascript_include_tag "translation_page" %> -<% end -%> +
      +<% content_for :secondary do %> +
      +

      <%= t('admin.setup_translations') %>

      +
        +
      • <%= link_to t(:edit), edit_admin_translation_path('all'), :class => 'button positive' %>
        • +
      • + <%= t('admin.add_language') %>: + <%= form_tag admin_translation_path('add'), :method => :put do %> + <%= text_field_tag 'language', '', :style => "width:100px" %> + <%= submit_tag t(:add) %> + <% end %> +
        • +
      • + <%= t('admin.enable_language') %>: + <%= form_tag admin_translation_path('enable'), :method => :put do %> + <%= select_tag 'enable_language', options_for_select(@site_valid_locales - @site_in_use_locales), :style => "width:100px" %> + <%= submit_tag t(:enable) %> + <% end %> +
        • +
      • + <%= t('admin.disable_language') %>: + <%= form_tag admin_translation_path('disable'), :method => :put do %> + <%= select_tag 'disable_language', options_for_select(@site_in_use_locales), :style => "width:100px" %> + <%= submit_tag t(:disable) %> + <% end %> +
        • +
      • + <%= t('admin.delete_language') %>: + <%= form_tag admin_translation_path('delete'), :method => :put do %> + <%= select_tag 'delete_language', options_for_select(@site_valid_locales), :style => "width:100px" %> + <%= submit_tag t(:delete), :confirm => t('sure?') %> + <% end %> +
        • +
      +
      +<% end -%> + +<% if @language_i18n_variables.size > 0 %> +
      + + <%= t('admin.language') %> + <%#= render :partial => 'action_bar' %> + +
      <%= render :partial => 'language' %>
      +
      +<% end %> + +<% if @user_info_model_i18n_variables.size > 0 %> +
      + + <%= t('admin.user_info') %> + <%#= render :partial => 'action_bar' %> + +
      <%= render :partial => 'user_attribute_model', :collection => @user_info_model_i18n_variables %>
      +
      +<% end %> + +<% if @user_role_model_i18n_variables.size > 0 %> +
      + + <%= t('admin.user_role') %> + <%#= render :partial => 'action_bar' %> + +
      <%= render :partial => 'user_attribute_model', :collection => @user_role_model_i18n_variables %>
      +
      +<% end %> + +<% content_for :page_specific_javascript do %> + <%= javascript_include_tag "translation_page" %> +<% end -%> +
      diff --git a/app/views/admin/user_attribute_models/edit.html.erb b/app/views/admin/user_attribute_models/edit.html.erb index d0442fb85..f40fca70c 100644 --- a/app/views/admin/user_attribute_models/edit.html.erb +++ b/app/views/admin/user_attribute_models/edit.html.erb @@ -1,14 +1,14 @@ <% content_for :secondary do %> - <%= render 'side_bar' %> + <%= render 'admin/users/side_bar' %> <% end %> -
      - <%= form_for @user, :url => admin_user_path(@user), :html => { :multipart => true } do |f| %> +
      + <%= form_for @user_attribute_model, :url => eval("admin_user_#{@attribute}_model_path(@user_role_model)") do |f| %> <%= f.error_messages %> - <%= render :partial => 'form', :locals => { :f => f } %> + <%= render :partial => "admin/user_attribute_models/form", :locals => { :f => f, :is_new => false } %>
      - <%= link_back %> - <%= link_to t('update'), "#", :onclick=>"$('#edit_user_#{@user.id}').submit()" %> + <%= link_to t('update'), "#", :onclick=>"$('#edit_user_role_model_#{@user_attribute_model.id}').submit()" %> + <%= link_back %>
      <% end -%>
      \ No newline at end of file diff --git a/app/views/admin/user_attribute_models/edit.html.erb.back b/app/views/admin/user_attribute_models/edit.html.erb.back new file mode 100644 index 000000000..d0442fb85 --- /dev/null +++ b/app/views/admin/user_attribute_models/edit.html.erb.back @@ -0,0 +1,14 @@ +<% content_for :secondary do %> + <%= render 'side_bar' %> +<% end %> + +
      + <%= form_for @user, :url => admin_user_path(@user), :html => { :multipart => true } do |f| %> + <%= f.error_messages %> + <%= render :partial => 'form', :locals => { :f => f } %> +
      + <%= link_back %> + <%= link_to t('update'), "#", :onclick=>"$('#edit_user_#{@user.id}').submit()" %> +
      + <% end -%> +
      \ No newline at end of file diff --git a/app/views/admin/user_attribute_models/index.html.erb b/app/views/admin/user_attribute_models/index.html.erb index 87c5bb2cf..87c5af7f0 100644 --- a/app/views/admin/user_attribute_models/index.html.erb +++ b/app/views/admin/user_attribute_models/index.html.erb @@ -2,7 +2,7 @@ <%= render 'admin/users/side_bar' %> <% end %> -
      +
      <%= link_to t("admin.new_user_#{@attribute}"), eval("new_admin_user_#{@attribute}_model_path"), :class => 'new' %>
      diff --git a/app/views/admin/user_attribute_models/new.html.erb b/app/views/admin/user_attribute_models/new.html.erb index 490561faa..ea1b015c2 100644 --- a/app/views/admin/user_attribute_models/new.html.erb +++ b/app/views/admin/user_attribute_models/new.html.erb @@ -2,7 +2,7 @@ <%= render 'admin/users/side_bar' %> <% end %> -
      +
      <%= form_for @user_attribute_model, :url => eval("admin_user_#{@attribute}_models_path") do |f| %> <%= f.error_messages %> <%= render :partial => "admin/user_attribute_models/form", :locals => { :f => f, :is_new => true } %> diff --git a/app/views/admin/users/_side_bar.html.erb b/app/views/admin/users/_side_bar.html.erb index d0f2daae1..11d4e238c 100644 --- a/app/views/admin/users/_side_bar.html.erb +++ b/app/views/admin/users/_side_bar.html.erb @@ -1,11 +1,11 @@ - -
      -

      <%= t('admin.setup_member') %>

      -
        -
      • <%= link_to content_tag(:span, t('admin.list_users')), admin_users_path %>
        • -
      • <%= link_to content_tag(:span, t('admin.list_user_roles')), admin_user_role_models_path %>
        • -
      • <%= link_to content_tag(:span, t('admin.list_user_infos')), admin_user_info_models_path %>
        • -
      + +
      +

      <%= t('admin.setup_member') %>

      +
        +
      • <%= link_to content_tag(:span, t('admin.list_users')), admin_users_path %>
        • +
      • <%= link_to content_tag(:span, t('admin.list_user_roles')), admin_user_role_models_path %>
        • +
      • <%= link_to content_tag(:span, t('admin.list_user_infos')), admin_user_info_models_path %>
        • +
      \ No newline at end of file diff --git a/app/views/admin/users/edit.html.erb b/app/views/admin/users/edit.html.erb index d0442fb85..71a1d05ef 100644 --- a/app/views/admin/users/edit.html.erb +++ b/app/views/admin/users/edit.html.erb @@ -2,7 +2,7 @@ <%= render 'side_bar' %> <% end %> -
      +
      <%= form_for @user, :url => admin_user_path(@user), :html => { :multipart => true } do |f| %> <%= f.error_messages %> <%= render :partial => 'form', :locals => { :f => f } %> diff --git a/app/views/admin/users/index.html.erb b/app/views/admin/users/index.html.erb index 82abfd812..0c5e232bc 100644 --- a/app/views/admin/users/index.html.erb +++ b/app/views/admin/users/index.html.erb @@ -2,7 +2,7 @@ <%= render 'side_bar' %> <% end %> -
      +
      <%= flash_messages %>
      <%= link_to t('admin.new_user'), new_admin_user_path, :class => 'new' %> diff --git a/app/views/admin/users/new.html.erb b/app/views/admin/users/new.html.erb index 0ff345297..cafad3d33 100644 --- a/app/views/admin/users/new.html.erb +++ b/app/views/admin/users/new.html.erb @@ -2,7 +2,7 @@ <%= render 'side_bar' %> <% end %> -
      +
      <%= form_for @user, :url => admin_users_path, :html => { :multipart => true } do |f| %> <%= f.error_messages %> <%= render :partial => 'form', :locals => { :f => f } %> diff --git a/app/views/admin/users/show.html.erb b/app/views/admin/users/show.html.erb index 3e1958925..1535d0c0c 100644 --- a/app/views/admin/users/show.html.erb +++ b/app/views/admin/users/show.html.erb @@ -2,7 +2,7 @@ <%= render 'side_bar' %> <% end %> -
      +
      <% if @user.avatar? %> diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb index a4bbbb433..c01962b9d 100644 --- a/app/views/layouts/admin.html.erb +++ b/app/views/layouts/admin.html.erb @@ -1,31 +1,31 @@ - - - - - <%= @title || APP_CONFIG['orbit'] %> - - <%= stylesheet_link_tag "admin" %> - <%= javascript_include_tag "admin" %> - <%= yield :page_specific_css %> - <%= yield :page_specific_javascript %> - <%= csrf_meta_tag %> - - - - -
      - -
      - <%= yield %> -
      -
      <%= yield :tertiary %>
      - -
      - - + + + + + <%= @title || APP_CONFIG['orbit'] %> + + <%= stylesheet_link_tag "admin" %> + <%= javascript_include_tag "admin" %> + <%= yield :page_specific_css %> + <%= yield :page_specific_javascript %> + <%= csrf_meta_tag %> + + + + +
      + +
      + <%= yield %> +
      +
      <%= yield :tertiary %>
      + +
      + + diff --git a/app/views/layouts/site_editor.html.erb b/app/views/layouts/site_editor.html.erb index 5f50c7ac6..47e90fecf 100644 --- a/app/views/layouts/site_editor.html.erb +++ b/app/views/layouts/site_editor.html.erb @@ -19,17 +19,13 @@ <%= render 'devise/menu/login_items' %>
      - -
      -
      -
      -
      <%= yield :sidebar %>
      -
      -
      -
      <%= yield %>
      -
      -
      - +
      + +
      + <%= yield %> +
      +
      <%= yield :tertiary %>
      +
      diff --git a/config/config.yml b/config/config.yml index e623e0cdf..71234da0a 100644 --- a/config/config.yml +++ b/config/config.yml @@ -1,6 +1,6 @@ defaults: &defaults main_public_key: 'lib/main_public_key.pem' - store_ip: 'localhost:3001' + store_ip: 'redmine.rulingcom.com:3001' orbit: 'Orbit' ruling_digital: 'RulingDigital' diff --git a/config/locales/en.yml b/config/locales/en.yml index d5d9c9c91..be4ecdb31 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -109,6 +109,8 @@ en: role: Role roles: Roles setup_member: Member setup + setup_translations: Translations setup + setup_designs: Designs setup site: Site title: Title translation: Translation diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml index eeb7db50a..e6e9d2528 100644 --- a/config/locales/zh_tw.yml +++ b/config/locales/zh_tw.yml @@ -103,6 +103,8 @@ zh_tw: role: 角色 roles: 角色 setup_member: 成員設置 + setup_translations: 語系設定 + setup_designs: 版型設定 site: 網站 title: 標題 translation: 翻譯