diff --git a/app/assets/images/body.jpg b/app/assets/images/body.jpg new file mode 100644 index 000000000..9ffff8d72 Binary files /dev/null and b/app/assets/images/body.jpg differ diff --git a/app/assets/images/icon1.png b/app/assets/images/icon1.png new file mode 100644 index 000000000..cd9847b82 Binary files /dev/null and b/app/assets/images/icon1.png differ diff --git a/app/assets/images/icon2.png b/app/assets/images/icon2.png new file mode 100644 index 000000000..a3f79ba90 Binary files /dev/null and b/app/assets/images/icon2.png differ diff --git a/app/assets/images/orbitbar.png b/app/assets/images/orbitbar.png index cb40b661c..6cb3d6bb0 100644 Binary files a/app/assets/images/orbitbar.png and b/app/assets/images/orbitbar.png differ diff --git a/app/assets/stylesheets/admin.css.erb b/app/assets/stylesheets/admin.css.erb index dee2b3ba3..6b89d771f 100644 --- a/app/assets/stylesheets/admin.css.erb +++ b/app/assets/stylesheets/admin.css.erb @@ -1,5 +1,14 @@ +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{ - background: url("/assets/orbitbar.png") repeat-x scroll 0 0; color: #000000; font-family: helvetica,arial,sans-serif; margin: 0; @@ -7,9 +16,12 @@ body{ } #panel_banner_link{ - background: url(<%= asset_path "bar_orbit.png" %>) no-repeat scroll 10px 0 transparent; - height: 43px; - position: relative; + background: url(<%= asset_path "orbitbar.png" %>) repeat-x scroll 0 0; + height: 52px; + left: 0; + position: absolute; + top: 0; + width: 100%; } .hmenu{ height: 40px; @@ -20,6 +32,48 @@ body{ } +#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; @@ -56,13 +110,15 @@ body{ } #panel_container{ - margin: 9px 0 0; + height: 100%; } #panel_container h1{ - font: 28px/100% helvetica,arial,sans-serif; + color: #FFFFFF; + font: 32px/100% helvetica,arial,sans-serif; margin: 0 0 20px; padding: 0; + text-shadow: 0 0 5px #000000; } #panel_header{ @@ -70,7 +126,7 @@ body{ border-bottom: 1px solid #818181; padding: 10px; } -#panel_header:after { +#panel_header :after { content: "."; display: block; height: 0; @@ -107,96 +163,116 @@ body{ } #panel_content{ - background: none repeat scroll 0 0 #FFFFFF; - clear:both; - padding: 20px 10px; + height: 100%; +} - min-height : 430px; - height:auto !important; - height:430px; -} -#panel_content:after { - content: "."; - display: block; - height: 0; - clear: both; - visibility: hidden; -} .main{ - float:left; - min-width: 700px; - width: 60%; + float: left; + height: 100%; + padding: 0 1%; + width: 81%; +} +.main2{ + padding: 62px 0 0; } .main table{ border-collapse: collapse; width:100%; } .main table th{ - background: none repeat scroll 0 0 #EEEEEE; - border-bottom:1px solid #c7c7c7; - font: 17px/100% helvetica,arial,sans-serif; + border-bottom: 1px solid #222222; + color: #FFFFFF; + font: 20px/100% helvetica,arial,sans-serif; letter-spacing: 0.05em; padding: 10px; + text-shadow: 0 0 3px #000000; } .main table td{ - border-bottom: 1px solid #EEEEEE; + background: none repeat scroll 0 0 rgba(0, 0, 0, 0.5); + border-bottom: 1px solid #222222; + color: #FFFFFF; padding: 10px; text-align: center; } .main table td a{ - background: none repeat scroll 0 0 #EEEEEE; - border-radius: 13px 13px 13px 13px; + background: none repeat scroll 0 0 #FFFFFF; + border-radius: 5px 5px 5px 5px; color: #000000; - padding: 5px 10px; + padding: 5px; text-decoration: none; } .main table td a:hover{ - background: none repeat scroll 0 0 #818181; - border-radius: 13px 13px 13px 13px; - color: #fff; + background: none repeat scroll 0 0 #eee; + border-radius: 5px 5px 5px 5px; + color: #333; } .secondary{ + background: none repeat scroll 0 0 rgba(0, 0, 0, 0.75); + box-shadow: 3px 0 3px #000000; float: left; - margin: 47px 0 0 20px; - min-width: 250px; - width: 10%; + height: 100%; + padding: 0 1%; + width: 14%; +} +.secondary2{ + padding: 62px 0 0; } .secondary ul{ - border: 1px solid #818181; - border-radius: 5px 5px 5px 5px; margin: 0; - padding: 10px; + padding: 0; } .secondary ul li{ list-style:none; } .secondary ul li a{ - background: none repeat scroll 0 0 #EEEEEE; - border: 1px solid #CCCCCC; - border-radius: 5px 5px 5px 5px; - color: #333333; + border-bottom: 1px solid #333; + color: #AAAAAA; display: block; - margin: 5px 0; - padding: 5px; + padding: 14px 0; + text-align: left; + text-decoration: none; +} +.seclink1{ + background: url(<%= asset_path "icon1.png" %>) no-repeat scroll 20px 8px transparent; + border-bottom: 1px solid #333; + color: #AAAAAA; + display: block; + padding: 14px 0 14px 60px !important; + text-align: left; + text-decoration: none; +} +.seclink2{ + background: url(<%= asset_path "icon2.png" %>) no-repeat scroll 20px 14px transparent; + border-bottom: 1px solid #333; + color: #AAAAAA; + display: block; + padding: 14px 0 14px 60px !important; + text-align: left; text-decoration: none; } .secondary ul li a:hover{ - background: none repeat scroll 0 0 #cccccc; - border:1px solid #818181; - color: #000; + color: #fff; } #panel_footer{ background: none repeat scroll 0 0 #FFFFFF; + display:none; clear: both; padding: 10px; } #panel_footer p{ margin:0; } +label{ + color: #FFFFFF; + display: block; + text-shadow: 0 0 5px #000000; + width: 130px; +} p{ + margin:0 0 10px; } #panel_main p label{ float: left; @@ -217,9 +293,36 @@ p{ width: 205px; } +#site_info{ + background: none repeat scroll 0 0 #FFFFFF; + border-radius: 5px 5px 5px 5px; + box-shadow: 0 0 5px #000000; + height: 289px; + margin: 0 0 20px; + overflow: hidden; + width: 600px; +} +#siteinfo_title{ + background: none repeat scroll 0 0 #333333; + color: #FFFFFF; + font: 24px/50px arial,sans-serif; + height: 50px; + margin: 0; + padding: 0 0 0 20px; + text-shadow: 0 1px 0 #000000; +} +#siteinfo_tb{ + background: none repeat scroll 0 0 #FFFFFF; +} +#siteinfo_tb td{ + background: none repeat scroll 0 0 transparent; + border-bottom: 1px solid #333333; + color: #333333; +} + .buy_btn{ float:left; - margin:0 20px 0 0; + margin: 0 10px 0 0; } .buy_btn a{ background: url("/assets/buy_btn.png") no-repeat scroll 0 0 transparent; @@ -243,6 +346,7 @@ p{ font-size: 22px; height: 37px; line-height: 37px; + margin: 0 10px 0 0; text-align: center; text-shadow: 0 1px 0 #C06408; width: 170px; diff --git a/app/assets/stylesheets/content.css.erb b/app/assets/stylesheets/content.css.erb index 412b6e303..0ec8bd218 100644 --- a/app/assets/stylesheets/content.css.erb +++ b/app/assets/stylesheets/content.css.erb @@ -1,107 +1,14 @@ -/* -#panel_header ul, #panel_sidebar ul{ - margin:0; - padding:0; -} -#panel_header ul li, #panel_sidebar ul li{ - list-style:none; -} -#panel_header a, #panel_sidebar a { - text-decoration:none; -} -html{ - height:100%; - width:100%; - } - -body{ - height:100%; - margin:0; - width:100%; -} -#panel_content{ - height:100%; - width:100%; -} -#panel_header{ - background:url(<%= asset_path 'bar_bg.png' %>) repeat-x 0 0; - font-size:12px; - height:41px; -} -#panel_header ul{ - margin:0 0 0 10px; -} -#panel_header a:link,#panel_header a:visited{ - color:#fff; -} -#panel_header a:hover,#panel_header a:active{ - color:#ececec; -} -#panel_nav{ - float:left; - margin:0 0 0 10px; -} -#panel_nav li{ - float: left; - line-height: 38px; - list-style: none outside none; - margin: 0 10px 0 0; -} -.panel_hmenu{ - color: #FFFFFF; - float: right; -} -.panel_hmenu li{ - float: left; - line-height: 41px; - list-style: none outside none; - margin: 0 10px 0 0; -} -#panel_sidebar{ - background: none repeat scroll 0 0 #323232; - color: #FFFFFF; - float: left; +html, body{ height: 100%; - min-width: 250px; - padding:5px 5px 0 0; + margin: 0; + padding: 0; } - -#panel_sidebar a:link,#panel_sidebar a:visited{ - color:#fff; -} -#panel_sidebar a:hover,#panel_sidebar a:active{ - color:#ececec; -} -#panel_sidebar ul{ - background: url(<%= asset_path 'tree_list.png' %>) repeat scroll 0 0 transparent; -} -#panel_sidebar li{ - font-size: 12px; - line-height: 29px; - list-style:none; - padding: 0 0 0 10px; - -} - -#panel_sidebar ul { -} -#panel_sidebar ul li{ - padding:0 0 0 20px; -} -.new_page{} -.new_link{} -.del_page{} -#panel_main{ - margin:10px; -} -*/ html{ - - background: url(<%= asset_path "html.png" %>) repeat-y scroll 0 0; + background: url(<%= asset_path "body.jpg" %>) no-repeat scroll 0 0 transparent; + background-size: cover; } body{ - background: url(<%= asset_path "orbitbar.png" %>) repeat-x scroll 0 0; color: #000000; font-family: helvetica,arial,sans-serif; margin: 0; @@ -109,9 +16,12 @@ body{ } #panel_banner_link{ - background: url(<%= asset_path "bar_orbit.png" %>) no-repeat scroll 10px 0 transparent; - height: 43px; - position: relative; + background: url(<%= asset_path "orbitbar.png" %>) repeat-x scroll 0 0; + height: 52px; + left: 0; + position: absolute; + top: 0; + width: 100%; } .hmenu{ height: 40px; @@ -122,6 +32,49 @@ body{ } +#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; @@ -158,15 +111,9 @@ body{ } #panel_container{ - margin: 9px 0 0; -} -#panel_container:after { - content: "."; - display: block; - height: 0; - clear: both; - visibility: hidden; + height: 100%; } + #panel_container h1{ font: 28px/100% helvetica,arial,sans-serif; margin: 0 0 20px; @@ -215,134 +162,58 @@ body{ } #panel_content{ - clear:both; - position:relative; -} -#panel_content:after { - content: "."; - display: block; - height: 0; - clear: both; - visibility: hidden; -} -.main{ - float:left; - min-width: 700px; - width: 60%; -} -.main table{ - border-collapse: collapse; - width:100%; -} -.main table th{ - background: none repeat scroll 0 0 #EEEEEE; - border-bottom:1px solid #c7c7c7; - font: 17px/100% helvetica,arial,sans-serif; - letter-spacing: 0.05em; - padding: 10px; -} -.main table td{ - border-bottom: 1px solid #EEEEEE; - padding: 10px; - text-align: center; + height: 100%; } -.main table td a{ - background: none repeat scroll 0 0 #EEEEEE; - border-radius: 13px 13px 13px 13px; - color: #000000; - padding: 5px 10px; - text-decoration: none; -} -.main table td a:hover{ - background: none repeat scroll 0 0 #818181; - border-radius: 13px 13px 13px 13px; - color: #fff; -} -.secondary{ + +#panel_sidebar2{ + background: none repeat scroll 0 0 rgba(0, 0, 0, 0.75); + box-shadow: 3px 0 3px #000000; float: left; - margin: 47px 0 0 20px; - min-width: 250px; - width: 10%; + height: 100%; + width: 16%; } -.secondary ul{ - border: 1px solid #818181; - border-radius: 5px 5px 5px 5px; - margin: 0; - padding: 10px; -} -.secondary ul li{ - list-style:none; -} -.secondary ul li a{ - background: none repeat scroll 0 0 #EEEEEE; - border: 1px solid #CCCCCC; - border-radius: 5px 5px 5px 5px; - color: #333333; - display: block; - margin: 5px 0; - padding: 5px; - text-decoration: none; -} -.secondary ul li a:hover{ - background: none repeat scroll 0 0 #cccccc; - border:1px solid #818181; - color: #000; -} - -#footer{ - background: none repeat scroll 0 0 #FFFFFF; - clear: both; - padding: 10px; -} -#footer p{ - margin:0; -} - - #panel_sidebar{ - color: white; - left: 0; - padding: 5px 0 0 5px; - position: absolute; - top: 0; - width: 290px; + padding: 62px 0 0; } #panel_sidebar ul{ - background: url(<%= asset_path "tree_list.png" %>) repeat-x 0 0; + background: none repeat scroll 0 0 #13547C; margin: 0; - padding: 0 0 0 15px; + padding: 0 0 0 10px; } #panel_sidebar ul li{ - line-height: 28px; + 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{ - margin: 0 0 0 -15px; - padding: 0 0 0 25px; } #panel_sidebar li ul ul{ - margin: 0 0 0 -25px; - padding: 0 0 0 25px; } #panel_sidebar a{ color: #FFFFFF; - font-size: 12px; + 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{ - left:300px; - min-width: 1024px; - position:absolute; - top:0; + padding: 62px 0 0; } #panel_main p label{ - float: left; + display: block; padding: 3px; - width: 100px; } #panel_main .translation_missing{ float: left; diff --git a/app/views/admin/designs/index.html.erb b/app/views/admin/designs/index.html.erb index 03683e660..d0fa7aa62 100644 --- a/app/views/admin/designs/index.html.erb +++ b/app/views/admin/designs/index.html.erb @@ -1,7 +1,7 @@ <% content_for :secondary do %> <% end -%> diff --git a/app/views/admin/sites/_registration.html.erb b/app/views/admin/sites/_registration.html.erb index 8e2a50962..413b864f6 100644 --- a/app/views/admin/sites/_registration.html.erb +++ b/app/views/admin/sites/_registration.html.erb @@ -1,4 +1,5 @@ -<% if @site && @site.registered? %> +<%# if @site && @site.registered? %> +<% if @site %>
<%= t('admin.registered') %>
diff --git a/app/views/admin/sites/_update.html.erb b/app/views/admin/sites/_update.html.erb index 231d7b14b..cf565d381 100644 --- a/app/views/admin/sites/_update.html.erb +++ b/app/views/admin/sites/_update.html.erb @@ -1,4 +1,5 @@ -<% if @site.up_to_date? %> +<%# if @site.up_to_date? %> +<% if true %>
<%= t('admin.up_to_date') %>
diff --git a/app/views/admin/sites/index.html.erb b/app/views/admin/sites/index.html.erb index 20ab5c0be..7f5c6a7cb 100644 --- a/app/views/admin/sites/index.html.erb +++ b/app/views/admin/sites/index.html.erb @@ -1,3 +1,32 @@ +
+

Site Information

+ + + + + + + + + + + + + + + + + + + + + + + + + +
School NameRulingDigital Universitry
DepartmentDesign Deptartment
Versionv0.1
Administratoradmin
Visitor Counter1112201
Site StatusAvailable
+
<%= render 'registration' %> <%= render 'update' %> \ No newline at end of file diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb index f62a21931..ce11b6fa5 100644 --- a/app/views/layouts/admin.html.erb +++ b/app/views/layouts/admin.html.erb @@ -14,6 +14,21 @@