Merge commit '72efdbd742d4f3ac8a910bd5c817cf5c74570ba5' into ldap

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

@@ -161,13 +161,13 @@
 							<%= content_tag :div,:class	=> "tab-pane #{active_when_default_locale_eq locale}",:id=>"#{locale}" do%>
 								<div class="title">
 									<%= f.fields_for :title,@ad_image.title do |f| %>
-										<%= f.text_field locale,:class=>"ad_image-title",:placeholder => "輸入標題"%>
+										<%= f.text_field locale,:class=>"ad_image-title post-title",:placeholder => "輸入標題"%>
 									<% end %>
 								</div>
-							
+								<br/>
 								<div class="context editor">
 									<%= f.fields_for :context, @ad_image.context do |f| %>
-										<%= f.text_area locale,:style => "width:100%", :class => "asd_tinymce_textarea" %>
+										<%= f.text_area locale,:style => "width:100%", :class => "asd_tinymce_textarea post-title" %>
 									<% end %>
 								</div>
 
@@ -177,12 +177,12 @@
 						
 					</div>
 				</div>
+				<div class="form-actions">
+					<button class="btn btn-success" type="submit">Preview/預覽</button>
+					<button class="btn btn-primary" type="submit">Submit/送出</button>
+					<button class="btn" type="reset">Cancel/取消</button>
+				</div>
 			</div>
 			<!--Post End-->
-			<div class="form-actions">
-				<button class="btn btn-success" type="submit">Preview/預覽</button>
-				<button class="btn btn-primary" type="submit">Submit/送出</button>
-				<button class="btn" type="reset">Cancel/取消</button>
-			</div>
 		</form>
 	</div>

app/views/admin/items/_site_map_left_bar.html.erb

@@ -1,3 +1,3 @@
-<div class="items_setup">
+<div id="viewport">
 	<%= render_node_and_children(Item.first(:conditions => {:parent_id => nil})) %>
 </div>