diff --git a/app/assets/stylesheets/admin.css.erb b/app/assets/stylesheets/admin.css.erb
index 89e42e83..7032652c 100644
--- a/app/assets/stylesheets/admin.css.erb
+++ b/app/assets/stylesheets/admin.css.erb
@@ -6,7 +6,7 @@ body{
padding: 0;
}
-#banner_link{
+#panel_banner_link{
background: url(<%= asset_path "bar_orbit.png" %>) no-repeat scroll 10px 0 transparent;
height: 43px;
position: relative;
@@ -55,22 +55,22 @@ body{
text-decoration:underline;
}
-#container{
+#panel_container{
margin: 9px 0 0;
}
-#container h1{
+#panel_container h1{
font: 28px/100% helvetica,arial,sans-serif;
margin: 0 0 20px;
padding: 0;
}
-#header{
+#panel_header{
background: none repeat scroll 0 0 #F1F1F1;
border-bottom: 1px solid #818181;
padding: 10px;
}
-#header:after {
+#panel_header:after {
content: ".";
display: block;
height: 0;
@@ -104,7 +104,7 @@ body{
color: #fff;
}
-.content{
+#panel_content{
background: none repeat scroll 0 0 #FFFFFF;
clear:both;
padding: 20px 10px;
@@ -113,7 +113,7 @@ body{
height:auto !important;
height:430px;
}
-.content:after {
+#panel_content:after {
content: ".";
display: block;
height: 0;
@@ -186,25 +186,62 @@ body{
color: #000;
}
-#footer{
+#panel_footer{
background: none repeat scroll 0 0 #FFFFFF;
clear: both;
padding: 10px;
}
-#footer p{
+#panel_footer p{
margin:0;
}
p{
}
-p label{
+#panel_main p label{
float: left;
padding: 3px;
width: 100px;
}
+#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;
+}
+
+.buy_btn{
+ float:left;
+ margin:0 20px 0 0;
+}
+.buy_btn a{
+ background: url("/assets/buy_btn.png") no-repeat scroll 0 0 transparent;
+ color: #000000;
+ display: block;
+ font-size: 22px;
+ height: 37px;
+ line-height: 37px;
+ text-align: center;
+ text-decoration: none;
+ text-shadow: 0 1px 0 #FFFFFF;
+ width: 170px;
+}
+.buy_btn a:hover{
+ background-position:0 bottom;
+}
+.bought_btn{
+ background: url("/assets/bought_btn.png") no-repeat scroll 0 0 transparent;
+ color: #FFFFFF;
+ float:left;
+ font-size: 22px;
+ height: 37px;
+ line-height: 37px;
+ text-align: center;
+ text-shadow: 0 1px 0 #C06408;
+ width: 170px;
}
\ No newline at end of file
diff --git a/app/assets/stylesheets/content.css.erb b/app/assets/stylesheets/content.css.erb
index f918f06d..c8664e94 100644
--- a/app/assets/stylesheets/content.css.erb
+++ b/app/assets/stylesheets/content.css.erb
@@ -108,7 +108,7 @@ body{
padding: 0;
}
-#banner_link{
+#panel_banner_link{
background: url(<%= asset_path "bar_orbit.png" %>) no-repeat scroll 10px 0 transparent;
height: 43px;
position: relative;
@@ -157,28 +157,28 @@ body{
text-decoration:underline;
}
-#container{
+#panel_container{
margin: 9px 0 0;
}
-#container:after {
+#panel_container:after {
content: ".";
display: block;
height: 0;
clear: both;
visibility: hidden;
}
-#container h1{
+#panel_container h1{
font: 28px/100% helvetica,arial,sans-serif;
margin: 0 0 20px;
padding: 0;
}
-#header{
+#panel_header{
background: none repeat scroll 0 0 #F1F1F1;
border-bottom: 1px solid #818181;
padding: 10px;
}
-#header:after {
+#panel_header:after {
content: ".";
display: block;
height: 0;
@@ -201,6 +201,7 @@ body{
border: 1px solid #D6D6D6;
color: #000000;
float: left;
+ font-size:15px;
margin: 0 20px 0 0;
padding: 5px 10px;
text-decoration: none;
@@ -213,14 +214,11 @@ body{
color: #fff;
}
-.content{
+#panel_content{
clear:both;
-
- min-height : 430px;
- height:auto !important;
- height:430px;
+ position:relative;
}
-.content:after {
+#panel_content:after {
content: ".";
display: block;
height: 0;
@@ -304,10 +302,12 @@ body{
#panel_sidebar{
- color: #FFFFFF;
- float: left;
- padding: 5px 0 0;
- width: 300px;
+ color: white;
+ left: 0;
+ padding: 5px 0 0 5px;
+ position: absolute;
+ top: 0;
+ width: 290px;
}
#panel_sidebar ul{
background: url(<%= asset_path "tree_list.png" %>) repeat-x 0 0;
@@ -329,6 +329,27 @@ body{
}
#panel_sidebar a:hover{}
#panel_main{
+ left:300px;
+ min-width: 1024px;
+ position:absolute;
+ top:0;
+}
+
+#panel_main p label{
float: left;
- padding: 10px;
+ padding: 3px;
+ width: 100px;
+}
+#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/views/admin/sites/_registration.html.erb b/app/views/admin/sites/_registration.html.erb
index 2ed16ab7..77afb680 100644
--- a/app/views/admin/sites/_registration.html.erb
+++ b/app/views/admin/sites/_registration.html.erb
@@ -1,7 +1,11 @@
<% if @site && @site.registered? %>
- <%= t('admin.registered') %>
+
+ <%= t('admin.registered') %>
+
<% else %>
- <%= link_to 'register', "http://#{APP_CONFIG['store_ip']}/user/sites/register?" +
- {:site => {:school => @site.school, :department => @site.department}}.to_query,
- :target => '_blank' %>
+
+ <%= link_to 'register', "http://#{APP_CONFIG['store_ip']}/user/sites/register?" +
+ {:site => {:school => @site.school, :department => @site.department}}.to_query,
+ :target => '_blank' %>
+
<% end %>
\ No newline at end of file
diff --git a/app/views/admin/sites/_update.html.erb b/app/views/admin/sites/_update.html.erb
index c96072ca..231d7b14 100644
--- a/app/views/admin/sites/_update.html.erb
+++ b/app/views/admin/sites/_update.html.erb
@@ -1,5 +1,9 @@
<% if @site.up_to_date? %>
- <%= t('admin.up_to_date') %>
+
+ <%= t('admin.up_to_date') %>
+
<% else %>
- <%= link_to t(:update), site_update_path %>
+
+ <%= link_to t(:update), site_update_path %>
+
<% end %>
\ No newline at end of file
diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb
index 0d25454c..2520f07c 100644
--- a/app/views/layouts/admin.html.erb
+++ b/app/views/layouts/admin.html.erb
@@ -13,7 +13,7 @@
-