skylinecms 3.1.0 → 3.2.0

data/app/views/skyline/authentications/new.html.erb

@@ -13,7 +13,7 @@
       </div>
     </div>
     <div id="contentArea">
-      <% form_tag skyline_authentication_path do %>      
+      <%= form_tag skyline_authentication_path do %>      
         <dl class="login panel">
           <dt><span class="content"><%= t(:log_in, :scope => [:authentication,:new]) %></span></dt>
           <dd class="full" id="messageArea"></dd>

data/app/views/skyline/browser/links/_index.html.erb

@@ -4,6 +4,7 @@
       <div class="chrome">
         <ul class="toptabs">
           <% tabs = ["Skyline::MediaFile","Skyline::ReferableUri"] %>
+          <% tabs.unshift "Skyline::Linkable" if Skyline::Linkable.linkables.any? %>
           <% tabs.unshift "Skyline::Page" if Skyline::Configuration.enable_pages %>
           <% tabs.each do |tab| %>
             <li class="<%= "active" if @active_tab == tab %>"><a href="#"><%= t(tab, :scope => [:browser,:tabs]) %></a></li>          
@@ -13,6 +14,7 @@
     </div>
   </div>
   <%= render :partial => "skyline/browser/tabs/pages/index" if Skyline::Configuration.enable_pages %>  
+  <%= render :partial => "skyline/browser/tabs/linkables/index" if Skyline::Linkable.linkables.any? %>  
   <%= render :partial => "skyline/browser/tabs/media_library/index" %>
   <%= render :partial => "skyline/browser/tabs/external_link/index" %>
   <% if params[:common] %>

data/app/views/skyline/browser/tabs/linkables/_index.html.erb

@@ -0,0 +1,29 @@
+<div id="browserLinkables" class="window">
+  <div class="leftPanel scrollable">
+    <input id="browser_linkable_referable_id" type="hidden" name="browser[referable_id]" value="<%= @linkable.andand.id %>">
+    <input id="browser_linkable_referable_type" type="hidden" name="browser[referable_type]" value="<%= @linkable.andand.class.andand.name %>" >
+    <input id="browser_linkable_referable_title" type="hidden" name="browser[referable_title]" value="" >    
+    <input id="browser_linkable_url" type="hidden" name="browser[url]" value="">    
+    
+    <ul class="selectlist" id="browserLinkableLinkables">
+      <% Skyline::Linkable.linkables.each do |linkable| %>
+        <% active = linkable.name == @linkable_type.andand.name %>
+        <li id="browserLinkableLinkables<%= linkable.name %>">
+          <%= link_to linkable.model_name.human(:count => 2), skyline_browser_tabs_linkable_path(linkable.name, :referable_id => params[:referable_id]), :class => (active ? "active" : nil), :remote => true %>
+        </li>
+      <% end %>
+    </ul>		    
+  </div>
+  <div class="rightPanel scrollable" id="browserLinkableContentPanel">
+    <%= render :partial => "skyline/browser/tabs/linkables/show" %>  
+  </div>
+</div>
+<script type="text/javascript" charset="utf-8">  
+  (function(){
+    var mtp = new Skyline.HorizontalLayout("browserLinkables", {height: 200, hidden: true});
+    var lp = mtp.addPanel(mtp.element.getElement(".leftPanel"),{width: 200});
+    mtp.addSplitter();
+    var rp = mtp.addPanel(mtp.element.getElement(".rightPanel"));
+  })();
+
+</script>

data/app/views/skyline/browser/tabs/linkables/_show.html.erb

@@ -0,0 +1,67 @@
+<table class="listing" id="browserLinkableList">
+  <thead>
+    <tr>
+      <th class="icon"></th>
+      <th><%= @linkable_type.human_attribute_name(:title) if @linkable_type %></th>
+    </tr>
+  </thead>
+  <tbody>
+    <% if @linkables.present? %>
+      <% selected_row = nil %>    
+      <% @linkables.each do |linkable| %>
+        <% selected_row = "linkable_#{linkable.id}" if linkable == @linkable %>
+        <tr class="<%= cycle("odd","even") %> <%= "selected" if linkable == @linkable %>" id="linkable_<%= linkable.id %>"
+            data-url = "<%= linkable.url || linkable.id %>",
+            data-referable_id = "<%= linkable.id %>",
+            data-referable_type = "<%= linkable.class.name %>",
+            data-referable_title = "<%= linkable.title %>">
+          <td class="icon center"><%= tick_image(linkable.published?) %></td>
+          <th>
+            <%= linkable.title.blank? ? "&nbsp;" : linkable.title %>
+          </th>
+        </tr>
+      <% end %>
+    <% end %>
+  </tbody>
+</table>
+
+<script type="text/javascript" charset="utf-8">
+  (function(){
+    var f = $('browserLinkableList');
+    var t = new Skyline.Table(f, {draggable: false});
+    <% if selected_row %>
+      t.selectedRow = $('<%= selected_row %>')
+    <% end %>
+
+    t.addEvent("selectRow",function(row,event){
+      event.stop();
+      row.addClass("selected");
+      $('browser_linkable_referable_id').set("value", row.get("data-referable_id"));
+      $('browser_linkable_referable_type').set("value", row.get("data-referable_type"));
+      $('browser_linkable_referable_title').set("value", row.get("data-referable_title"));
+      $('browser_linkable_url').set("value", row.get("data-url"));      
+    });
+          
+    t.addEvent("deselectRow",function(row){
+      row.removeClass("selected");
+    });
+    
+    var bc = $('browserLinkableContentPanel'); 
+    var l = bc.retrieve("skyline.layout");
+
+    if(l){
+      // Cleanup old events
+      l.removeEvents("resize");
+    }
+        
+    // Make sure the contentPanel resizes our table!
+    bc.addComponentEvent("skyline.layout","resize",function(panel,w,h){
+      $('browserLinkableList').retrieve("skyline.table").resize(w, "100%");
+    });    
+    
+    if(l){
+      $('browserLinkableList').retrieve("skyline.table").resize(l.width - l.offsets.width, "100%");
+    }
+    
+  })();
+</script>

data/app/views/skyline/browser/tabs/linkables/show.js.erb

@@ -0,0 +1,4 @@
+document.id("browserLinkableLinkables").getElements("li a").removeClass("active");
+document.id("browserLinkableLinkables<%= @linkable_type.name %>").getElement("a").addClass("active");      
+
+$("browserLinkableContentPanel").replaceHTML('<%=escape_javascript render(:partial => "show") %>');

data/app/views/skyline/browser/tabs/media_library/_index.html.erb

@@ -9,10 +9,10 @@
       </div>
     </div>
   </div>
-  <div id="browserContentPanel" class="contentPanel ">
+  <div id="browserMediaContentPanel" class="contentPanel ">
     <%= render :partial => "skyline/browser/tabs/media_library/media_files/index" %>
   </div>
-  <div id="browserPreviewPanel" class="previewPanel scrollable">
+  <div id="browserMediaPreviewPanel" class="previewPanel scrollable">
     <%= render :partial => "skyline/browser/tabs/media_library/media_files/show" %>      
   </div>
 </div>

data/app/views/skyline/browser/tabs/media_library/media_files/_index.html.erb

@@ -4,7 +4,7 @@
   <input value="<%= @media_file.andand.class.andand.name %>" name="browser[referable_type]" id="browser_media_referable_type" type="hidden"/>
   <input value="<%= @media_file.andand.title %>" name="browser[referable_title]" id="browser_media_referable_title" type="hidden"/>
   
-  <% browser_url = @media_dir && @media_file &&  url_for(:action => :show, :controller => '/skyline/media/data', :name => @media_file.name, :dir_id => @media_dir) %>
+  <% browser_url = @media_dir && @media_file &&  skyline_media_dir_data_path(:name => @media_file.name, :dir_id => @media_dir) %>
   <input value="<%= browser_url %>" name="browser[url]" id="skylineReferableLocation" type="hidden">
   
   <table class="listing files" id="browserFilelist">
@@ -22,7 +22,7 @@
           <% dimen = file.dimension %>
           <% selected_row = "file_#{file.id}" if file == @media_file %>
           <tr class="<%= cycle("odd","even") %> <%= "selected" if file == @media_file %>" id="file_<%= file.id %>" 
-            data-url="<%= url_for(:action => :show, :controller => '/skyline/media/data', :name => file.name, :dir_id => @media_dir) %>"
+            data-url="<%= skyline_media_dir_data_path(:name => file.name, :dir_id => @media_dir) %>"
             data-file_type = "<%= file.file_type %>"
             data-referable_id = "<%= file.id %>"
             data-referable_type = "<%= file.class.name %>"
@@ -49,37 +49,6 @@
 
 <script type="text/javascript" charset="utf-8">
   (function(){
-    // var ul = $('browserFilelist');
-    // ul.addEvent("click", function(ev){
-    //   ev.stop();
-    //   ev.preventDefault();
-    //   
-    //   var t =  $(ev.target);
-    //   var li = (t.get("tag") == "li" ? t : t.getParents("li")[0]);
-    //   if(li){
-    //     var a = li.getElement("a");        
-    //     ul.getElements('li.selected').removeClass('selected'); 
-    //     li.addClass('selected');
-    //     
-    //     $('browser_media_file_type').set("value", a.get("data-file_type"));
-    //     $('browser_media_referable_id').set("value", a.get("data-referable_id"));
-    //     $('browser_media_referable_type').set("value", a.get("data-referable_type"));
-    //     $('browser_media_referable_title').set("value", a.get("data-referable_title"));
-    //     $('skylineReferableLocation').set("value", a.get("data-url"));
-    //     
-    //     if($('browserImageWidth')){
-    //       $('browserImageWidth').set("value", a.get("data-image_width"));
-    //     };
-    //     if($('browserImageHeight')){
-    //       $('browserImageHeight').set("value", a.get("data-image_height"));
-    //     };
-    //     
-    //     new Request({
-    //       url: a.get("href"),
-    //       method: "get"
-    //     }).send();        
-    //   }
-    // })
     
     var f = $('browserFilelist');
     var t = new Skyline.Table(f, {draggable: false});
@@ -104,14 +73,14 @@
       };      
       
       var l = row.getElement("a");
-      (new Request()).get(l.getProperty("href"));
+      (new Request({url : l.getProperty("href")})).get();
     });
           
     t.addEvent("deselectRow",function(row){
       row.removeClass("selected");
     });
     
-    var bc = $('browserContentPanel');
+    var bc = $('browserMediaContentPanel');
  
     var l = bc.retrieve("skyline.layout");
 

data/app/views/skyline/browser/tabs/media_library/media_files/_show.html.erb

@@ -4,9 +4,7 @@
       <dl class="advanced">
         <dt><%=t(:preview, :scope => [:media, :files, :edit])%></dt>
         <dd>
-          <%= image_tag(url_for(
-                :action => "show", 
-                :controller => "/skyline/media/data", 
+          <%= image_tag(skyline_media_dir_data_with_size_path(
                 :dir_id => @media_dir,
                 :name => @media_file.name,
                 :size => '100x100'), 

data/app/views/skyline/browser/tabs/media_library/media_files/index.js.erb

@@ -0,0 +1 @@
+$("browserMediaContentPanel").replaceHTML('<%=escape_javascript render(:partial => "index") %>');

data/app/views/skyline/browser/tabs/media_library/media_files/show.js.erb

@@ -0,0 +1 @@
+$("browserFileInfo").replace('<%=escape_javascript render(:partial => "show") %>');

data/app/views/skyline/browser/tabs/pages/_index.html.erb

@@ -11,7 +11,7 @@
     <%=hidden_field_tag "browser[referable_title]", @page && @page.default_variant_data.andand.navigation_title || "", :id => "browser_page_referable_title" %>
     <input id="browser_page_url" type="hidden" name="browser[url]" value="<%= @page && @page.id %>">    
   </div>
-  <iframe class="previewPanel preview" src="<%= @page && skyline_article_article_version_url(@page, @page.default_variant) || "#"  %>"></iframe>
+  <iframe class="previewPanel preview" src="<%= @page && skyline_article_article_version_url(@page, @page.default_variant) || "javascript:''"  %>"></iframe>
 </div>
 <script type="text/javascript" charset="utf-8">  
   var f = function(){

data/app/views/skyline/content/_add.rhtml

@@ -13,7 +13,12 @@
 
 <% if klass.importable? %>
   <div class="button">
-    <%= link_to_remote button_text(:import), { :url => object_url(record,{:action => "import"}.update(url_suffix)), :method => :get }, :class => "button small" %>
+    <%= link_to(
+          button_text(:import), 
+          object_url(record,{:action => "import"}.update(url_suffix)),
+          :remote => true,
+          :method => :get, 
+          :class => "button small") %>
   </div>
 <% end %>
 

data/app/views/skyline/content/_filter.rhtml

@@ -1,4 +1,4 @@
-<% form_tag( {},:method => :get, :id => "filter") do %>
+<%= form_tag( {},:method => :get, :id => "filter") do %>
 <% fields = stack.klass.filterable_fields %>
 	<table>
 		<thead>

data/app/views/skyline/content/_import.html.erb

@@ -1,4 +1,4 @@
-<% form_tag url, :multipart => true do %>
+<%= form_tag url, :multipart => true do %>
   <%= hidden_field_tag "return_to", params[:return_to] %>
   <%= hidden_field_tag "klass", params[:klass] %>
   <div class="content">

data/app/views/skyline/content/_index.html.erb

@@ -1,5 +1,5 @@
 <dt id="leftContentHeaderPanel" class="<%= local_assigns[:active] ? "active" : "" %>">
-   <%= link_to_remote t(:default_group, :scope => [:content]), :url => {:controller => "skyline/content", :action => "index"}, :method => :get, :html => {:class => "content"}  %>
+  <span class="content"><%= t(:default_group, :scope => [:content]) %></span>
 </dt>
 <dd id="leftContentContentPanel">
   
@@ -18,7 +18,7 @@
 			      end
   			  %>
   				<li>
-  					 <%= link_to klass.human_name(:count => 2), link, :class => (active ? "active" : nil) %>
+  					 <%= link_to klass.model_name.human(:count => 2), link, :class => (active ? "active" : nil) %>
   				</li>
   			<% end %>
   		</ul>    

data/app/views/skyline/content/_meta.html.erb

@@ -15,7 +15,7 @@
   <div class="section">
     <div class="head"><%= t(:meta_information, :scope => [:content, :edit]) %></div>
     <div class="body">        
-      <% tags = @element.available_tags.collect{|tag| content_tag("li", tag.tag)}.join %>
+      <% tags = @element.available_tags.collect{|tag| content_tag("li", tag.tag)} %>
       <% raw_tags_field = Skyline::Content::MetaData::Field.new(:name => 'raw_tags', :owner => @element.class) %>
       
       <dl class="tagselector">
@@ -28,7 +28,7 @@
         <dd class="tags">
           <% if tags.any? %>
             <ul id="taglist">
-              <%= tags %>
+              <%= tags.join.html_safe %>
             </ul>
           <% else %>
             <%= t(:no_tags_available, :scope => [:content,:edit]) %>

data/app/views/skyline/content/create.rhtml

@@ -3,7 +3,7 @@
 <% end %>
 
 <div class="content editcontent">        
-  <% content_form :element, {:action => "create", :multipart => true, :submit_value => "save"} do %>
+  <%= content_form :element, {:action => "create", :multipart => true, :submit_value => "save"} do %>
     <%= render :partial => "meta" %>
   <% end %>
 </div>

data/app/views/skyline/content/edit.rhtml

@@ -3,7 +3,7 @@
 <% end %>
 
 <div class="content editcontent">        
-  <% content_form :element, {:action => "edit", :multipart => true, :submit_value => "save"} do %>
+  <%= content_form :element, {:action => "edit", :multipart => true, :submit_value => "save"} do %>
     <%= render :partial => "meta" %>
   <% end %>    
 </div>

data/app/views/skyline/content/editors/editable_list/new.js.erb

@@ -0,0 +1,2 @@
+<% editor = Skyline::Editors::EditableList.new(["element"],@source_object,@source_klass.fields[params[:association].to_sym],@template) %>
+$("<%= editor.js_object_name %>").append("bottom", "<%= escape_javascript editor.render_row(@object) %>");

data/app/views/skyline/content/editors/joinable_list/_add.html.erb

@@ -1,13 +1,20 @@
 <div class="add">
-<%= link_to_remote t(:add_more, :scope => [:content], :class => target_class.plural_name), 
-          {:url => {:controller => "skyline/content/editors/joinable_list", 
-                   :action => "index", 
-                   :source_type => source_object.class.to_s.demodulize.underscore, 
-                   :source_id => source_object,
-                   :association => association},
-					:loading => "toggle_spin('element_skyline_#{association}_add_more','#{t(:loading, :scope => [:content, :global])}')",
-					:complete => "toggle_spin('element_skyline_#{association}_add_more')"}, 
-				:class => "add",
-				:id => "element_skyline_#{association}_add_more"
+<%= link_to( 
+      t(:add_more, :scope => [:content], :class => target_class.plural_name), 
+      {
+        :controller => "skyline/content/editors/joinable_list", 
+        :action => "index", 
+        :source_type => source_object.class.to_s.demodulize.underscore, 
+        :source_id => source_object,
+        :association => association
+      },
+      :remote => true,
+			:loading => "toggle_spin('element_skyline_#{association}_add_more','#{t(:loading, :scope => [:content, :global])}')",
+			:complete => "toggle_spin('element_skyline_#{association}_add_more')", 
+			:class => "add",
+			:id => "element_skyline_#{association}_add_more"
+			)
+			
+	 #TODO - link_to :remote => true,  has not been tested 
  %>
 </div>

data/app/views/skyline/content/editors/joinable_list/_list.html.erb

@@ -1,6 +1,12 @@
 <div class="browser">
 <h4>
-	<%= link_to_remote t(:close_window, :scope => [:content, :global]),{:url => {:action => "cancel"}},:class => "cancel" %>
+	<%= link_to(
+	      t(:close_window, :scope => [:content, :global]),
+	      {:action => "cancel"},
+	      :remote => true,
+	      :class => "cancel")
+	      #TODO - link_to :remote => true,  has not been tested 
+  %>
 	<%= t(:add_a_to_b, :scope => [:content, :edit], :a => @target_klass.plural_name.capitalize, :b => @source_klass.singular_name) %>
 </h4>
 <% if @target_klass.filterable? %>
@@ -49,19 +55,29 @@
 			<%= h @title_field.value(obj) %>
 		</th>
 		<td class="right">
-			<%= link_to_remote t(:add_to, :scope => [:content, :editors, :joinable_list], :class => @source_klass.singular_name), {
-					:url => {:action => "new", :target_id => obj.id},
-					:with => "'add_multiple=' + $('element_skyline_#{params[:association]}_add_multiple').checked",
-					:loading => "toggle_spin('element_skyline_#{params[:association]}_add_#{obj.id}','#{t(:adding, :scope => [:content, :editors, :joinable_list], :class => @target_klass.singular_name.capitalize)}');",
-					:complete => "toggle_spin('element_skyline_#{params[:association]}_add_#{obj.id}')"
-					}, :class => "add", :id => "element_skyline_#{params[:association]}_add_#{obj.id}" %>			
+			<%= link_to( 
+			      t(:add_to, :scope => [:content, :editors, :joinable_list], :class => @source_klass.singular_name), 
+					  {:action => "new", :target_id => obj.id},
+					  :remote => true,
+  					:with => "'add_multiple=' + $('element_skyline_#{params[:association]}_add_multiple').checked",
+  					:loading => "toggle_spin('element_skyline_#{params[:association]}_add_#{obj.id}','#{t(:adding, :scope => [:content, :editors, :joinable_list], :class => @target_klass.singular_name.capitalize)}');",
+  					:complete => "toggle_spin('element_skyline_#{params[:association]}_add_#{obj.id}')",
+					  :class => "add", :id => "element_skyline_#{params[:association]}_add_#{obj.id}") 
+					#TODO - link_to :remote => true,  has not been tested 
+			%>			
 		</td>
 	</tr>
 	<% end %>
 </table>
 </div>
 <div class="bar bottom">
-	<%= link_to_remote t(:close_window, :scope => [:content, :global]),{:url => {:action => "cancel"}},:class => "cancel" %>	
+	<%= link_to(
+	      t(:close_window, :scope => [:content, :global]),
+	      {:action => "cancel"},
+	      :remote => true,
+	      :class => "cancel")
+	      #TODO - link_to :remote => true,  has not been tested 
+  %>	
 	<label for="<%= "element_skyline_#{params[:association]}_add_multiple" %>">
 		<%= check_box_tag :add_multiple, "1", params[:add_multiple], :id => "element_skyline_#{params[:association]}_add_multiple", :class => "checkbox" %> <%= t(:add_multiple, :scope => [:content, :edit]) %>
 	</label>

data/app/views/skyline/content/editors/joinable_list/cancel.js.erb

@@ -0,0 +1 @@
+$("element_<%= params[:association] %>_browser").replaceHTML(<%= escape_javascript render(:partial => "add", :locals => {:source_object => @source_object,:target_class => @target_klass,:association => @assoc.name}) %>);        

data/app/views/skyline/content/editors/joinable_list/index.js.erb

@@ -0,0 +1 @@
+$("element_<%= params[:association] %>_browser").replaceHTML(<%= escape_javascript render(:partial => "list") %>);        

data/app/views/skyline/content/editors/joinable_list/new.js.erb

@@ -0,0 +1,5 @@
+<% editor = Skyline::Editors::JoinableList.new(["element"],@source_object,@source_klass.fields[params[:association].to_sym],@template) %>
+$("<%= editor.js_object_name %>").append("bottom", "<%= escape_javascript editor.render_row(@object) %>");
+<% if params[:add_multiple] != "true" %>
+  $("element_<%= params[:association] %>_browser").replaceHTML(<%= escape_javascript render(:partial => "add", :locals => {:source_object => @source_object,:target_class => @target_klass,:association => @assoc.name}) %>);        
+<% end %>

data/app/views/skyline/content/field.js.erb

@@ -0,0 +1,2 @@
+var id = "<%= input_id("field","element",params[:field]) %>";
+$(id).replace("<%= escape_javascript content_field(@element.class, 'element', @element.class.fields[params[:field].to_sym] || Field.new(:name => params[:field]), @element) %>")

data/app/views/skyline/content/import.js.erb

@@ -0,0 +1,4 @@
+<%= dialog(
+      t(:dialog_title, :scope => [:content, :import]), 
+      :partial => "import", 
+      :locals => {:url => @url, :klass => @klass},  :width => 400) %>

data/app/views/skyline/content/order.js.erb

@@ -0,0 +1,6 @@
+<% if @elements %>
+  $("contentEditPanel").replaceHTML(<%= escape_javascript presenter_for(@elements,stack.klass) %>)
+  $('contentEditPanel').retrieve('skyline.layout').setup();
+<% else %>
+  Application.addOddEven("<%= stack.klass.name %>Listing", "tbody tr")
+<% end %>