developers
/
Orbit
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Rulingcom/NCCU

This commit is contained in:
Matt 2012-08-08 18:16:38 +08:00
parent 62ba8c9f18 0645f04240
commit 1aea8d91f4
7 changed files with 251 additions and 226 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
app/assets/stylesheets/list.css
View File

@ -29,9 +29,7 @@
height:20px; height:20px;
} }
.main-list tbody .quick-edit .nav { .main-list tbody .quick-edit .nav {
/*left: -55px;*/
position: absolute; position: absolute;
/*top: -3px;*/
width: 350px; width: 350px;
left: -8px; left: -8px;
} }
@ -47,6 +45,16 @@
margin-top: 0; margin-top: 0;
margin-bottom: 3px; margin-bottom: 3px;
} }
.main-list tr.with_action>td {
-webkit-transition: all 0.1s linear;
-moz-transition: all 0.1s linear;
}
.main-list tr.with_action:hover>td {
color: #DDD;
background-color: #333333;
-webkit-transition: all 0.2s linear;
-moz-transition: all 0.2s linear;
}
.main-list tr.with_action:hover .hide { .main-list tr.with_action:hover .hide {
display:block !important; display:block !important;
} }
@ -69,19 +77,18 @@
z-index: 1; z-index: 1;
} }
.main-list .label-td:hover { .main-list .label-td:hover {
background-color: #fff;
height: auto; height: auto;
padding: 5px 5px 8px; padding: 7px;
left: -40px; left: -8px;
top: -6px; top: -8px;
border: 1px solid rgba(0, 0, 0, 0.2); border: 1px solid #333;
box-shadow: 0px 5px 10px rgba(0,0,0,0.2);
-moz-box-shadow: 0px 5px 10px rgba(0,0,0,0.2);
-webkit-box-shadow: 0px 5px 10px rgba(0,0,0,0.2);
border-radius: 3px; border-radius: 3px;
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
-moz-border-radius: 3px; -moz-border-radius: 3px;
z-index: 5; z-index: 5;
width: 200px; width: 200px;
min-height: 40px;
} }
.qe-edit-div .table-condensed { .qe-edit-div .table-condensed {
background-color: #F2F2F2; background-color: #F2F2F2;
@ -94,6 +101,7 @@
background-color: #F2F2F2; background-color: #F2F2F2;
border-right: 1px solid #DDDDDD; border-right: 1px solid #DDDDDD;
border-top: 1px solid #DDDDDD !important; border-top: 1px solid #DDDDDD !important;
line-height: 20px;
} }
.route-group .route { .route-group .route {
padding: 0; padding: 0;
@ -183,8 +191,14 @@ legend {
.list-remove { .list-remove {
position: absolute; position: absolute;
top: 0; top: 0;
padding-top: 9px !important; padding-top: 11px !important;
left: 25px; left: 25px;
font-size: 19px;
color: #333;
}
.list-remove:hover {
color: #333;
text-decoration: none;
} }
.form-fixed { .form-fixed {
position: fixed; position: fixed;
@ -201,3 +215,9 @@ legend {
.paginationFixed .pagination { .paginationFixed .pagination {
margin-top: 0 !important; margin-top: 0 !important;
} }
.member-list td:last-child {
position: relative;
}
.member-list td:last-child .gender {
border-radius: 0;
}

4
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb vendored
View File

@ -43,8 +43,8 @@
<li><%= link_to t(:basic), load_quick_edit_panel_announcement_back_end_bulletin_path(bulletin, :type => 'basic'), :remote => true %></li> <li><%= link_to t(:basic), load_quick_edit_panel_announcement_back_end_bulletin_path(bulletin, :type => 'basic'), :remote => true %></li>
<li><%= link_to t(:picture), load_quick_edit_panel_announcement_back_end_bulletin_path(bulletin, :type => 'picture'), :remote => true %></li> <li><%= link_to t(:picture), load_quick_edit_panel_announcement_back_end_bulletin_path(bulletin, :type => 'picture'), :remote => true %></li>
<li><%= link_to t(:tags), load_quick_edit_panel_announcement_back_end_bulletin_path(bulletin, :type => 'tags'), :remote => true %></li> <li><%= link_to t(:tags), load_quick_edit_panel_announcement_back_end_bulletin_path(bulletin, :type => 'tags'), :remote => true %></li>
<li><%= link_to t(:link), load_quick_edit_panel_announcement_back_end_bulletin_path(bulletin, :type => 'links'), :remote => true %></li> <li><%#= link_to t(:link), load_quick_edit_panel_announcement_back_end_bulletin_path(bulletin, :type => 'links'), :remote => true %></li>
<li><%= link_to t(:file), load_quick_edit_panel_announcement_back_end_bulletin_path(bulletin, :type => 'files'), :remote => true %></li> <li><%#= link_to t(:file), load_quick_edit_panel_announcement_back_end_bulletin_path(bulletin, :type => 'files'), :remote => true %></li>
</ul> </ul>
</li> </li>
<% end %> <% end %>

18
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_basic.html.erb vendored
View File

@ -35,16 +35,18 @@
</div> </div>
</div> </div>
</div> </div>
<div id="widget-status"> <% if show_form_status_field(@bulletin)%>
<div class="control-group"> <div id="widget-status">
<label class="control-label"><%= t(:status) %></label> <div class="control-group">
<div class="controls"> <label class="control-label"><%= t(:status) %></label>
<label class="checkbox inline"><%= f.check_box :is_hot %><%= t(:hot) %></label> <div class="controls">
<label class="checkbox inline"><%= f.check_box :is_top %><%= t(:top) %></label> <label class="checkbox inline"><%= f.check_box :is_hot %><%= t(:hot) %></label>
<label class="checkbox inline"><%= f.check_box :is_hidden %><%= t(:hidden) %></label> <label class="checkbox inline"><%= f.check_box :is_top %><%= t(:top) %></label>
<label class="checkbox inline"><%= f.check_box :is_hidden %><%= t(:hidden) %></label>
</div>
</div> </div>
</div> </div>
</div> <% end -%>
<div id="widget-role"> <div id="widget-role">
<div class="control-group"> <div class="control-group">
<label class="control-label">Role</label> <label class="control-label">Role</label>

4
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb vendored
View File

@ -14,13 +14,13 @@
<div id="bulletin_link_qe"> <div id="bulletin_link_qe">
<div id="modal-link" class="modal fade"> <div id="modal-link" class="modal fade">
<%= render :partial => "bulletin_link_qe" %> <%#= render :partial => "bulletin_link_qe" %>
</div> </div>
</div> </div>
<div id="news_bulletin_file_qe"> <div id="news_bulletin_file_qe">
<div id="modal-file" class="modal fade"> <div id="modal-file" class="modal fade">
<%= render :partial => "bulletin_file_qe" %> <%#= render :partial => "bulletin_file_qe" %>
</div> </div>
</div> </div>

4
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb vendored
View File

@ -42,8 +42,8 @@
<li><%= link_to t(:basic), load_quick_edit_panel_news_back_end_news_bulletin_path(news_bulletin, :type => 'basic'), :remote => true %></li> <li><%= link_to t(:basic), load_quick_edit_panel_news_back_end_news_bulletin_path(news_bulletin, :type => 'basic'), :remote => true %></li>
<li><%= link_to t(:picture), load_quick_edit_panel_news_back_end_news_bulletin_path(news_bulletin, :type => 'picture'), :remote => true %></li> <li><%= link_to t(:picture), load_quick_edit_panel_news_back_end_news_bulletin_path(news_bulletin, :type => 'picture'), :remote => true %></li>
<li><%= link_to t(:tags), load_quick_edit_panel_news_back_end_news_bulletin_path(news_bulletin, :type => 'tags'), :remote => true %></li> <li><%= link_to t(:tags), load_quick_edit_panel_news_back_end_news_bulletin_path(news_bulletin, :type => 'tags'), :remote => true %></li>
<li><%= link_to t(:link), load_quick_edit_panel_news_back_end_news_bulletin_path(news_bulletin, :type => 'links'), :remote => true %></li> <li><%#= link_to t(:link), load_quick_edit_panel_news_back_end_news_bulletin_path(news_bulletin, :type => 'links'), :remote => true %></li>
<li><%= link_to t(:file), load_quick_edit_panel_news_back_end_news_bulletin_path(news_bulletin, :type => 'files'), :remote => true %></li> <li><%#= link_to t(:file), load_quick_edit_panel_news_back_end_news_bulletin_path(news_bulletin, :type => 'files'), :remote => true %></li>
</ul> </ul>
</li> </li>
<%#= debugger %> <%#= debugger %>

19
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_quick_edit_basic.html.erb vendored
View File

@ -35,16 +35,19 @@
</div> </div>
</div> </div>
</div> </div>
<div id="widget-status"> <% if news_show_form_status_field(@news_bulletin)%>
<div class="control-group"> <div id="widget-status">
<label class="control-label"><%= t(:status) %></label> <div class="control-group">
<div class="controls"> <label class="control-label"><%= t(:status) %></label>
<label class="checkbox inline"><%= f.check_box :is_hot %><%= t(:hot) %></label> <div class="controls">
<label class="checkbox inline"><%= f.check_box :is_top %><%= t(:top) %></label> <label class="checkbox inline"><%= f.check_box :is_hot %><%= t(:hot) %></label>
<label class="checkbox inline"><%= f.check_box :is_hidden %><%= t(:hidden) %></label> <label class="checkbox inline"><%= f.check_box :is_top %><%= t(:top) %></label>
<label class="checkbox inline"><%= f.check_box :is_hidden %><%= t(:hidden) %></label>
</div>
</div> </div>
</div> </div>
</div> <% end -%>
<div id="widget-role"> <div id="widget-role">
<div class="control-group"> <div class="control-group">
<label class="control-label">Role</label> <label class="control-label">Role</label>

4
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb vendored
View File

@ -14,13 +14,13 @@
<div id="news_bulletin_link_qe"> <div id="news_bulletin_link_qe">
<div id="modal-link" class="modal fade"> <div id="modal-link" class="modal fade">
<%= render :partial => "news_bulletin_link_qe" %> <%#= render :partial => "news_bulletin_link_qe" %>
</div> </div>
</div> </div>
<div id="news_bulletin_file_qe"> <div id="news_bulletin_file_qe">
<div id="modal-file" class="modal fade"> <div id="modal-file" class="modal fade">
<%= render :partial => "news_bulletin_file_qe" %> <%#= render :partial => "news_bulletin_file_qe" %>
</div> </div>
</div> </div>