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

Merge branch 'ad_banner' of https://github.com/Rulingcom/orbit into ad_banner

Browse Source
This commit is contained in:
Matthew K. Fu JuYuan committed 2012-04-25 10:56:42 +08:00
2 parents 3f2643bb66 dc07964bc3
commit 8e444a88d0
18 files changed
+78 -40
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/assets/stylesheets/bootstrap.css.erb
+1
View File
@@ -66,6 +66,7 @@ textarea {
margin: 0;
font-size: 100%;
vertical-align: middle;
margin-bottom: 10px;
}
button, input {
*overflow: visible;
app/assets/stylesheets/list.css
+1 -1
View File
@@ -161,6 +161,6 @@ legend {
top: 10px;
left: 5px;
}
.list-remove {
#sort_headers .list-remove {
padding: 8px 0 8px 16px !important;
}
app/assets/stylesheets/style.css.erb
+5 -1
View File
@@ -109,7 +109,8 @@
text-indent: -9999px;
padding:6px;
}
#orbit-bar .nav > li.search {
#orbit-bar .nav > li.search {
background-image: none;
overflow: hidden;
width: 28px;
position: relative;
@@ -322,6 +323,9 @@
#main-wrap .breadcrumb li {
font-size: 12px;
color: #999;
}
.form-actions .btn {
margin-bottom: 0;
}
#sub-wiget {
clear: right;
app/assets/stylesheets/widgets.css
+1 -1
View File
@@ -84,7 +84,7 @@
border-radius: 0 3px 3px 0;
text-align: left;
margin: 0;
width: 180px;
width: 193px;
}
.file-upload .upload {
margin:0;
app/views/layouts/_side_bar.html.erb
+3 -3
View File
@@ -2,14 +2,14 @@
<%#= link_to content_tag(:i, nil, :class => 'icons-purchase') + t('admin.purchase'), admin_purchases_path %>
<%# end -%>
<%= content_tag :li, :class => active_for_controllers('bulletins', '/panel/announcement/back_end/tags', 'bulletin_categorys', 'fact_checks') do -%>
<%= content_tag :li, :class => active_for_controllers('bulletins', '/panel/announcement/back_end/tags', 'bulletin_categorys', 'approvals') do -%>
<%= link_to content_tag(:i, nil, :class => 'icons-announcement') + t('admin.announcement'), panel_announcement_back_end_bulletins_path %>
<%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('bulletins', '/panel/announcement/back_end/tags', 'bulletin_categorys', 'fact_checks')) do -%>
<%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('bulletins', '/panel/announcement/back_end/tags', 'bulletin_categorys', 'approvals')) do -%>
<%= content_tag :li, link_to(t('announcement.all_articles'), panel_announcement_back_end_bulletins_path), :class => active_for_action('bulletins', 'index') %>
<%= content_tag :li, link_to(t('announcement.add_new'), new_panel_announcement_back_end_bulletin_path), :class => active_for_action('bulletins', 'new') %>
<%= content_tag :li, link_to(t('announcement.categories'), panel_announcement_back_end_bulletin_categorys_path), :class => active_for_action('bulletin_categorys', 'index') %>
<%= content_tag :li, link_to(t('announcement.tags'), panel_announcement_back_end_tags_path), :class => active_for_action('/panel/announcement/back_end/tags', 'index') %>
<%= content_tag :li, link_to(t('announcement.bulletin.approval_setting'), panel_announcement_back_end_approval_setting_path), :class => active_for_action('fact_checks', 'setting') if (is_manager? rescue nil) %>
<%= content_tag :li, link_to(t('announcement.bulletin.approval_setting'), panel_announcement_back_end_approval_setting_path), :class => active_for_action('approvals', 'setting') if (is_manager? rescue nil) %>
<% end -%>
<% end -%>