Ray's changes in structure

app/assets/javascripts/basic/orbit_js_1.0.1.js

@@ -315,9 +315,9 @@ function openSlide() {
     var $openSlide = $('.open-slide'),
         $pageslideW;
 
-    $(window).width() > 1440 ? $pageslideW = 1024 : $pageslideW = 954;
+    $(window).width() > 1440 ? $pageslideW = 1024 : $pageslideW = 960;
     $(window).resize(function() {
-        $(this).width() > 1440 ? $pageslideW = 1024 : $pageslideW = 954;
+        $(this).width() > 1440 ? $pageslideW = 1024 : $pageslideW = 960;
     })
     $openSlide.each(function() {
         if($(this).hasClass('view-page')) {

app/assets/javascripts/lib/jquery.pageslide.js

@@ -142,6 +142,8 @@
                             });
                         }
                     }
+                    $pageName = $self.parents('.item-title').children('a').text();
+                    $('.page-name').text($pageName);
                 } else if($('.tags-groups').length) {
                     $(this).parents('li').addClass("active").siblings().removeClass("active").parent('ul').siblings().children('li').removeClass("active");
                 } else {

app/assets/stylesheets/basic/global.css.erb

@@ -369,30 +369,78 @@ legend {
 }
 
 /* Edit link in structure */
+.page_content {
+
+}
 .editable {
   position: relative;
   padding: 0px;
   margin: 0px;
   min-height: 50px;
+  width: 100%;
+  height: 100%;
 }
 .edit_link {
-  display: none;
+  position: absolute;
+  left: 2px;
+  right: 2px;
+  top: 2px;
+  bottom: 2px;
+  border: 2px dashed #1769ff;
+  border-radius: 5px;
+  z-index: 1000;
+  opacity: .3;
+  filter: alpha(opacity = 30);
+  background-color: #FFF;
+  -webkit-transition: all .2s linear;
+     -moz-transition: all .2s linear;
+       -o-transition: all .2s linear;
+          transition: all .2s linear;
 }
 .edit_link a {
   position: absolute;
-  z-index: 10;
+  left: 0px;
-  width: 100%;
+  top: 0px;
-  height: 100%;
+  right: 0px;
-  top: 0;
+  bottom: 0px;
-  left: 0;
+  text-indent: -99999px;
-  text-indent: -9999px;
+}
-  background: url(<%= asset_path 'editicon.png' %>) no-repeat center center rgba(255,255,255,.8);
+.edit_link a:before {
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 1);
+  content: "\f044";
-  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 1);
+  font-family: FontAwesome;
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 1);
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  display: block;
+  font-size: 1.5em;
+  width: 24px;
+  height: 24px;
+  margin: -12px 0 0 -12px;
+  text-indent: 0px;
+  opacity: .4;
+  filter: alpha(opacity = 40);
+  -webkit-transition: all .2s linear;
+     -moz-transition: all .2s linear;
+       -o-transition: all .2s linear;
+          transition: all .2s linear;
 }
 .editable:hover .edit_link {
-  display: block;
+  opacity: .8;
+  border: 3px dashed #1769ff;
+  border-radius: 8px;
+  filter: alpha(opacity = 80);
+}
+.editable:hover .edit_link a:before {
+  font-size: 1.8em;
+  width: 28px;
+  height: 28px;
+  margin: -14px 0 0 -14px;
+  opacity: 1;
+  filter: alpha(opacity = 100);
+  -webkit-transition: all .2s linear;
+     -moz-transition: all .2s linear;
+       -o-transition: all .2s linear;
+          transition: all .2s linear;
 }
 
 

app/assets/stylesheets/lib/items.css

@@ -100,7 +100,7 @@
 	content: '';*/
 }
 #items .sortable .navbar .item-title em {
-	display: inline-block;
+	float: right;
 	padding: 0 5px;
 	max-width: 300px;
 	overflow: hidden;

app/assets/stylesheets/lib/pageslide.css

@@ -17,11 +17,15 @@
      -moz-box-shadow: inset 0 0 5px 5px #222;
           box-shadow: inset 0 0 5px 5px #222;
 }
+#pageslide .well {
+  color: #333333;
+}
 #pageslide .content {
   padding: 15px;
 }
 #items #pageslide #view-page .content,
 #items #pageslide #view-page .pane {
+  outline: none;
   padding: 0px;
   margin-top: 57px;
 }
@@ -48,6 +52,9 @@
 #pageslide form {
   margin-bottom: 0;
 }
+#view-page > .content > form {
+  padding: 0 15px 15px;
+}
 #pageslide legend {
   color: #FFFFFF;
   border-bottom: 1px solid #949494;

app/models/item.rb

@@ -4,7 +4,7 @@ class Item
   include Mongoid::Timestamps
   include Mongoid::Tree
   include Mongoid::Tree::Ordering
-  LIST = YAML.load(File.read('config/list.yml'))
+  LIST = YAML.load(File.read("#{Rails.root}/config/list.yml"))
 
   field :name
   field :path

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

@@ -10,6 +10,7 @@
       <span title="<%= t(:link) %>" class="item-type link tip"><i class="icon-link"></i></span>
     <% end %>
     <div class="item-title">
+      <%= content_tag(:em, node.url, class: "muted") if node.class.to_s.eql?('Link') %>
       <%= link_to node.title, "/" + node.path %>
       <div class="item-menu">
         <%= link_to content_tag(:i, nil, class: "icon-eye-open"), eval("admin_#{node.class.to_s.downcase}_path(node)"), class: "view-page open-slide tip", title: t(:view) if node.class.to_s.eql?('Page') %>
@@ -18,7 +19,6 @@
         <%= link_to content_tag(:i, nil, class: "icon-link"), new_admin_link_path(:parent_id => node.id), class: "open-slide tip", title: t(:add_link) if node.class.to_s.eql?('Page') %>
         <%= link_to content_tag(:i, nil, class: "icon-trash"), nil, rel: eval("admin_#{node.class.to_s.downcase}_path(node)"), class: "delete tip", title: t(:delete_) unless node.root? %>
       </div>
-      <%= content_tag(:em, node.url, class: "muted") if node.class.to_s.eql?('Link') %>
     </div>
     <div class="item-info pull-right">
       <% @site_valid_locales.each do |valid_locale| %>

app/views/admin/links/_edit.html.erb

@@ -1,4 +1,4 @@
-<%= form_for @item, url: admin_link_path(@item), remote: true do |f| %>
+<%= form_for @item, url: admin_link_path(@item), remote: true, html: {class: nil} do |f| %>
   <fieldset>
     <legend><%= t('editing.link') %></legend>
     <%= render :partial => "form", :locals => { :f => f } %>

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

@@ -3,8 +3,14 @@
 
 <%= f.hidden_field :parent, :value => (@item.parent.id rescue nil) %>
 
+<<<<<<< Updated upstream
 <%= f.label :name, t(:name) %>
 <%= f.text_field :name, class: 'input-xlarge', placeholder: t(:name) %>
+=======
+<%= f.label :name, content_tag(:i, nil, :class => "icons-star") + t(:name) %>
+<%= f.text_field :name, class: 'input-xlarge', placeholder: t(:name) %>
+<span class="help-block"><%= I18n.t("front_page.name_field_helper") %></span>
+>>>>>>> Stashed changes
 
 <%= f.label :url, t(:url) %>
 <%= f.text_field :url, :class => 'input-xlarge', placeholder: t(:url) %>

app/views/admin/page_parts/_custom_widget_setting.html.erb

@@ -1,4 +1,4 @@
-<div class="style_switch  control-group">
+<div class="style_switch control-group">
   <label class="control-label">
     <%= t("default_widget.select_widget_style") %>
   </label>
@@ -10,11 +10,11 @@
     <% end %>
   </div>
 </div>
-  <% if(@selected[:module_app] && @selected[:module_app].widget_options(@selected[:app_frontend_url])) %>
+<% if(@selected[:module_app] && @selected[:module_app].widget_options(@selected[:app_frontend_url])) %>
-    <div class="style_switch  control-group">
+  <div class="style_switch control-group">
-      <label class="control-label"><%= t("default_widget.select_widget_ext_option") %></label>
+    <label class="control-label"><%= t("default_widget.select_widget_ext_option") %></label>
-      <div class="controls well" >
+    <div class="controls well" >
-        <%= render :partial=> "widget_ext_options" %>  
+      <%= render :partial=> "widget_ext_options" %>  
-      </div>
     </div>
-    <% end %>
+  </div>
+<% end %>

app/views/admin/page_parts/_widget_data_source_category.html.erb

@@ -7,16 +7,14 @@
 
 
 <label  class="control-label"><%= t "default_widget.data_source.category" %></label>
-  <div class="controls"> 
+<p>
-<% if @categories %>
+  <% if @categories %>
-    <fieldset>
+      <%= nil_checkbox_button(object,:category) %>
-        <%= nil_checkbox_button(object,:category) %>
+      <%= content_tag_for(:label, @categories,:class=>"radio") do |category|%>
-        <%= content_tag_for(:label, @categories,:class=>"radio inline") do |category|%>
+        <%= check_box_tag("#{field_name}[category][]", category.id,  category_checked_value(object,category.id),:class=>'select_option' )%>
-          <%= check_box_tag("#{field_name}[category][]", category.id,  category_checked_value(object,category.id),:class=>'select_option' )%>
+        <%= category.title%>
-          <%= category.title%>
+      <% end %>
-        <% end %>
-    </fieldset>
   <% else %>
     <%= t("default_widget.no_support_setting")%>
   <% end %>
-</div>
+</p>

app/views/admin/page_parts/_widget_data_source_tag.html.erb

@@ -7,16 +7,14 @@
 
 
 <label class="control-label"><%= t "default_widget.data_source.tag" %></label>
-<div class="controls">
+<p>
   <% if @categories %>
-    <fieldset>
+      <%= nil_checkbox_button(object,:tag) %>
-        <%= nil_checkbox_button(object,:tag) %>
+      <%= content_tag_for(:label, @tags,:class=>"radio") do |tag|%>
-        <%= content_tag_for(:label, @tags,:class=>"radio inline") do |tag|%>
+        <%= check_box_tag("#{field_name}[tag][]", tag.id,  tag_checked_value(object,tag.id),:class=>'select_option'  ) %>
-          <%= check_box_tag("#{field_name}[tag][]", tag.id,  tag_checked_value(object,tag.id),:class=>'select_option'  ) %>
+        <%= tag.name%>
-          <%= tag.name%>
+      <% end if @tags%>
-        <% end if @tags%>
-    </fieldset>
   <% else %>
     <%= t("default_widget.no_support_setting")%>
   <% end %>
-</div>
+</p>

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

@@ -4,7 +4,7 @@
 <%= f.hidden_field :parent, :value => (@item.parent.id rescue nil) %>
 <%= f.hidden_field :id, :value => (@item.id), :id => "object_id" %>
 
-<%= f.label :name, '*' + t(:name) %>
+<%= f.label :name, content_tag(:i, nil, :class => "icons-star") + t(:name) %>
 <%= f.text_field :name, class: 'input-xlarge', placeholder: t(:name) %>
 <span class="help-block"><%= I18n.t("front_page.name_field_helper") %></span>
 
@@ -87,4 +87,9 @@
         </label>
 		<% end %>
 		<%= hidden_field_tag 'page[enabled_for][]', '' %>
-</p>
+		<!-- <p class="help-block">In addition to freeform text, any HTML5 text-based input appears like so.</p> -->
+	</div>
+</div>
+
+<%=javascript_include_tag "inc/update_cates_and_tags.js" %>
+<%= javascript_include_tag "inc/page_widget_edit_interface.js" %>

config/locales/new_ui.en.yml

@@ -16,6 +16,11 @@ en:
     tag: Editing tag
   file:
     name: File name
+  front_page:
+    name_language: Site Title
+    select_template: Select Template
+    select_themes: Select Themes
+    select_module: Select Module
   language: Language
   login_orbit: Log In to Orbit
   merge: Merge