developers
/
orbit-basic
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CSS problem for page

This commit is contained in:
chris2tof 2011-08-25 15:08:23 +08:00
parent f898a29fdf
commit c248b729db
6 changed files with 108 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
app/assets/stylesheets/admin.css.erb
View File

@ -6,7 +6,7 @@ body{
padding: 0; padding: 0;
} }
#banner_link{ #panel_banner_link{
background: url(<%= asset_path "bar_orbit.png" %>) no-repeat scroll 10px 0 transparent; background: url(<%= asset_path "bar_orbit.png" %>) no-repeat scroll 10px 0 transparent;
height: 43px; height: 43px;
position: relative; position: relative;
@ -55,22 +55,22 @@ body{
text-decoration:underline; text-decoration:underline;
} }
#container{ #panel_container{
margin: 9px 0 0; margin: 9px 0 0;
} }
#container h1{ #panel_container h1{
font: 28px/100% helvetica,arial,sans-serif; font: 28px/100% helvetica,arial,sans-serif;
margin: 0 0 20px; margin: 0 0 20px;
padding: 0; padding: 0;
} }
#header{ #panel_header{
background: none repeat scroll 0 0 #F1F1F1; background: none repeat scroll 0 0 #F1F1F1;
border-bottom: 1px solid #818181; border-bottom: 1px solid #818181;
padding: 10px; padding: 10px;
} }
#header:after { #panel_header:after {
content: "."; content: ".";
display: block; display: block;
height: 0; height: 0;
@ -104,7 +104,7 @@ body{
color: #fff; color: #fff;
} }
.content{ #panel_content{
background: none repeat scroll 0 0 #FFFFFF; background: none repeat scroll 0 0 #FFFFFF;
clear:both; clear:both;
padding: 20px 10px; padding: 20px 10px;
@ -113,7 +113,7 @@ body{
height:auto !important; height:auto !important;
height:430px; height:430px;
} }
.content:after { #panel_content:after {
content: "."; content: ".";
display: block; display: block;
height: 0; height: 0;
@ -186,25 +186,62 @@ body{
color: #000; color: #000;
} }
#footer{ #panel_footer{
background: none repeat scroll 0 0 #FFFFFF; background: none repeat scroll 0 0 #FFFFFF;
clear: both; clear: both;
padding: 10px; padding: 10px;
} }
#footer p{ #panel_footer p{
margin:0; margin:0;
} }
p{ p{
} }
p label{ #panel_main p label{
float: left; float: left;
padding: 3px; padding: 3px;
width: 100px; width: 100px;
} }
#panel_main .translation_missing{
float: left;
padding: 3px;
width: 100px;
}
.text{ .text{
border: 1px solid #818181; border: 1px solid #818181;
border-radius: 3px 3px 3px 3px; border-radius: 3px 3px 3px 3px;
font: 12px/100% helvetica,arial,sans-serif; font: 12px/100% helvetica,arial,sans-serif;
padding: 3px; padding: 3px;
width: 205px; 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;
} }

55
app/assets/stylesheets/content.css.erb
View File

@ -108,7 +108,7 @@ body{
padding: 0; padding: 0;
} }
#banner_link{ #panel_banner_link{
background: url(<%= asset_path "bar_orbit.png" %>) no-repeat scroll 10px 0 transparent; background: url(<%= asset_path "bar_orbit.png" %>) no-repeat scroll 10px 0 transparent;
height: 43px; height: 43px;
position: relative; position: relative;
@ -157,28 +157,28 @@ body{
text-decoration:underline; text-decoration:underline;
} }
#container{ #panel_container{
margin: 9px 0 0; margin: 9px 0 0;
} }
#container:after { #panel_container:after {
content: "."; content: ".";
display: block; display: block;
height: 0; height: 0;
clear: both; clear: both;
visibility: hidden; visibility: hidden;
} }
#container h1{ #panel_container h1{
font: 28px/100% helvetica,arial,sans-serif; font: 28px/100% helvetica,arial,sans-serif;
margin: 0 0 20px; margin: 0 0 20px;
padding: 0; padding: 0;
} }
#header{ #panel_header{
background: none repeat scroll 0 0 #F1F1F1; background: none repeat scroll 0 0 #F1F1F1;
border-bottom: 1px solid #818181; border-bottom: 1px solid #818181;
padding: 10px; padding: 10px;
} }
#header:after { #panel_header:after {
content: "."; content: ".";
display: block; display: block;
height: 0; height: 0;
@ -201,6 +201,7 @@ body{
border: 1px solid #D6D6D6; border: 1px solid #D6D6D6;
color: #000000; color: #000000;
float: left; float: left;
font-size:15px;
margin: 0 20px 0 0; margin: 0 20px 0 0;
padding: 5px 10px; padding: 5px 10px;
text-decoration: none; text-decoration: none;
@ -213,14 +214,11 @@ body{
color: #fff; color: #fff;
} }
.content{ #panel_content{
clear:both; clear:both;
position:relative;
min-height : 430px;
height:auto !important;
height:430px;
} }
.content:after { #panel_content:after {
content: "."; content: ".";
display: block; display: block;
height: 0; height: 0;
@ -304,10 +302,12 @@ body{
#panel_sidebar{ #panel_sidebar{
color: #FFFFFF; color: white;
float: left; left: 0;
padding: 5px 0 0; padding: 5px 0 0 5px;
width: 300px; position: absolute;
top: 0;
width: 290px;
} }
#panel_sidebar ul{ #panel_sidebar ul{
background: url(<%= asset_path "tree_list.png" %>) repeat-x 0 0; background: url(<%= asset_path "tree_list.png" %>) repeat-x 0 0;
@ -329,6 +329,27 @@ body{
} }
#panel_sidebar a:hover{} #panel_sidebar a:hover{}
#panel_main{ #panel_main{
left:300px;
min-width: 1024px;
position:absolute;
top:0;
}
#panel_main p label{
float: left; 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;
} }

12
app/views/admin/sites/_registration.html.erb
View File

@ -1,7 +1,11 @@
<% if @site && @site.registered? %> <% if @site && @site.registered? %>
<%= t('admin.registered') %> <div class="bought_btn">
<%= t('admin.registered') %>
</div>
<% else %> <% else %>
<%= link_to 'register', "http://#{APP_CONFIG['store_ip']}/user/sites/register?" + <div class="buy_btn">
{:site => {:school => @site.school, :department => @site.department}}.to_query, <%= link_to 'register', "http://#{APP_CONFIG['store_ip']}/user/sites/register?" +
:target => '_blank' %> {:site => {:school => @site.school, :department => @site.department}}.to_query,
:target => '_blank' %>
</div>
<% end %> <% end %>

8
app/views/admin/sites/_update.html.erb
View File

@ -1,5 +1,9 @@
<% if @site.up_to_date? %> <% if @site.up_to_date? %>
<%= t('admin.up_to_date') %> <div class="bought_btn">
<%= t('admin.up_to_date') %>
</div>
<% else %> <% else %>
<%= link_to t(:update), site_update_path %> <div class="buy_btn">
<%= link_to t(:update), site_update_path %>
</div>
<% end %> <% end %>

10
app/views/layouts/admin.html.erb
View File

@ -13,7 +13,7 @@
</head> </head>
<body> <body>
<div id="banner_link" > <div id="panel_banner_link" >
<div class="hmenu"> <div class="hmenu">
<div class="lang"> <div class="lang">
<%= render 'layouts/lang_menu' %> <%= render 'layouts/lang_menu' %>
@ -22,9 +22,9 @@
<%= render 'devise/menu/login_items' %> <%= render 'devise/menu/login_items' %>
</div> </div>
</div> </div>
<div id="container"> <div id="panel_container">
<div id="header"> <div id="panel_header">
<h1>RulingSite <%= t('admin.admin') %></h1> <h1>RulingSite <%= t('admin.admin') %></h1>
<ul id="nav"> <ul id="nav">
<li><%= link_to t('homepage'), root_path %></li> <li><%= link_to t('homepage'), root_path %></li>
@ -39,13 +39,13 @@
</ul> </ul>
</div> </div>
<div class="content"> <div id="panel_content">
<div class="main"><%= yield %></div> <div class="main"><%= yield %></div>
<div class="secondary"><%= yield :secondary %></div> <div class="secondary"><%= yield :secondary %></div>
<div class="tertiary"><%= yield :tertiary %></div> <div class="tertiary"><%= yield :tertiary %></div>
</div> </div>
<div id="footer"> <div id="panel_footer">
<p>Rulingcom</p> <p>Rulingcom</p>
</div> </div>
</div> </div>

8
app/views/layouts/content.html.erb
View File

@ -21,7 +21,7 @@
</head> </head>
<body> <body>
<div id="banner_link" > <div id="panel_banner_link" >
<div class="hmenu"> <div class="hmenu">
<div class="lang"> <div class="lang">
<%= render 'layouts/lang_menu' %> <%= render 'layouts/lang_menu' %>
@ -30,9 +30,9 @@
<%= render 'devise/menu/login_items' %> <%= render 'devise/menu/login_items' %>
</div> </div>
</div> </div>
<div id="container"> <div id="panel_container">
<div id="header"> <div id="panel_header">
<h1>RulingSite <%= t('admin.item') %></h1> <h1>RulingSite <%= t('admin.item') %></h1>
<ul id="nav"> <ul id="nav">
<li><%= link_to t('homepage'), root_path %></li> <li><%= link_to t('homepage'), root_path %></li>
@ -48,7 +48,7 @@
</div> </div>
<div class="content"> <div id="panel_content">
<div id="panel_sidebar"><%= yield :sidebar %></div> <div id="panel_sidebar"><%= yield :sidebar %></div>
<div id="panel_main"><%= yield %></div> <div id="panel_main"><%= yield %></div>
</div> </div>