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

Conflicts:
	app/views/admin/ad_banners/_ad_banner_tab.html.erb

app/assets/stylesheets/list.css

@@ -35,6 +35,9 @@
 	width: 350px;
 	left: -8px;
 }
+.main-list tr:first-child td {
+	border-top: 1px solid #DDDDDD;
+}
 .main-list td {
 	background-color: #FFFFFF;
 	border-bottom: 1px solid #DDDDDD;
@@ -75,6 +78,9 @@
 	-moz-border-radius: 3px;
 	z-index: 5;
 }
+.qe-edit-div .table-condensed {
+	background-color: #F2F2F2;
+}
 .table-label {
     background-color: #F2F2F2;
     position: relative;
@@ -94,6 +100,18 @@
 	height:auto;
 	padding: 0;
 }
+.qe-block legend {
+	padding-left: 8px;
+	margin-bottom: 0;
+	padding-bottom: 0;
+}
+.qe-block .control-group {
+	margin-bottom: 0;
+}
+.qe-block .controls, .qe-block .control-label {
+	margin-top: 10px;
+	margin-bottom: 10px;
+}
 .qe-block .table td, .qe-block .table th {
 	padding: 8px;
 }

app/assets/stylesheets/style.css.erb

@@ -613,8 +613,15 @@
 .text-green {
 	color: #39b54a !important;
 }
+.adbanner-setup {
+	margin-right: 10px;
+	margin-bottom: 30px !important;
+}
 .adbanner-list {
-	margin-top: 20px;
+	border-top: 1px solid #AAA;
+	margin-right: 10px;
+	padding-top: 10px;
+	position: relative;
 }
 .adbanner-list ul {
 	margin: 0px;
@@ -625,7 +632,12 @@
 	margin-right: 20px;
 }
 .adbanner-action {
-	margin-bottom: 20px;
+	position: absolute;
+	top: -32px;
+	right: 0;
+}
+#bulletin_link_qe form {
+	margin: 0;
 }
 [class^="icons-"] {
 	display: inline-block;

app/assets/stylesheets/widgets.css

@@ -101,6 +101,18 @@
 .file-upload .upload:focus {
 	position:absolute;
 }
+.file-upload .input-medium {
+    border-radius: 3px 3px 3px 3px !important;
+    width: 267px;
+    position: relative;
+	z-index: 5;
+	display: block;
+	clear: both;
+}
+.file-upload .control-label {
+	margin-top: 0;
+	margin-bottom: 5px;
+}
 .upload-picture {
 	margin-bottom: 5px;
 	text-align: center;
@@ -120,12 +132,6 @@
     margin : 0px 0 5px;
     padding: 5px 10px;
 }
-.file-upload .input-medium {
-    border-radius: 3px 3px 3px 3px !important;
-    width: 267px;
-    position: relative;
-	z-index: 5;
-}
 #widget-link table {
 	margin-bottom:0
 }

app/views/admin/ad_banners/_ad_banner_tab.html.erb

@@ -1,23 +1,27 @@
-<div class="tab-pane <%= "active"  if ad_banner_tab==@active%>" id=<%= ad_banner_tab.title %>>
+<div class="tab-pane fade <%= "active in"  if ad_banner_tab==@active%>" id=<%= ad_banner_tab.title %>>
-	<p><%= t("admin.ad.banner_best_size") %>：</p>
 
 	<%= form_for ad_banner_tab,:url=> admin_ad_banner_path(ad_banner_tab),:method => :put,:class=>"input-medium" do |f| -%>
-		<%= f.label :ad_fx, t('admin.ad.ab_fx') %>
+		<div class="adbanner-setup well">
-		<%= f.select :ad_fx ,AdBanner::FX_TYPES %>
+			<!--<p><%#= t("admin.ad.banner_best_size") %>：</p>-->
-		<%= f.label :transition_sec, t('admin.ad.transition_sec') %>
+			<%= f.label :ad_fx, t('admin.ad.ab_fx') %>
-		<%= f.text_field :transition_sec,:placeholder=>t('admin.ad.sec_place_holder'),:class=> "span3" %> <%= t("admin.ad.trans_unit_sec") %>
+			<%= f.select :ad_fx ,AdBanner::FX_TYPES %>
-		<%= f.submit t("admin.ad.update_banner") %>
+			<%= f.label :transition_sec, t('admin.ad.transition_sec') %>
-		<%= f.submit t("cancel"),:type=>'reset' %>
+			<%= f.text_field :transition_sec,:placeholder=>t('admin.ad.sec_place_holder'),:class=> "span3" %> <%= t("admin.ad.trans_unit_sec") %>
-	<div class="adbanner-list">
+			<br>
-		<div class="adbanner-action">
+			<%= f.submit t("admin.ad.update_banner"), :class => 'btn' %>
-			<%= link_to t("admin.ad.new_image"),new_admin_ad_banner_ad_image_path(ad_banner_tab) ,:class => "btn btn-primary"%>
+			<%= f.submit t("cancel"),:type=>'reset', :class => 'btn'  %>
-			<%= link_to t("modal.preview"), admin_realtime_preview_ad_banner_path(ad_banner_tab) , :class=>'preview_trigger btn btn-success'%>
+		</div>
+		<h3>圖片列表</h3>
+		<div class="adbanner-list">
+			<div class="adbanner-action pagination-right">
+				<%= link_to t("admin.ad.new_image"),new_admin_ad_banner_ad_image_path(ad_banner_tab) ,:class => "btn btn-primary"%>
+				<%= link_to t("modal.preview"), admin_realtime_preview_ad_banner_path(ad_banner_tab.title) , :class=>'preview_trigger btn btn-success'%>
+			</div>
+			<ul class="clear">
+				<%= render :partial => "ad_image_update", :collection => ad_banner_tab.ad_images,:as => :ad_image,:locals=>{:ad_banner => ad_banner_tab}  %>
+			</ul>
+			<%#= render :partial => 'new_add_banner_file', :object => ad_banner_tab.ad_images.build, :locals => { :field_name => "new_ad_images[]", :f => f, :classes => "r_destroy" } %>
 		</div>
-		<ul class="clear">
-			<%= render :partial => "ad_image_update", :collection => ad_banner_tab.ad_images,:as => :ad_image,:locals=>{:ad_banner => ad_banner_tab}  %>
-		</ul>
-		<%#= render :partial => 'new_add_banner_file', :object => ad_banner_tab.ad_images.build, :locals => { :field_name => "new_ad_images[]", :f => f, :classes => "r_destroy" } %>
-	</div>
 	<% end -%>
 	<%#= render :partial => 'preview_block',:locals=> {:ad_banner =>ad_banner_tab} %> 
 </div>

app/views/admin/ad_images/_form.html.erb

@@ -83,7 +83,7 @@
             <span class="alert widgetInfo">此區塊圖片尺寸請使用580px × 225px</span>
             <div class="controls file-upload input-prepend">
               <label class="control-label add-on btn" for="input-upload">
-								Choose file
+								<%= t(:browse) %>
 								<%= f.file_field :file,:id=>"input-upload",:class => "upload", :onchange=> "document.getElementById('fu1').innerHTML = this.form.fu1.value = this.value;" %>
 							</label>
 							<span id="fu1" class="file-name"></span>

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

@@ -25,12 +25,11 @@
 			</div>
 		<% end %>
 	<% end %>
-
+	</div>
 	<div class="modal-footer">
 		<%= hidden_field_tag 'bulletin_link[bulletin_id]', @bulletin_link.bulletin_id %>
 		<%= f.submit t('submit'), :class=>'btn btn-primary' %>
-	  <a class="btn" data-dismiss="modal"><%= t('cancel')%></a
+	  <a class="btn" data-dismiss="modal"><%= t('cancel')%></a>
-	</div>
 <% end %>
 		
 

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

@@ -1,22 +1,23 @@
 <div id="qe-picture" class="qe-edit-div">
-    <div id="widget-picture">
+    <div id="widget-picture clear">
         <div class="control-group">
-            <label class="control-label">Picture</label>
+            <!--<label class="control-label">Picture</label>-->
             <div class="control-group">
-                <img class="pull-left upload-picture" src="" />
+                <div class="controls upload-picture">
-                <div class="controls file-upload">
+                    <img class="pull-left upload-picture" src="" />
-				<label class="control-label btn" for="input-upload">
+                </div>
-					Browse/選擇檔案
+                <div class="controls file-upload input-prepend">
-					<%= f.file_field :image, :id => "input-upload", :class => 'upload', :onchange => "document.getElementById('fu').innerHTML = this.form.fu.value = this.value;" %>
+				    <label class="control-label add-on btn" for="input-upload">
-				</label>
+					   <%= t(:browse) %>
-                <span id='fu' class="file-name"></span>
+					   <%= f.file_field :image, :id => "input-upload", :class => 'upload', :onchange => "document.getElementById('fu').innerHTML = this.form.fu.value = this.value;" %>
-                <br>
+				    </label>
-                <input name='fu' class="input-large" type="text">
+                    <span id='fu' class="file-name"></span>
-				<br>
+                    <input name='fu' class="input-medium qe-picture-rename" type="text">
-				<% if bulletin.image.file %>
+				    <br>
-					<%= f.check_box :remove_image %>
+				    <% if bulletin.image.file %>
-					<%= t('announcement.刪除已上傳檔案') %>
+					   <%= f.check_box :remove_image %>
-				<% end %>
+					   <%= t('announcement.刪除已上傳檔案') %>
+				    <% end %>
                 </div>
             </div>
         </div>

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

@@ -34,11 +34,15 @@
 
 <div id="qe-tags" class="qe-edit-div">
 	<div id="widget-tags">
-		<div class="form-horizontal">
+        <div class="controls">
-			<% @tags.each do |tag| %>
+    		<div class="form-horizontal">
-			<%= check_box_tag 'bulletin[tag_ids][]', tag.id, bulletin.tag_ids.include?(tag.id)%>
+    			<% @tags.each do |tag| %>
-			<%= tag[I18n.locale] %>
+                <label class="checkbox inline">
-			<% end %>
+    			<%= check_box_tag 'bulletin[tag_ids][]', tag.id, bulletin.tag_ids.include?(tag.id)%>
-		</div>
+    			<%= tag[I18n.locale] %>
+                </label>
+    			<% end %>
+    		</div>
+        </div>
 	</div>
 </div>