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

app/assets/stylesheets/list.css

@@ -1,203 +1,223 @@
-/*list*/
+/*list*/
-
+
-.table th.select {
+.table th.select {
-	border-bottom:2px solid #0088CC;
+	border-bottom:2px solid #0088CC;
-}
+}
-.main-list {
+.main-list {
-	margin-bottom: 0;
+	margin-bottom: 0;
-}
+}
-.main-wrap>.main-list thead th {
+.main-wrap>.main-list thead th {
-	background-color: transparent;
+	background-color: transparent;
-	border-right: medium none;
+	border-right: medium none;
-}
+}
-.main-list thead th:last-child {
+.main-list thead th:last-child {
-	border-right: none; 
+	border-right: none; 
-}
+}
-.main-list .span1 {
+.main-list .span1 {
-	min-width: 32px;
+	min-width: 32px;
-}
+}
-.main-list .span7 {
+.main-list .span7 {
-    min-width: 300px;
+    min-width: 300px;
-}
+}
-.main-list .nav-pills > li > a {
+.main-list .nav-pills > li > a {
-	border-radius: 5px 5px 5px 5px;
+	border-radius: 5px 5px 5px 5px;
-	margin: 2px;
+	margin: 2px;
-	padding:5px;
+	padding:5px;
-}
+}
-.main-list tbody .quick-edit {
+.main-list tbody .quick-edit {
-	position:relative;
+	position:relative;
-	height:20px;
+	height:20px;
-}
+}
-.main-list tbody .quick-edit .nav {
+.main-list tbody .quick-edit .nav {
-	/*left: -55px;*/
+	position: absolute;
-	position: absolute;
+	width: 350px;
-	/*top: -3px;*/
+	left: -8px;
-	width: 350px;
+}
-	left: -8px;
+.main-list tr:first-child td {
-}
+	border-top: 1px solid #DDDDDD;
-.main-list tr:first-child td {
+}
-	border-top: 1px solid #DDDDDD;
+.main-list td {
-}
+	background-color: #FFFFFF;
-.main-list td {
+	border-bottom: 1px solid #DDDDDD;
-	background-color: #FFFFFF;
+	border-top: medium none;
-	border-bottom: 1px solid #DDDDDD;
+}
-	border-top: medium none;
+.main-list .nav {
-}
+    margin-top: 0;
-.main-list .nav {
+    margin-bottom: 3px;
-    margin-top: 0;
+}
-    margin-bottom: 3px;
+.main-list tr.with_action>td {
-}
+	-webkit-transition: all 0.1s linear;
-.main-list tr.with_action:hover .hide {
+	-moz-transition: all 0.1s linear;
-	display:block !important;
+}
-}
+.main-list tr.with_action:hover>td {
-.main-list .label-group {
+	color: #DDD;
-	position: relative;
+	background-color: #333333;
-	height: 40px;
+	-webkit-transition: all 0.2s linear;
-}
+	-moz-transition: all 0.2s linear;
-.main-list .label-group .label {
+}
-	margin-bottom: 1px;
+.main-list tr.with_action:hover .hide {
-	display: inline-block;
+	display:block !important;
-	padding: 0 3px;
+}
-}
+.main-list .label-group {
-.main-list .label-td {
+	position: relative;
-    background-color: rgba(255, 255, 255, 1);
+	height: 40px;
-    height: 40px;
+}
-    overflow: hidden;
+.main-list .label-group .label {
-    position: absolute;
+	margin-bottom: 1px;
-    width: 100%;
+	display: inline-block;
-	left: 0;
+	padding: 0 3px;
-	z-index: 1;	
+}
-}
+.main-list .label-td {
-.main-list .label-td:hover {
+    background-color: rgba(255, 255, 255, 1);
-	height: auto;
+    height: 40px;
-    padding: 5px 5px 8px;
+    overflow: hidden;
-	left: -40px;
+    position: absolute;
-	top: -6px;
+    width: 100%;
-	border: 1px solid rgba(0, 0, 0, 0.2);
+	left: 0;
-	box-shadow: 0px 5px 10px rgba(0,0,0,0.2);
+	z-index: 1;	
-	-moz-box-shadow: 0px 5px 10px rgba(0,0,0,0.2);
+}
-	-webkit-box-shadow: 0px 5px 10px rgba(0,0,0,0.2);
+.main-list .label-td:hover {
-	border-radius: 3px;
+    background-color: #fff;
-	-webkit-border-radius: 3px;
+	height: auto;
-	-moz-border-radius: 3px;
+    padding: 7px;
-	z-index: 5;
+	left: -8px;
-	width: 200px;
+	top: -8px;
-}
+	border: 1px solid #333;
-.qe-edit-div .table-condensed {
+	border-radius: 3px;
-	background-color: #F2F2F2;
+	-webkit-border-radius: 3px;
-}
+	-moz-border-radius: 3px;
-.table-label {
+	z-index: 5;
-    background-color: #F2F2F2;
+	width: 200px;
-    position: relative;
+	min-height: 40px;
-}
+}
-.table-label .main-list thead th {
+.qe-edit-div .table-condensed {
-    background-color: #F2F2F2;
+	background-color: #F2F2F2;
-    border-right: 1px solid #DDDDDD;
+}
-    border-top: 1px solid #DDDDDD !important;
+.table-label {
-}
+    background-color: #F2F2F2;
-.route-group .route {
+    position: relative;
-	padding: 0;
+}
-}
+.table-label .main-list thead th {
-.route-group .route .breadcrumb {
+    background-color: #F2F2F2;
-	border-width: 0!important;
+    border-right: 1px solid #DDDDDD;
-}
+    border-top: 1px solid #DDDDDD !important;
-.qe-block td {
+	line-height: 20px;
-	height:auto;
+}
-	padding: 0;
+.route-group .route {
-	/*background-color: #dedede;*/
+	padding: 0;
-}
+}
-.qe-block legend {
+.route-group .route .breadcrumb {
-	padding-left: 8px;
+	border-width: 0!important;
-	margin-bottom: 0;
+}
-	padding-bottom: 0;
+.qe-block td {
-}
+	height:auto;
-.qe-block .control-group {
+	padding: 0;
-	margin-bottom: 0;
+	/*background-color: #dedede;*/
-}
+}
-.qe-block .controls, .qe-block .control-label {
+.qe-block legend {
-	margin-top: 10px;
+	padding-left: 8px;
-	margin-bottom: 10px;
+	margin-bottom: 0;
-}
+	padding-bottom: 0;
-.qe-block .table td, .qe-block .table th {
+}
-	padding: 8px;
+.qe-block .control-group {
-}
+	margin-bottom: 0;
-.qe-block .form-horizontal {
+}
-	margin-bottom: 0;
+.qe-block .controls, .qe-block .control-label {
-}
+	margin-top: 10px;
-.qe-block .form-actions {
+	margin-bottom: 10px;
-	margin-bottom: 0;
+}
-}
+.qe-block .table td, .qe-block .table th {
-legend {
+	padding: 8px;
-  font-size: 15px;
+}
-  line-height: 30px;
+.qe-block .form-horizontal {
-  margin-bottom: 15px;
+	margin-bottom: 0;
-  padding-bottom: 5px;
+}
-}
+.qe-block .form-actions {
-.subnav {
+	margin-bottom: 0;
-	-moz-border-radius: 0;
+}
-	-webkit-border-radius: 0;
+legend {
-    border-radius: 0;
+  font-size: 15px;
-	border-left: none;
+  line-height: 30px;
-	border-right: none;
+  margin-bottom: 15px;
-	position: fixed;
+  padding-bottom: 5px;
-	top: 30px;
+}
-	z-index: 50;
+.subnav {
-}
+	-moz-border-radius: 0;
-.subnav .nav > li:first-child > a, .subnav .nav > li:first-child > a:hover {
+	-webkit-border-radius: 0;
-	-moz-border-radius: 0;
+    border-radius: 0;
-	-webkit-border-radius: 0;
+	border-left: none;
-    border-radius: 0;
+	border-right: none;
-}
+	position: fixed;
-.dropdown-menu.tags {
+	top: 30px;
-	max-width: none;
+	z-index: 50;
-}
+}
-.dropdown-menu.tags .tags-cloud {
+.subnav .nav > li:first-child > a, .subnav .nav > li:first-child > a:hover {
-	width: 300px;
+	-moz-border-radius: 0;
-	padding:10px;
+	-webkit-border-radius: 0;
-}
+    border-radius: 0;
-.dropdown-menu.tags .tags-cloud .active {
+}
-	background-color: #0088CC;
+.dropdown-menu.tags {
-	color: #FFFFFF;
+	max-width: none;
-}
+}
-.dropdown-menu.tags .tags-cloud a {
+.dropdown-menu.tags .tags-cloud {
-    display: inline-block;
+	width: 300px;
-	margin-bottom: 3px;
+	padding:10px;
-}
+}
-.dropdown-menu.tags li:last-child  a {
+.dropdown-menu.tags .tags-cloud .active {
-    display: block;
+	background-color: #0088CC;
-	text-align:center;
+	color: #FFFFFF;
-}
+}
-.sort-header th {
+.dropdown-menu.tags .tags-cloud a {
-	padding: 0 8px;
+    display: inline-block;
-	vertical-align: inherit;
+	margin-bottom: 3px;
-	position: relative;
+}
-}
+.dropdown-menu.tags li:last-child  a {
-.sort-header th a {
+    display: block;
-	display: block;
+	text-align:center;
-	padding: 10px 0;
+}
-	white-space: nowrap;
+.sort-header th {
-}
+	padding: 0 8px;
-.sort-header th a:hover {
+	vertical-align: inherit;
-	text-decoration: none;
+	position: relative;
-}
+}
-.list-remove {
+.sort-header th a {
-	position: absolute;
+	display: block;
-	top: 0;
+	padding: 10px 0;
-	padding-top: 9px !important;
+	white-space: nowrap;
-	left: 25px;
+}
-}
+.sort-header th a:hover {
-.form-fixed {
+	text-decoration: none;
-	position: fixed;
+}
-	margin: 0;
+.list-remove {
-	padding: 10px;
+	position: absolute;
-	bottom: 0;
+	top: 0;
-	z-index: 2;
+	padding-top: 11px !important;
-}
+	left: 25px;
-.form-fixed .btn {
+	font-size: 19px;
-	margin-top: 4px;
+	color: #333;
-}
+}
-.paginationFixed {
+.list-remove:hover {
-}
+	color: #333;
-.paginationFixed .pagination {
+	text-decoration: none;
-	margin-top: 0 !important;
+}
+.form-fixed {
+	position: fixed;
+	margin: 0;
+	padding: 10px;
+	bottom: 0;
+	z-index: 2;
+}
+.form-fixed .btn {
+	margin-top: 4px;
+}
+.paginationFixed {
+}
+.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,16 +35,18 @@
 			</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>
+	<% 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,16 +35,19 @@
 			</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>
+	<% 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>