skylinecms 3.0.8 → 3.1.0

data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/utils/editable_selects.js

@@ -1,10 +1,11 @@
 /**
- * $Id: editable_selects.js 867 2008-06-09 20:33:40Z spocke $
+ * editable_selects.js
  *
- * Makes select boxes editable.
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
  *
- * @author Moxiecode
- * @copyright Copyright � 2004-2008, Moxiecode Systems AB, All rights reserved.
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
  */
 
 var TinyMCE_EditableSelects = {

data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/utils/form_utils.js

@@ -1,10 +1,11 @@
 /**
- * $Id: form_utils.js 996 2009-02-06 17:32:20Z spocke $
+ * form_utils.js
  *
- * Various form utilitiy functions.
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
  *
- * @author Moxiecode
- * @copyright Copyright � 2004-2008, Moxiecode Systems AB, All rights reserved.
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
  */
 
 var themeBaseURL = tinyMCEPopup.editor.baseURI.toAbsolute('themes/' + tinyMCEPopup.getParam("theme"));
@@ -92,7 +93,7 @@ function selectByValue(form_obj, field_name, value, add_custom, ignore_case) {
 function getSelectValue(form_obj, field_name) {
 	var elm = form_obj.elements[field_name];
 
-	if (elm == null || elm.options == null)
+	if (elm == null || elm.options == null || elm.selectedIndex === -1)
 		return "";
 
 	return elm.options[elm.selectedIndex].value;

data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/utils/mctabs.js

@@ -1,10 +1,11 @@
 /**
- * $Id: mctabs.js 758 2008-03-30 13:53:29Z spocke $
+ * mctabs.js
  *
- * Moxiecode DHTML Tabs script.
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
  *
- * @author Moxiecode
- * @copyright Copyright � 2004-2008, Moxiecode Systems AB, All rights reserved.
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
  */
 
 function MCTabs() {

data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/utils/validate.js

@@ -1,10 +1,11 @@
 /**
- * $Id: validate.js 758 2008-03-30 13:53:29Z spocke $
+ * validate.js
  *
- * Various form validation methods.
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
  *
- * @author Moxiecode
- * @copyright Copyright � 2004-2008, Moxiecode Systems AB, All rights reserved.
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
  */
 
 /**

data/public/skyline/javascripts/src/skyline.js

@@ -1,6 +1,7 @@
 //= require <skyline>
 // 
 //= require <utils>
+//= require <events>
 //= require <drag>
 //= require <layout>
 //= require <tree>
@@ -13,4 +14,5 @@
 //= require <sortable>
 //= require <hover_select>
 //= require <field_replicator>
-//= require <menu>
+//= require <menu>
+//= require <table>

data/public/skyline/javascripts/src/user_preferences.js

@@ -0,0 +1,49 @@
+/* 
+  Class: Application.UserPreferences
+  The UerPreferences sets a cookie with the preferences and checks if the cookie ddoes not exceed 4kb.
+  If the cookie is too big then an Ajax request is made to store the preference. The stored userpreference cookie
+  is sent with the request and handled in the middleware
+  
+  Configuration:
+  url - The URL to send AJAX request to (MUST BE SET!).
+*/
+Application.UserPreferences = {  
+  url : "",
+  userPreferences : $H({"_delete" : []}),
+    
+  set: function(key, value){
+    if (value == "_delete") {
+      this.userPreferences.erase(key);
+      this.userPreferences["_delete"].include(key);
+    } else {
+      this.userPreferences[key] = value;
+      this.userPreferences["_delete"].erase(key);
+    }
+      
+    var cookie_value = JSON.encode(this.userPreferences);
+    
+    if (cookie_value.length > 4096) {
+      if (value == "_delete") {
+        this.userPreferences["_delete"].erase(key);
+      } else {
+        this.userPreferences.erase(key);
+      }
+      
+      Cookie.write("skyline_up", JSON.encode(this.userPreferences), {path: "/"});
+      
+      var new_preference = new Hash();
+      new_preference[key] = value;
+      var cookieRequest = new Request.JSON({
+                            url: this.Url,
+                            onSuccess: function(up){
+                              this.userPreferences.empty();
+                            }.bind(this)
+                          }).post({'skyline_up': JSON.encode(new_preference)});
+    } else {
+      Cookie.write("skyline_up", cookie_value, {path: "/"});
+    }
+  },
+  remove : function(key){
+    this.set(key, "_delete");
+  }
+};

data/public/skyline/stylesheets/general.css

@@ -19,7 +19,7 @@ body{
 
 #mainnavigation{
   position: relative;
-  border-bottom: 5px solid #fff;  
+  border-bottom: 1px solid #fff;  
   padding-top: 3px;
   background: url(../images/backgrounds/mainnavigation.gif) 0 0 repeat-x;
 }
@@ -222,11 +222,9 @@ body.login .subfooter{
 div.splitter div{
   z-index: 2;
   height: 100%;
-  width: 2px;  
-  border-left: 1px solid #e7e7e7;
-  border-right: 1px solid #9c9c9c;
-  background:  #bfbfbf 50% 50% no-repeat;
-  cursor: move;
+  width: 1px;  
+  background: #000;
+  cursor: col-resize;
 }
 
 .splitter.vertical div{
@@ -235,21 +233,34 @@ div.splitter div{
   border-bottom: 1px solid #000;              
   height: 2px;
   width: 100%;
+  cursor: row-resize;
 }
 
 .splitter{
-  overflow: hidden;
-  background: #f00;
+  width: 1px;
+  overflow: visible;
 }
 
 /* ========================== */
 /* = Skyline.Panel (header) = */
 /* ========================== */
 
-dl.panel dt{
+dl.panel dt,
+dt.panel{
   background: url(../images/backgrounds/panel-dt.gif) 0 50% repeat-x;
   cursor: pointer;
 }
+
+dl.panel dt .button,
+dl.panel dt .menubutton{
+  visibility: hidden;
+}
+
+dl.panel dt.active .button,
+dl.panel dt.active .menubutton{
+  visibility: inherit;
+}
+
 dl.panel dt.active{
   cursor: default;
 }
@@ -258,12 +269,16 @@ dl.panel dl dt{
   background :none;
 }
 
+dt.panel .content,
 dl.panel dt .content{
   display: block; 
-  border-top: 1px solid #bfbfbf;  
+  border-top: 1px solid #c6c6c6;  
   border-bottom: 1px solid #999;
   padding: 5px 10px;
   font-weight: bold;
+  word-wrap: break-word; 
+/*  overflow: hidden;*/
+  min-height: 18px;
 }
 
 dl.panel dt a.content {
@@ -274,13 +289,18 @@ dl.panel dt a.content:active{
   outline: none;
 }
 
-dl.panel dd .content,
+dl.panel > dd,
 .dialog .content{
   padding: 10px;
 }
 
+dl.panel > dd.full{
+  padding: 0;
+}
+
 dl.panel dd.footer,
 .footerPanel{
+  padding: 0;
   background: url(../images/backgrounds/panel-footer.gif) 0 0 #969697 repeat-x;  
 }
 
@@ -304,8 +324,20 @@ dl.panel dd .divided{
   border-bottom: 1px solid #bbb;
 }
 
-dl.panel dd.meta{
-  background: #EDEDED;
+dl.panel dd.meta,
+div.leftPanel,
+div.previewPanel,
+#metaPanel,
+#metaPanel dl.panel dd,
+#leftPanel,
+#leftPanel .tree,
+#leftPanel .tree ul,
+#leftPanel .tree ul li.last,
+.leftPanel .tree,
+.leftPanel .tree ul,
+.leftPanel .tree ul li.last{
+/*  background-color: #EDEDED;*/
+  background-color: #f2f2f2;
 }
 
 dl.panel dt .content.file,
@@ -332,6 +364,32 @@ dl.panel dt .menubutton dt .toggle{
   line-height: 13px;
 }
 
+dl.panel dt .right, 
+dt.panel .right {
+  float: right;
+}
+
+/* =================== */
+/* = Specific panels = */
+/* =================== */
+
+.dialog .leftPanel,
+#leftPanel dd {
+  padding: 0 0 5px;
+/*  padding :0;*/
+}
+
+.dialog .leftPanel .content,
+#leftPanel dd .content {
+  height: 100%;
+  padding: 5px 5px 0px 5px;
+}
+
+#contentBodyPanel,
+#contentPreviewPanel{
+  padding: 0;
+}
+
 /* ======================= */
 /* = Skyline.TagSelector = */
 /* ======================= */
@@ -376,8 +434,6 @@ dl.tagselector dd.tags li.selected{
 
 .innerpanel{
   border-bottom: 1px solid #999;
-  border-left: 1px solid #fff;
-  border-right: 1px solid #666;
 }
 
 .innerpanel .body,
@@ -386,14 +442,6 @@ dl.tagselector dd.tags li.selected{
   padding: 10px;
 }
 
-.innerpanel .panelBody{
-  display: none;
-}
-
-.innerpanel.active .panelBody{
-  display: block;
-}
-
 .innerpanel .head{
   font-weight: bold;
   background: url(../images/backgrounds/panel-head.gif) #009dff top left repeat-x;
@@ -435,6 +483,7 @@ form.upload ul.files{
   padding: 5px;
   background: #fff;
   border: 1px solid #ccc;
+  margin: 5px 0px;
 }
 
 form.upload ul.files li .info{
@@ -453,7 +502,16 @@ form.upload .status{
 form.upload ul.files li.success { background-image: url(../images/icons/file-success.gif);   }
 form.upload ul.files li.failed  { background-image: url(../images/icons/file-failed.gif); }
 
-
+form.upload ul.files a.remove {
+  margin-left: 10px;
+  overflow: hidden;
+  text-indent: -1000px;
+  width: 14px;
+  height: 14px;
+  background: url(../images/buttons/section-delete.gif) 0 50% no-repeat;
+  vertical-align: middle;
+  display: inline-block;
+}
 
 /* ================ */
 /* = Skyline.Tree = */
@@ -466,6 +524,11 @@ form.upload ul.files li.failed  { background-image: url(../images/icons/file-fai
   padding: 3px;
 }
 
+.content .tree{
+  font-size: 1em;
+}
+
+dt.panel .content:after,
 dl.panel dt .content:after,
 #mainnavigation:after,
 ul.files:after,
@@ -508,14 +571,10 @@ ul.toptabs:after,
   margin-left: 0;
 }
 
-.tree ul li.droppable.inside a{
+.tree ul li.drop > a{
   background-color: #d0d0d0;
 }
 
-.tree ul li.droppable.inside li a{
-  background-color: #fff;
-}
-
 .tree ul li a{
   color: #000;
 }
@@ -537,6 +596,7 @@ ul.toptabs:after,
   background-position: 2px 0px;
 }
 
+
 /* Pages tree*/
 .pages.tree ul li a span{
   padding: 2px 3px 2px 20px;  
@@ -966,7 +1026,7 @@ div.progressbar .bar{
 }
 
 #messageArea .messages{
-  padding-bottom: 3px;
+  padding-bottom: 0px;
   border-bottom: 0 none;
 }
 
@@ -1043,6 +1103,7 @@ ul.links li{
   padding: 1px 5px 1px 1px;
 }
 
+table.files .file,
 form.upload ul.files li,
 li.draggableFile .file,
 ul.files .file {
@@ -1053,6 +1114,7 @@ ul.files .file {
   background-image: url(../images/icons/default.gif);  
 }
 
+table.files tbody th a,
 ul.files li a{
   color: #000;  
   padding: 0 2px;
@@ -1069,18 +1131,18 @@ ul.files li.selected a{
   color: #fff;
 }
 
-.excel div.relatesTo span.referable_title, ul.files .excel      .file { background-image: url(../images/icons/excel.gif); }
-.image div.relatesTo span.referable_title, ul.files .image      .file { background-image: url(../images/icons/image.gif); }
-.pdf div.relatesTo span.referable_title, ul.files .pdf        .file { background-image: url(../images/icons/pdf.gif); }
-.text div.relatesTo span.referable_title, ul.files .text       .file { background-image: url(../images/icons/text.gif); }
-.compressed div.relatesTo span.referable_title, ul.files .compressed .file { background-image: url(../images/icons/compressed.gif); }
-.word div.relatesTo span.referable_title, ul.files .word       .file { background-image: url(../images/icons/word.gif); }
-.html div.relatesTo span.referable_title, ul.files .html       .file { background-image: url(../images/icons/html.gif); }
-.powerpoint div.relatesTo span.referable_title, ul.files .powerpoint .file { background-image: url(../images/icons/powerpoint.gif); }
-.executable div.relatesTo span.referable_title, ul.files .executable .file { background-image: url(../images/icons/executable.gif); }
-.audio div.relatesTo span.referable_title, ul.files .audio      .file { background-image: url(../images/icons/audio.gif); }
-.video div.relatesTo span.referable_title, ul.files .video      .file { background-image: url(../images/icons/video.gif); }
-.flash div.relatesTo span.referable_title, ul.files .flash      .file { background-image: url(../images/icons/flash.gif); }
+.excel div.relatesTo span.referable_title,      ul.files .excel      .file, table.files .file.excel { background-image: url(../images/icons/excel.gif); }
+.image div.relatesTo span.referable_title,      ul.files .image      .file, table.files .file.image { background-image: url(../images/icons/image.gif); }
+.pdf div.relatesTo span.referable_title,        ul.files .pdf        .file, table.files .file.pdf { background-image: url(../images/icons/pdf.gif); }
+.text div.relatesTo span.referable_title,       ul.files .text       .file, table.files .file.text { background-image: url(../images/icons/text.gif); }
+.compressed div.relatesTo span.referable_title, ul.files .compressed .file, table.files .file.compressed { background-image: url(../images/icons/compressed.gif); }
+.word div.relatesTo span.referable_title,       ul.files .word       .file, table.files .file.word { background-image: url(../images/icons/word.gif); }
+.html div.relatesTo span.referable_title,       ul.files .html       .file, table.files .file.html { background-image: url(../images/icons/html.gif); }
+.powerpoint div.relatesTo span.referable_title, ul.files .powerpoint .file, table.files .file.powerpoint { background-image: url(../images/icons/powerpoint.gif); }
+.executable div.relatesTo span.referable_title, ul.files .executable .file, table.files .file.executable { background-image: url(../images/icons/executable.gif); }
+.audio div.relatesTo span.referable_title,      ul.files .audio      .file, table.files .file.audio { background-image: url(../images/icons/audio.gif); }
+.video div.relatesTo span.referable_title,      ul.files .video      .file, table.files .file.video { background-image: url(../images/icons/video.gif); }
+.flash div.relatesTo span.referable_title,      ul.files .flash      .file, table.files .file.flash { background-image: url(../images/icons/flash.gif); }
 
 /* ==================== */
 /* = Definition lists = */
@@ -1660,7 +1722,7 @@ div.section{
 }
 
 li.active .section{
-  border: 1px solid #bbb;
+  border: 1px solid #000;
 }
 
 .section .head{
@@ -1850,12 +1912,18 @@ table.listing{
 
 table.listing td,
 table.listing th{
-  padding: 2px 5px;
+  padding: 5px;
+}
+
+table.listing tr td:first-child,
+table.listing tr th:first-child{
+  padding-left: 10px;
 }
 
 table.listing thead td,
 table.listing thead th{
-  border-bottom: 1px solid #000;
+  border-bottom: 1px solid #7e7e7e;
+  background: #dbedf8;
 }
 
 table.listing tbody td,
@@ -1868,7 +1936,7 @@ table.listing tbody th{
 .editable-list li.odd,
 table.listing tbody tr.odd td,
 table.listing tbody tr.odd th{
-  background-color: #dbedf8;  
+  background-color: #f1f5fa;  
 }
 
 .article-list li.even,
@@ -1887,6 +1955,28 @@ table.listing td.left{
   text-align: left;
 }
 
+table.listing tbody th{
+  font-weight: normal;
+}
+
+.tablemarker{
+  background: #000;
+  height: 2px;
+  overflow: hidden;
+}
+
+table.clone,
+table.listing.clone {
+  z-index: 100000;
+  border: 1px solid #ccc !important;
+}
+
+table.clone tr td,
+table.clone tr th{
+  border-bottom: 1px solid #ccc;
+  background: #F1F5FA !important;  
+}
+
 
 /* ==================== */
 /* = Skyline2 Content = */
@@ -2202,6 +2292,11 @@ a.cancel{
   margin-right: 1em;
 }
 
+td.icon,
+th.icon{
+  width: 16px;
+}
+
 span.drag{
   float: left;
   background: url(../images/icons/drag.gif) 50% 50% no-repeat;
@@ -2211,11 +2306,18 @@ span.drag{
 
 ul.selectlist li a.active,
 #application .selected,
+tr.selected th,
+tr.selected td,
 .dialog .selected{
-  background: url(../images/backgrounds/selected.gif) 0 0 #0069ba repeat-x;
+  background: url(../images/backgrounds/selected.gif) 0 0 #0069ba repeat-x !important;
   color: #fff;
 }
 
+/* Fix this for IE, it doesn't support :not */
+.selected * a:not(.button){
+  color: #fff !important;
+}
+
 ul.selectlist li a:hover,
 #application .hover,
 .menubutton li:hover,

data/rails/init.rb

@@ -2,15 +2,15 @@ require 'fileutils'
 
 # Add these directories to the loadpath
 %w{ observers middleware }.each do |dir|
- ActiveSupport::Dependencies.load_paths << (Skyline.root + "app" + dir).to_s
+ ActiveSupport::Dependencies.autoload_paths << (Skyline.root + "app" + dir).to_s
 end
 
 # Vendor paths
 vendor_path = (Skyline.root + "vendor").to_s
 application_vendor_index = $LOAD_PATH.index(Rails.root + "vendor") || 0
 $LOAD_PATH.insert(application_vendor_index + 1, vendor_path)
-ActiveSupport::Dependencies.load_paths << vendor_path
-ActiveSupport::Dependencies.load_once_paths << vendor_path
+ActiveSupport::Dependencies.autoload_paths << vendor_path
+ActiveSupport::Dependencies.autoload_once_paths << vendor_path
 
 # Setup public paths
 public_path = Pathname.new(Rails.public_path) + "skyline"

data/test/factories.rb

@@ -0,0 +1,28 @@
+Factory.define :media_dir, :class => Skyline::MediaDir do |d|  
+  d.name "test_dir"
+end
+
+Factory.define :media_file, :class => Skyline::MediaNode do |f|
+  f.name 'test_file.jpg'
+  f.content_type "image/jpeg"
+  f.size "28521"
+  f.path "test_dir"
+  f.description "A test file"
+end
+
+Factory.define :user, :class => Skyline::User do |u|
+  u.name "Test User"
+  u.email "test@test.com"
+end
+
+Factory.define :page, :class => Skyline::Page do |u|
+end
+
+Factory.define :wysiwyg_section, :class => Skyline::Sections::WysiwygSection do |u|
+end
+
+Factory.define :rss_section, :class => Skyline::Sections::RssSection do |u|
+end
+
+Factory.define :user_preference, :class => Skyline::UserPreference do |u|
+end

data/test/integration/media_browser_super_access_test.rb

@@ -0,0 +1,52 @@
+require 'test_helper'
+require File.dirname(__FILE__) + '/../../db/fixtures/roles_and_rights.rb' 
+require 'user_access_helper'
+
+class MediaBrowserSuperAccessTest < ActionController::IntegrationTest
+  include UserAccessHelper
+
+  context "A Super user" do
+    setup do            
+      #TODO: figure out why it doesn't work if seed file is included at the top
+      # load File.dirname(__FILE__) + '/../../db/fixtures/roles_and_rights.rb' 
+      build_complete_environment            
+                  
+      @role = Skyline::Role.find_by_name("super")
+      
+      @user.grants.create(:role => @role)
+      assert_equal 1, @user.grants.size
+      assert !@user.new_record?,@user.errors.inspect
+            
+      @u = login(@user,"qwedsa")
+    end
+
+    should "be able to access media browser" do
+      @u.allow(:get, skyline_media_dirs_path)
+    end
+    
+    should "be able to create a MediaDir" do
+      @u.allow(:post, skyline_media_dirs_path, {:parent_id => @media_dir.id, :name => "create_test"})
+    end
+     
+    should "be able to edit a MediaDir" do
+      @u.allow(:put, skyline_media_dir_path(@media_dir))      
+    end    
+     
+    should "be able to delete a MediaDir" do
+      @u.allow(:delete, skyline_media_dir_path(@media_sub_dir))      
+    end 
+     
+    should "be able to create a MediaFile" do
+      @u.allow(:post, skyline_media_dir_files_path(@media_dir),{:Filename => "/files/test.gif", :Filedata => fixture_file_upload("/../../vendor/plugins/skyline/db/fixtures/files/test.gif", "image/gif")})
+    end
+      
+    should "be able to edit a MediaFile" do
+      @u.allow(:put,  skyline_media_dir_file_path(@media_dir,@media_file), {:Filename => "/files/test.gif", :mediafile => fixture_file_upload("/../../vendor/plugins/skyline/db/fixtures/files/test.gif", "image/gif")})
+    end    
+      
+    should "be able to delete a MediaFile" do
+      @u.allow(:delete, skyline_media_dir_file_path(@media_dir,@media_file))
+    end 
+  end
+  
+end

data/test/integration/media_browser_user_access_test.rb

@@ -0,0 +1,50 @@
+require 'test_helper'
+require File.dirname(__FILE__) + '/../../db/fixtures/roles_and_rights.rb' 
+require 'user_access_helper'
+
+class MediaBrowserUserAccessTest < ActionController::IntegrationTest
+  include UserAccessHelper
+  fixtures :all
+  
+  context "A User" do
+    setup do
+      #TODO: figure out why it doesn't work if seed file is included at the top
+      # load File.dirname(__FILE__) + '/../../db/fixtures/roles_and_rights.rb' 
+      build_complete_environment
+      
+      @role = Skyline::Role.find_by_name("does-not-exist")      
+      @user.grants.create(:role => @role)
+      assert_equal 1, @user.grants.size
+      assert !@user.new_record?,@user.errors.inspect
+            
+      @u = login(@user,"qwedsa")
+      
+    end
+ 
+    should "not be able to create a MediaDir" do
+      @u.deny(:post, skyline_media_dirs_path)      
+    end
+     
+    should "not be able to edit a MediaDir" do
+      @u.deny(:put, skyline_media_dir_path(@media_dir))      
+    end    
+     
+    should "not be able to delete a MediaDir" do
+      @u.deny(:delete, skyline_media_dir_path(@media_dir))      
+    end 
+     
+     should "not be able to create a MediaFile" do
+       @u.deny(:post, skyline_media_dir_files_path(@media_dir),{:Filename => "/files/test.gif", :mediafile => fixture_file_upload("/../../vendor/plugins/skyline/db/fixtures/files/test.gif", "image/gif")})
+     end
+      
+    should "not be able to edit a MediaFile" do
+     @u.deny(:put,  skyline_media_dir_file_path(@media_dir,@media_file), {:Filename => "/files/test.gif", :mediafile => fixture_file_upload("/../../vendor/plugins/skyline/db/fixtures/files/test.gif", "image/gif")})
+    end
+      
+    should "not be able to delete a MediaFile" do
+     @u.deny(:delete, skyline_media_dir_file_path(@media_dir,@media_file))
+    end
+    
+  end  
+  
+end