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

app/assets/javascripts/inc/search.js

@@ -8,24 +8,27 @@ $.extend($.expr[':'], {
 		return (elem.textContent || elem.innerText || '').toLowerCase().indexOf((match[3] || "").toLowerCase()) >= 0;
 	}
 });
+var interval,sval;
 $(document).ready(function(){
 	$("#user_filter").keyup(function(){
-		if($(this).val()){
+		sval = $(this).val();
-			var totalfoundbyname = $("div#users_checkbox_ary label.member-name:containsi("+$(this).val()+")").length
+		$(".checkbox").popover("hide");
-			if(totalfoundbyname!=0){
+		$("div.checkblock").hide();
-				$("div#users_checkbox_ary label.member-name:not(:containsi("+$(this).val()+"))").parent().parent().slideUp();
+		clearInterval(interval);
-				//$("div#users_checkbox_ary label.member-name:not(:containsi("+$(this).val()+"))").parent().popover('hide');
+		interval = setInterval(waitForSearch,1000);
-				$("div#users_checkbox_ary label.member-name:containsi("+$(this).val()+")").parent().parent().slideDown();
-				$("div#users_checkbox_ary label.member-name:containsi("+$(this).val()+")").parent().popover('toggle');				
-			}else if(totalfoundbyname==0){
-				$("div#users_checkbox_ary div.for_unit:not(:containsi("+$(this).val()+"))").parent().slideUp();
-				//$("div#users_checkbox_ary div.for_unit:not(:containsi("+$(this).val()+"))").popover('hide');
-				$("div#users_checkbox_ary div.for_unit:containsi("+$(this).val()+")").parent().slideDown();
-				$("div#users_checkbox_ary div.for_unit:containsi("+$(this).val()+")").popover('toggle');
-			}	
-		}else{
-			$(".checkbox").popover('hide');	
-			$("div.checkblock").slideDown();
-		}
 	})
 })
+var waitForSearch = function(){
+	if(sval){
+		var totalfoundbyname = $("div#users_checkbox_ary label.member-name:containsi("+sval+")").length
+		if(totalfoundbyname!=0){
+			$("div#users_checkbox_ary label.member-name:containsi("+sval+")").parent().parent().show();				
+		}else if(totalfoundbyname==0){
+			$("div#users_checkbox_ary div.for_unit:containsi("+sval+")").parent().show();
+		}	
+	}else{
+		$(".checkbox").popover('hide');	
+		$("div.checkblock").show();
+	}
+	clearInterval(interval);
+}

app/assets/javascripts/site_editor.js

@@ -8,3 +8,4 @@
 //= require jquery_ujs
 //= require page_edit
 //= require side_bar_history
+//= require new_admin

app/assets/stylesheets/new_admin.css.erb

@@ -8,7 +8,7 @@
  *= require bootstrap
  *= require bootstrap-orbit
  *= require list
- *= require widget
+ *= require widgets
  *= require style
  *= require scroll_style
  *= require isotope

app/assets/stylesheets/sidebar.css.erb

@@ -1,13 +1,9 @@
 
 #back_sidebar {
-	background: url(<%= asset_path "75.png" %>) repeat scroll left top transparent;
-	box-shadow: 3px 0 4px #472A12;
-	border-right: 1px solid #121212;
-	height: 100%;
 	left: 0;
 	position: fixed;
 	top: 0;
-	width: 220px;
+	width: 160px;
 }
 
 #back_sidebar h1 {
@@ -92,3 +88,53 @@
 #sidebar .translations_setup {
 	margin-top: 42px;
 }
+
+
+#main-sidebar{
+	left:0;
+}
+#main-sidebar .list{
+}
+#main-sidebar li{
+	position:relative;
+}
+#main-sidebar li a{
+    border-bottom: 1px solid #CCCCCC;
+    display: block;
+    padding: 10px 0 10px 10px;
+}
+#main-sidebar ul ul li a{
+    padding: 10px 0 10px 20px;
+}
+#main-sidebar li:hover .quick-edit{
+	display:block;
+}
+#main-sidebar .quick-edit{
+    background: none repeat scroll 0 0 #FFFFFF;
+    border: 1px solid #DDDDDD;
+    border-radius: 5px 5px 5px 5px;
+    display: none;
+    margin:-3px 0 0 3px;
+    padding: 3px;
+    z-index:1;
+}
+#main-sidebar .quick-edit:after{
+    content: "."; 
+    display: block;
+    height: 0; 
+    clear: both; 
+    visibility: hidden;
+}
+#main-sidebar .quick-edit a{
+    border-bottom: medium none;
+    border-radius: 5px 5px 5px 5px;
+    font-size:12px;
+    float: left;
+    margin: 0 3px 0 0;
+    padding: 3px;
+}
+
+#main-sidebar .quick-edit a:hover{
+    background: none repeat scroll 0 0 #EEEEEE;
+    border-bottom:none;
+}

app/assets/stylesheets/site_items.css.erb

@@ -4,7 +4,7 @@ html, body{
     padding: 0;
 }
 html{
-    background: url(<%= asset_path "body.jpg" %>) no-repeat fixed 0 0 transparent;
+
 	background-size: cover;
 }
 
@@ -172,8 +172,6 @@ body{
 .main {
     background: none repeat scroll 0 0 #FFFFFF;
     height: 100%;
-    margin-left: 220px;
-    padding: 0 40px;
     position: relative;
 }
 .main_list {

app/assets/stylesheets/style.css.erb

@@ -261,6 +261,10 @@
 	box-shadow: 0px 2px 1px rgba(0,0,0,0.1);
 	-moz-box-shadow: 0px 2px 1px rgba(0,0,0,0.1);
 	-webkit-box-shadow: 0px 2px 1px rgba(0,0,0,0.1);
+	display: none;
+}
+#main-sidebar .nav > li.active > .nav {
+	display: block;
 }
 #main-sidebar .nav > li > .nav > li > a {
 	margin-left: 0;
@@ -433,6 +437,26 @@
 .filters .in {
 	/*border-bottom: 1px solid rgba(0,0,0,0.07)*/
 }
+#tags {
+}
+#tags .tag {
+	line-height: 32px;
+    padding: 0 10px;
+	background-color: #FFFFFF;
+	border-bottom: 1px solid #DDDDDD;
+	border-top: medium none;
+}
+#tags .tag form, #tags .tag form input {
+	margin:0;
+}
+#tags .tagitem {
+	display: inline-block;
+	float: left;
+}
+#tags .action {
+	display: inline-block;
+	float: right;
+}
 .sign-in {
 	width: 360px;
 	margin: 0 auto 70px;

app/assets/stylesheets/widgets.css

@@ -0,0 +1,148 @@
+.widget-size-300 {
+	width:298px;
+}
+.widget-box {
+	background-color: #FFF;
+	overflow: hidden;
+	min-width: 300px;
+	margin: 0 0 5px 5px;
+	position:relative;
+}
+.widget-box .widget-title {
+	color: #FFF;
+	padding-left: 5px;
+	border-radius: 5px 5px 0 0;
+	-moz-border-radius: 5px 5px 0 0;
+	-webkit-border-radius: 5px 5px 0 0;
+	background-image: -moz-linear-gradient(top, #B7B7B7, #9d9d9d);
+	background-image: -ms-linear-gradient(top, #B7B7B7, #9d9d9d);
+	background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#B7B7B7), to(#9d9d9d));
+	background-image: -webkit-linear-gradient(top, #B7B7B7, #9d9d9d);
+	background-image: -o-linear-gradient(top, #B7B7B7, #9d9d9d);
+	background-image: linear-gradient(top, #B7B7B7, #9d9d9d);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#B7B7B7', endColorstr='#9d9d9d', GradientType=0);
+}
+.widget-box .widget-title [class^="icons-"] {
+	margin: 3px 5px 0 2px;
+}
+.widget-box .widget-content {
+	padding: 10px;
+	border-width: 0 1px 1px;
+	border-style: solid;
+	border-color: #CCCCCC;
+	border-radius: 0 0 5px 5px;
+	-moz-border-radius: 0 0 5px 5px;
+	-webkit-border-radius: 0 0 5px 5px;
+}
+.widget-box .form-horizontal .control-group > label {
+  width: 50px;
+}
+.widget-box .form-horizontal .controls {
+  margin-left: 60px;
+}
+.widget-action {
+	position:absolute;
+	right:1px;
+	top:6px;
+}
+.action {
+	float: left;
+	display:inline-block;
+	margin-right: 5px;
+	opacity: 0.8;
+	filter: alpha(opacity=80);
+}
+.action:hover {
+	opacity: 1;
+	filter: alpha(opacity=100);
+	cursor: pointer;
+}
+.select-role {
+	display:none;
+	padding: 10px 0;
+}
+.file-upload {
+	position:relative;
+	overflow: hidden;
+}
+.file-upload .file-name {
+	white-space: nowrap;
+	overflow: hidden;
+	border-style: solid;
+	border-width: 1px 1px 1px 0;
+	border-color: #CCC;
+	display: inline-block;
+	float: left;
+	padding: 4px 10px;
+	height: 18px;
+	line-height: 18px;
+	-webkit-border-radius: 0 3px 3px 0;
+	-moz-border-radius: 0 3px 3px 0;
+	border-radius: 0 3px 3px 0;
+	text-align: left;
+	margin: 0;
+    width: 182px;
+}
+.file-upload .upload {
+	margin:0;
+	padding:0;
+	position:absolute;
+	top: 0;
+	left:0;
+	opacity:.0;
+    font-size: 60px;
+    left: -595px/9;
+	filter: alpha(opacity: 0);
+	outline: none;
+}
+.file-upload .upload:focus {
+	position:absolute;
+}
+.upload-picture {
+	margin-bottom: 5px;
+	text-align: center;
+	width: 276px;
+	overflow: hidden;
+	height: 90px;
+}
+.upload-picture img {
+    left: 0;
+    margin-top: -15%;
+    width: 100%;
+}
+.widget-box .widgetInfo {
+    display: inline-block;
+    text-align: center;
+    width: 255px;
+    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
+}
+/*Date*/
+.showDate {
+	border-style: solid;
+	border-width: 1px 0 1px 1px;
+	border-color: #CCC;
+	display: inline-block;
+	float: left;
+	padding: 4px 10px;
+	height: 18px;
+	line-height: 18px;
+	-webkit-border-radius: 3px 0 0 3px;
+	-moz-border-radius: 3px 0 0 3px;
+	border-radius: 3px 0 0 3px;
+	text-align: center;
+}
+.calendarInput {
+	position: absolute;
+	visibility: hidden;
+	left: 11px;
+}

app/helpers/admin/item_helper.rb

@@ -12,12 +12,14 @@ module Admin::ItemHelper
       ret << "<ul class='list'>"
       ret << "<li>"
       ret << (link_to node.i18n_variable[I18n.locale], dest)
-      ret << ' | ' << (link_to t('admin.edit'), eval("edit_admin_#{node._type.downcase}_path(node)")) if node._type.eql?('Page')
+      ret << "<div class='quick-edit'>"
-      ret << ' | ' << (link_to t('admin.new_page'), new_admin_page_path(:parent_id => node.id), :class => 'new_page') if node._type.eql?('Page')
+      ret << (link_to t('admin.edit'), eval("edit_admin_#{node._type.downcase}_path(node)")) if node._type.eql?('Page')
-      ret << ' | ' << (link_to t('admin.new_link'), new_admin_link_path(:parent_id => node.id), :class => 'new_link') if node._type.eql?('Page')
+      ret << (link_to t('admin.new_page'), new_admin_page_path(:parent_id => node.id), :class => 'new_page') if node._type.eql?('Page')
-      ret << ' | ' << (link_to t(:delete), eval("delete_admin_#{node._type.downcase}_path(node, :authenticity_token => form_authenticity_token)"), :confirm => t('sure?'), :class => 'delete')
+      ret << (link_to t('admin.new_link'), new_admin_link_path(:parent_id => node.id), :class => 'new_link') if node._type.eql?('Page')
-      ret << render_children(node)
+      ret << (link_to t(:delete), eval("delete_admin_#{node._type.downcase}_path(node, :authenticity_token => form_authenticity_token)"), :confirm => t('sure?'), :class => 'delete')
+      ret << "</div>"
       ret << "</li>"
+      ret << render_children(node)
       ret << "</ul>"
     end
     ret.html_safe
@@ -26,11 +28,9 @@ module Admin::ItemHelper
   def render_children(parent)
     if children = parent.children
       ret = ''
-      ret << "<ul>"
       children.each do |child|
         ret << render_node_and_children(child)
       end
-      ret << "</ul>"
       ret
     end
   end

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

@@ -164,13 +164,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 => "tinymce_textarea" %>
+									<%= f.text_area locale,:style => "width:100%", :class => "tinymce_textarea post-title" %>
 									<% end %>
 								</div>
 
@@ -180,6 +180,11 @@
 						
 					</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">

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>

app/views/layouts/_side_bar.html.erb

@@ -5,10 +5,10 @@
 <%= content_tag :li, :class => active_for_controllers('bulletins', 'tags', 'bulletin_categorys', 'fact_checks') do -%>
 	<%= link_to content_tag(:i, nil, :class => 'icons-announcement') + t('admin.announcement'), panel_announcement_back_end_bulletins_path %>
 	  <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('bulletins', 'tags', 'bulletin_categorys', 'fact_checks')) do -%>
-		<%= content_tag :li, link_to(t('admin.all_articles'), panel_announcement_back_end_bulletins_path), :class => active_for_action('bulletins', 'index') %>
+		<%= content_tag :li, link_to(t('announcement.all_articles'), panel_announcement_back_end_bulletins_path), :class => active_for_action('bulletins', 'index') %>
-		<%= content_tag :li, link_to(t('admin.add_new'), new_panel_announcement_back_end_bulletin_path), :class => active_for_action('bulletins', 'new') %>
+		<%= content_tag :li, link_to(t('announcement.add_new'), new_panel_announcement_back_end_bulletin_path), :class => active_for_action('bulletins', 'new') %>
-		<%= content_tag :li, link_to(t('admin.categories'), panel_announcement_back_end_bulletin_categorys_path), :class => active_for_action('bulletin_categorys', 'index') %>
+		<%= content_tag :li, link_to(t('announcement.categories'), panel_announcement_back_end_bulletin_categorys_path), :class => active_for_action('bulletin_categorys', 'index') %>
-		<%= content_tag :li, link_to(t('admin.tags'), panel_announcement_back_end_tags_path), :class => active_for_action('panel/bulletin/back_end/tags', 'index') %>
+		<%= content_tag :li, link_to(t('announcement.tags'), panel_announcement_back_end_tags_path), :class => active_for_action('panel/bulletin/back_end/tags', 'index') %>
 		<%= content_tag :li, link_to(t('announcement.bulletin.fact_check_setting'), panel_announcement_back_end_fact_checks_setting_path), :class => active_for_action('fact_checks', 'setting')  if (is_manager? rescue nil) %>
 	<% end -%>
 
@@ -41,10 +41,10 @@
 <%= content_tag :li, :class => active_for_controllers('web_links', 'tags', 'web_link_categorys') do -%>
 	<%= link_to content_tag(:i, nil, :class => 'icons-link') + t('admin.link'), panel_web_resource_back_end_web_links_path %>
 	  <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('web_links', 'tags', 'web_link_categorys')) do -%>
-		<%= content_tag :li, link_to(t('admin.all_articles'), panel_web_resource_back_end_web_links_path), :class => active_for_action('web_link', 'index') %>
+		<%= content_tag :li, link_to(t('admin.announcement.all_articles'), panel_web_resource_back_end_web_links_path), :class => active_for_action('web_link', 'index') %>
-		<%= content_tag :li, link_to(t('admin.add_new'), new_panel_web_resource_back_end_web_link_path), :class => active_for_action('web_link', 'new') %>
+		<%= content_tag :li, link_to(t('admin.announcement.add_new'), new_panel_web_resource_back_end_web_link_path), :class => active_for_action('web_link', 'new') %>
-		<%= content_tag :li, link_to(t('admin.categories'), panel_web_resource_back_end_web_link_categorys_path), :class => active_for_action('web_link_categorys', 'index') %>
+		<%= content_tag :li, link_to(t('admin.announcement.categories'), panel_web_resource_back_end_web_link_categorys_path), :class => active_for_action('web_link_categorys', 'index') %>
-		<%= content_tag :li, link_to(t('admin.tags'), panel_web_resource_back_end_tags_path), :class => active_for_action('panel/web_resource/back_end/tags', 'index') %>
+		<%= content_tag :li, link_to(t('admin.announcement.tags'), panel_web_resource_back_end_tags_path), :class => active_for_action('panel/web_resource/back_end/tags', 'index') %>
 	<% end -%>
 <% end -%>
 

app/views/layouts/site_editor.html.erb

@@ -14,7 +14,7 @@
 	<%= csrf_meta_tag %>
 </head>
 <body>
-
+<!--
 	<header id="back_banner_link" class="fixed clear" >
 		<nav id="back_orbit">
 			<span>Orbit Icon</span>
@@ -25,8 +25,9 @@
 			<div class="lang"><%= render 'layouts/lang_menu' %></div>
 		</div>
 	</header>
-	<div id="back_content">
+-->
-		<div id="back_sidebar"><%= yield :sidebar %></div>
+	<div id="main-wrap">
+		<div id="main-sidebar"><%= yield :sidebar %></div>
 		<div class="main"><div id='back_main' class="main2">
 			<%= yield %>
 		</div></div>