Group fix and mce header

cykod · Sep 13, 2010 · 808417e · 808417e
1 parent 3610f89
commit 808417e
Show file tree

Hide file tree

Showing 5 changed files with 99 additions and 7 deletions.
diff --git a/app/views/layouts/manage_mce.rhtml b/app/views/layouts/manage_mce.rhtml
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
 <head>
-  <%= render :partial => '/application/header' %>
+  <%= render :partial => '/application/header_mce' %>
 
 <script>
   MCE_Popup = {

diff --git a/app/views/members/_note.html.erb b/app/views/members/_note.html.erb
@@ -1,8 +1,8 @@
-<div id="user_note" class='cms_form admin_form' style='width:650px;'>
+<div id="user_note" class='cms_form admin_form' style='width:680px;'>
 <div align="right"><a href="javascript:void(0);" onclick="RedBox.close();">[x] close</a></div>
 <h3><%= @user.name %></h3>
 
-<div class='admin_content' style='width:315px; padding-right:10px; float:left;'>
+<div style='width:315px; padding-right:10px; float:left;'>
 <% stat_view do |t| -%>
   <%= t.raw 'First Name'.t,  @user.first_name %>
   <%= t.raw 'Last Name'.t,  @user.last_name %>
@@ -21,7 +21,7 @@
 
 </div>
 
-<div class="admin_content" style='width:325px; float:left;'>
+<div style='width:325px; float:left;'>
 
 <% remote_cms_form_for :note, @note, :update => 'RB_window' do |f| %>
   <%= f.text_area :note, :rows => 3, :vertical => true, :label => 'Note'.t %>

diff --git a/app/views/structure/_group_element_info.rhtml b/app/views/structure/_group_element_info.rhtml
@@ -23,7 +23,7 @@ GroupEditor= {
 
 </script><% if permit?('editor_structure') %>
 <ul class='page_detail_buttons'>
-  <li class='icon'><a href='javascript:void(0);'  title='<%= vh 'Delete Group'.t%>' onclick='StructureEditor.nodeDelete(<%= @node.id %>,"<%= jh "Are you sure you want to delete this group and all it\'s sub-pages?" .t %>");'><%= image_tag(theme_src('icons/header_actions/delete_page.png')) %></a></li>
+  <li class='icon'><a href='javascript:void(0);'  title='<%= vh 'Delete Group'.t%>' onclick='StructureEditor.nodeDelete(<%= @node.id %>,"<%= jvh "Are you sure you want to delete this group and all it\'s sub-pages?" .t %>");'><%= image_tag(theme_src('icons/header_actions/delete_page.png')) %></a></li>
 </ul>  
 <% end -%>
 

diff --git a/app/views/structure/_path.rhtml b/app/views/structure/_path.rhtml
@@ -41,10 +41,9 @@
    	node_title_click = "StructureEditor.groupPopup('#{path.id}')"
    end
  -%>
-   
 
 <% path.site_node_modifiers.each do |mod| -%>
-   <% if mod.modifier_type  != 'page' -%>
+   <% if mod.modifier_type.to_s  != 'page' -%>
      <% if @display_modifiers == 'show'  -%>
         <%= render :partial => 'site_node_modifier', :locals => { :mod => mod } %>
     <% end -%>

diff --git a/public/themes/standard/stylesheets/admin_framework.css b/public/themes/standard/stylesheets/admin_framework.css
@@ -211,6 +211,7 @@ hr { clear:both; border:0px; color:white; background-color:white; height:10px; }
   .module_node { background:url(../images/icons/site_tree.gif) -68px 0px no-repeat; }
   .redirect_node { background:url(../images/icons/site_tree.gif) -85px 0px no-repeat; }
   .document_node { background:url(../images/icons/site_tree.gif) -135px no-repeat; }
+  .group_node { background:url(../images/icons/site_tree.gif) -152px 0px no-repeat; }
 
   .framework_modifier { background:url(../images/icons/site_tree.gif) 0px 0px no-repeat; }
   .template_modifier{ background:url(../images/icons/site_tree.gif) -17px 0px no-repeat; }
@@ -1029,3 +1030,95 @@ table.display_table td.field {
 .visitor_container .heading .selected {
    background-color:#f3f0e0;
 }
+
+
+
+
+ul.sortable_list_remove {
+ position:relative;
+ display:block;	
+ width:200px;
+ border:1px solid #000000;
+ margin:10px 0;
+ padding:5px;
+ height:30px;
+ background-color:#000000;
+
+}
+
+ul.horizontal_sortable {
+  position:relative;
+  list-style: none;
+  display:block;	
+  margin:0px 0px;
+  padding:0px;
+  background-color:#CCCCCC;
+
+}
+
+ul.horizontal_sortable li {
+	display:block;
+	list-style: none;
+	cursor:move;
+	float:left;
+	background-color:#CCCCCC;
+	margin: 0 2px 0 0;
+	padding: 4px;
+	width:125px;
+	overflow:hidden;
+	color:#000000;
+}
+
+
+ul.horizontal_sortable_example {
+  position:relative;
+  list-style: none;
+  display:block;	
+  margin:0px 0px;
+  padding:0px;
+  background-color:#CCCCFF;
+
+}
+
+ul.horizontal_sortable_example li {
+	display:block;
+	list-style: none;
+	float:left;
+	background-color:#CCCCFF;
+	border-right:2px #FFFFFF solid;
+	margin: 0;
+	padding: 4px;
+	width:125px;
+	overflow:hidden;
+	color:#000000;
+  text-align:center;
+}
+
+ul.horizontal_sortable_example li.last {
+	border:0px;
+}
+
+/* Designs Styles */
+
+.style_display {
+ margin:5px; 
+ padding:5px;
+ border:1px solid #000000;
+ width:300px; 
+ height:420px; 
+ overflow:auto; 
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+}
+
+.template_style {
+ margin:3px;
+ border-bottom:1px solid #CCCCCC;
+ padding:4px;
+ cursor:pointer;
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+}
+
+
+