Updated to version 1.2.5 of Kaliko CMS

Admin/Assets/js/kalikocms.admin.js

@@ -44,6 +44,7 @@ function initHtmlEditor(assetsPath) {
         },
         paste_data_images: true,
         extended_valid_elements: "i[class],span,span[class]",
+        convert_urls: false,
         relative_urls: false,
         toolbar: "undo redo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image | code",
         file_picker_callback: function (callback, value, meta) {

Admin/Content/Dialogs/SelectFileDialog.aspx

@@ -147,8 +147,7 @@
             sequentialUploads: true,
             formData: function(form) {
               return [{ name: 'path', value: path }];
-            },
-            maxFileSize: 5000000 //,
+            }
           }
         )
         .bind('fileuploaddrop', function(e, data) {

Admin/Content/Dialogs/SelectLinkDialog.aspx

@@ -61,7 +61,7 @@
         $('#link-tab a[href=<%=ActiveTab %>]').tab('show');
 
         $('#<%=SelectFileButton.ClientID %>').click(function () {
-          top.propertyEditor.file.openDialog($('#<%=FileUrl.ClientID %>'), $('#<%=FileDisplayField.ClientID %>'));
+          top.propertyEditor.file.openDialog($('#<%=FileUrl.ClientID %>'), $('#<%=FileDisplayField.ClientID %>'), window);
           return false;
         });
 

Admin/Content/EditPage.aspx

@@ -82,14 +82,14 @@
               <span class="static-text"><asp:Literal ID="ShortUrl" runat="server" /></span>
             </div>
           </div>
-          <div class="form-actions">
-            <button id="versionbutton" type="button" class="btn btn-default pull-right"><i class="icon-code-fork"></i> Show versions</button>
-            <asp:LinkButton runat="server" ID="PublishButton" CssClass="btn btn-lg btn-primary"><i class="icon-thumbs-up"></i> Publish page</asp:LinkButton>
-            <asp:LinkButton runat="server" ID="SaveButton" CssClass="btn btn-lg btn-default"><i class="icon-pencil"></i> Save working copy</asp:LinkButton>
-          </div>
         </fieldset>
       </div>
     </div>
+    <div class="form-actions">
+        <button id="versionbutton" type="button" class="btn btn-default pull-right"><i class="icon-code-fork"></i> Show versions</button>
+        <asp:LinkButton runat="server" ID="PublishButton" CssClass="btn btn-lg btn-primary"><i class="icon-thumbs-up"></i> Publish page</asp:LinkButton>
+        <asp:LinkButton runat="server" ID="SaveButton" CssClass="btn btn-lg btn-default"><i class="icon-pencil"></i> Save working copy</asp:LinkButton>
+    </div>
   </form>
 </asp:Content>
 

Admin/Content/PageTree/PageTreeControl.ascx

@@ -153,11 +153,12 @@
                         "old": data.old_parent,
                         "position": data.position
                     },
-                    success: function(r) {
-                        data.instance.load_node(data.parent);
-                        if (data.parent != data.old_parent) {
-                            data.instance.load_node(data.old_parent);
-                        }
+                    success: function (r) {
+                        data.instance.refresh();
+                        //data.instance.load_node(data.parent);
+                        //if (data.parent != data.old_parent) {
+                        //    data.instance.load_node(data.old_parent);
+                        //}
 
                         if (!r.success) {
                             if (r.message.length > 0) {

Admin/Content/PropertyType/CollectionPropertyEditor.js

@@ -6,14 +6,14 @@
                 var content = '<a href="#" onclick="top.propertyEditor.collection.editField(this);return false;" class="pull-right"><i class="icon icon-edit"></i>edit</a><i class="icon icon-sort"></i> ' + exerpt;
                 if (valueField == null && val != null) {
                     var newField = $('<li class="btn btn-default collection-item"></li>');
-                    newField.attr('data-value', escape(val)).html(content);
+                    newField.attr('data-value', encodeURIComponent(val)).html(content);
                     list.append(newField);
                 }
                 else if (val == null) {
                     $(valueField).remove();
                 }
                 else {
-                    $(valueField).attr('data-value', escape(val)).html(content);
+                    $(valueField).attr('data-value', encodeURIComponent(val)).html(content);
                 }
 
                 list.trigger('sortupdate');
@@ -23,7 +23,7 @@
 
             var value = null;
             if (valueField != null) {
-                value = unescape($(valueField).attr('data-value'));
+                value = decodeURIComponent($(valueField).attr('data-value'));
             }
             top.propertyEditor.dialogs.openEditCollectionPropertyDialog(className, value);
         },

Admin/Content/PropertyType/FilePropertyEditor.js

@@ -1,11 +1,11 @@
 (function (propertyEditor) {
     propertyEditor.file = propertyEditor.file || {
-        openDialog: function(pathField, displayField) {
-            var filePath = $(pathField).val();
+        openDialog: function (pathField, displayField, context) {
+            var filePath = context.$(pathField).val();
 
-            var callback = function(newFilePath) {
-                $(displayField).val(newFilePath);
-                $(pathField).val(newFilePath);
+            var callback = function (newFilePath) {
+                context.$(displayField).val(newFilePath);
+                context.$(pathField).val(newFilePath);
             };
 
             top.registerCallback(callback);

Admin/Content/PropertyType/ImagePropertyEditor.js

@@ -1,4 +1,6 @@
 (function (propertyEditor) {
+    var localTop = top;
+
     propertyEditor.image = propertyEditor.image || {
         openDialog: function (pathField, previewImage, originalPathField, cropXField, cropYField, cropWField, cropHField, width, height, descriptionField) {
             var imagePath = $(pathField).val();
@@ -25,18 +27,21 @@
                     $(originalPathField).val('');
                 }
             };
-
-            top.registerCallback(callback);
 
-            top.propertyEditor.dialogs.openEditImageDialog(imagePath, originalPath, cropX, cropY, cropW, cropH, width, height, description);
+
+            localTop.registerCallback(callback);
+
+            localTop.propertyEditor.dialogs.openEditImageDialog(imagePath, originalPath, cropX, cropY, cropW, cropH, width, height, description);
         }
     };
 })(top.propertyEditor || (top.propertyEditor = {}));
 
 
 (function (dialogs) {
+    var localParent = parent;
+
     dialogs.openEditImageDialog = dialogs.openEditImageDialog || function (imagePath, originalPath, cropX, cropY, cropW, cropH, width, height, description) {
-        parent.openModal("Content/Dialogs/EditImageDialog.aspx?imagePath=" + imagePath + "&originalPath=" + originalPath + "&cropX=" + cropX + "&cropY=" + cropY + "&cropW=" + cropW + "&cropH=" + cropH + "&width=" + width + "&height=" + height + "&description=" + escape(description), 710, 500);
+        localParent.openModal("Content/Dialogs/EditImageDialog.aspx?imagePath=" + imagePath + "&originalPath=" + originalPath + "&cropX=" + cropX + "&cropY=" + cropY + "&cropW=" + cropW + "&cropH=" + cropH + "&width=" + width + "&height=" + height + "&description=" + escape(description), 710, 500);
         return false;
     };
 })(top.propertyEditor.dialogs || (top.propertyEditor.dialogs = {}));

Admin/Content/PropertyType/LinkPropertyEditor.js

@@ -1,4 +1,6 @@
 (function (propertyEditor) {
+    var localTop = top;
+
     propertyEditor.link = propertyEditor.link || {
         openDialog: function (urlField, typeField, displayField) {
             var url = $(urlField).val();
@@ -10,17 +12,19 @@
                 $(displayField).val(newUrl);
             };
 
-            top.registerCallback(callback);
+            localTop.registerCallback(callback);
 
-            top.propertyEditor.dialogs.openSelectLinkDialog(url, type);
+            localTop.propertyEditor.dialogs.openSelectLinkDialog(url, type);
         }
     };
 })(top.propertyEditor || (top.propertyEditor = {}));
 
 
 (function (dialogs) {
+    var localParent = parent;
+
     dialogs.openSelectLinkDialog = dialogs.openSelectLinkDialog || function (url, type) {
-        parent.openModal("Content/Dialogs/SelectLinkDialog.aspx?url=" + escape(url) + "&type=" + type, 500, 240);
+        localParent.openModal("Content/Dialogs/SelectLinkDialog.aspx?url=" + escape(url) + "&type=" + type, 500, 240);
         return false;
     };
 })(top.propertyEditor.dialogs || (top.propertyEditor.dialogs = {}));

App_Data/SearchIndex/KalikoCMS/_2q.nrm

@@ -0,0 +1 @@
+NRM�||||||||||||||||||||||||srqrrttttmvtwuutuu||||vv���|��������ywx|xy|wwwww||||||||||||