Merge pull request #34 from andydixon/development

Keep button styles the same and option to show full URL

cms/controller/index.php

@@ -6,8 +6,8 @@ switch ($_REQUEST["action"]) {
     case "save":
         header('Content-type: application/json');
         if (!empty($_POST['uri']) && !empty($_POST['content'])) {
-            $_SESSION['core']->saveContent($_POST['uri'], $_POST['content']);
+            $filename=$_SESSION['core']->saveContent($_POST['uri'], $_POST['content']);
-            echo json_encode(array('message' => 'Page has been saved'));
+            echo json_encode(array('message' => 'Page has been saved','destination'=>$filename));
         } else {
             echo json_encode(array('error' => 'Unable to save page'));
         }

cms/css/editor.css

@@ -34,7 +34,22 @@ body {
 
 .controls .buttonContainer {
     width: 400px;
-    margin: 12px auto;
+    margin: 12px 0;
+    position: absolute;
+    right: 110px;
+}
+
+.controls #urlbox {
+    margin: 15px 150px;
+    text-align: center;
+    font-size: 1.5em;
+    color: black;
+    position: absolute;
+}
+
+.controls #urlbox div {
+    float: right;
+    margin-left:10px;
 }
 
 .controls .loggedInDetails {
@@ -61,11 +76,11 @@ body {
     border: 1px solid #1f2f47;
     display: inline-block;
     cursor: pointer;
-    color: #ffffff;
+    color: #ffffff !important;
     font-family: Arial, Helvetica, sans-serif;
     font-size: 15px;
     padding: 6px 13px;
-    text-decoration: none;
+    text-decoration: none !important;
     text-shadow: 0 1px 0 #263666;
 }
 

cms/index.php

@@ -28,6 +28,7 @@ require_once "init.php";
 <div class="pageContainer">
     <div class="controls">
         <div class="logo"></div>
+       <?php if($showFullUrl) echo '<div id="urlbox"></div>';?>
         <div class="buttonContainer">
             <ul>
                 <li><a href="#" id="selectPage" class="blueButton">Select Page</a></li>

cms/init.php

@@ -11,6 +11,10 @@ $authentication = [
 // Set to true if you do not want to see the welcome page and want to go straight to your site
 $skipWelcomePage = false;
 
+// Show full URL of the page being edited on the control bar
+$showFullUrl = true;
+
+
 /**
  * DO NOT CHANGE ANYTHING BENEATH THIS LINE - IT WILL BUGGER STUFF UP
  */

cms/js/cms.js

@@ -43,6 +43,7 @@ $(document).ready(function () {
                         images_upload_credentials: true,
                         force_br_newlines: false,
                         force_p_newlines: false,
+                        license_key: 'gpl',
                         forced_root_block: 'aaa',
                         newline_behavior: 'linebreak'
                     });
@@ -265,6 +266,7 @@ $(document).ready(function () {
             $(this).find('.buttonContainer').remove();
             addButtonsToNeoDupe(this);
         });
+        $('#urlbox').html("<strong>Editing:</strong> <div>"+$(iframeDoc)[0].URL+"</div>");
     }
 
     // Function to add buttons to a neo-dupe element inside the iframe