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

app/assets/stylesheets/list.css

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

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb

@@ -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(: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(: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>
 						</li>
 					<% end %>

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_basic.html.erb

@@ -35,6 +35,7 @@
 			</div>
 		</div>
 	</div>
+	<% if show_form_status_field(@bulletin)%>
 		<div id="widget-status">
 			<div class="control-group">
 				<label class="control-label"><%= t(:status) %></label>
@@ -45,6 +46,7 @@
 				</div>
 			</div>
 		</div>
+	<% end -%>
 	<div id="widget-role">
 		<div class="control-group">
 			<label class="control-label">Role</label>

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb

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

vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb

@@ -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(: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(: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>
 						</li>
 						<%#= debugger  %>

vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_quick_edit_basic.html.erb

@@ -35,6 +35,7 @@
 			</div>
 		</div>
 	</div>
+	<% if news_show_form_status_field(@news_bulletin)%>
 		<div id="widget-status">
 			<div class="control-group">
 				<label class="control-label"><%= t(:status) %></label>
@@ -45,6 +46,8 @@
 				</div>
 			</div>
 		</div>
+	<% end -%>
+	
 	<div id="widget-role">
 		<div class="control-group">
 			<label class="control-label">Role</label>

vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb

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