Merge branch 'master' of git.superglue.it:superglue/editor

src/allplatforms/classes/DocumentMenu.js

@@ -27,7 +27,7 @@ SC.loadPackage({ 'DocumentMenu': {
 
                     menuItemsTop  = [],
                     menuItemsLeft = [],
-                    menuItemsClassesTop  = [ 'MenuItemFileManager', 'MenuItemSave', 'MenuItemSaveAs', 'MenuItemSaveRemote', 'MenuItemOutlines', 'MenuItemPaste', 'MenuItemUndo', 'MenuItemRedo' ],
+                    menuItemsClassesTop  = [ 'MenuItemFileManager', 'MenuItemNewPage', 'MenuItemSave', 'MenuItemSaveAs', 'MenuItemSaveRemote', 'MenuItemServerSettings', 'MenuItemOutlines', 'MenuItemPaste', 'MenuItemUndo', 'MenuItemRedo' ],
                     menuItemsClassesLeft = [ 'MenuItemCenter', 'MenuItemPageTitle', 'MenuItemBackgroundColor', 'MenuItemBackgroundImg', 'MenuItemBackgroundRepeat' ],
                     menuItem = null;
 

src/allplatforms/classes/EmbedElement.js

@@ -7,7 +7,7 @@ SC.loadPackage({ 'EmbedElement': {
 
     sharedProperties: {
         protoHTML:          { initValue: '<div class="sg-element" data-superglue-type="EmbedElement" style="left: 0px; top: 0px; width: 0px; height: 0px;">'
-                                        +'\t<pre><h1>&lt;/&gt;</h1>Replace this with embedded code.</pre>'
+                                        +'\t<pre><h1>&lt;/&gt;</h1>Replace this with HTML code.</pre>'
                                         +'</div>' },
         applicableWidgets:  { initValue: [ 'WidgetBackgroundColor', 'WidgetBorderColor', 'WidgetBorder', 'WidgetBorderRadius', 'WidgetPadding', 'WidgetOpacity' ] },
         creationMenuItem:   { initValue: '<div class="sg-editing-creation-menu-container"><button id="sg-editing-creation-menu-embedElement" class="sg-editing-creation-menu-button" data-tooltip="Embed HTML Code"></button></div>' }

src/allplatforms/classes/MenuItemNewPage.js

@@ -0,0 +1,39 @@
+SC.loadPackage({ 'MenuItemNewPage': {
+
+    comment: 'I am the MenuItem invoking the FileManger with context newPage.',
+
+    traits:  ['MenuItem'],
+
+    sharedProperties: {
+
+        menuContainer:  { initValue: '<div class="sg-editing-menu-container"><button id="sg-editing-menu-newPage" class="sg-editing-menu-button"></button></div>' }
+
+    },
+
+    methods: {
+
+    	init: { 
+    		comment: 	'I init the MenuItem.',
+    		code: 		function(theDocumentMenu){
+
+                this.delegate('MenuItem', 'init', theDocumentMenu);
+                this.set({ isActionButton: true });
+                
+                this.get('menuContainer').firstChild.addEventListener('mouseup', function(evt){
+
+                    SuperGlue.get('fileManager').do('newPage')
+
+                    theDocumentMenu.do('close');
+
+                }, false);
+
+
+    		}
+
+    	}
+
+
+    }
+
+
+}});

src/allplatforms/classes/MenuItemServerSettings.js

@@ -0,0 +1,48 @@
+SC.loadPackage({ 'MenuItemServerSettings': {
+
+    comment: 'I am the MenuItem which opens a new tab for the server settings.',
+
+    traits:  ['MenuItem'],
+
+    sharedProperties: {
+
+        menuContainer:  { initValue: '<div class="sg-editing-menu-container"><button id="sg-editing-menu-serverSettings" class="sg-editing-menu-button"></button></div>' }
+
+    },
+
+    methods: {
+
+    	init: { 
+    		comment: 	'I init the MenuItem.',
+    		code: 		function(theDocumentMenu){
+
+                this.delegate('MenuItem', 'init', theDocumentMenu);
+                this.set({ isActionButton: true });
+                
+                this.get('menuContainer').firstChild.addEventListener('mouseup', function(evt){
+
+                    if(document.location.host){
+
+                        window.open(SuperGlue.get('server').get('origin') + '/admin', '_blank');
+
+                    }else{
+
+                        alert('You are not working on a SuperGlue server.');
+
+                    }
+                    
+
+                    theDocumentMenu.do('close');
+
+                }, false);
+
+
+    		}
+
+    	}
+
+
+    }
+
+
+}});

src/allplatforms/css/DocumentMenu.css

@@ -8,7 +8,7 @@
 	position:       fixed;
 	top:			25px;
 	left:			55px;
-	width:			300px;
+	width:			350px;
 	height:			30px;
 }
 

src/allplatforms/css/MenuItemNewPage.css

@@ -0,0 +1,3 @@
+#sg-editing-menu-newPage {
+	background-image: url("icons/newPage.svg");;
+}

src/allplatforms/css/MenuItemServerSettings.css

@@ -0,0 +1,3 @@
+#sg-editing-menu-serverSettings {
+	background-image: url("icons/serverSettings.svg");;
+}

src/chromium/content_probeForSG.js

@@ -39,6 +39,7 @@
         'classes/MenuItemBackgroundRepeat.js',
         'classes/MenuItemCenter.js',
         'classes/MenuItemFileManager.js',
+        'classes/MenuItemNewPage.js',
         'classes/MenuItemOutlines.js',
         'classes/MenuItemPageTitle.js',
         'classes/MenuItemPaste.js',
@@ -46,6 +47,7 @@
         'classes/MenuItemSave.js',
         'classes/MenuItemSaveAs.js',
         'classes/MenuItemSaveRemote.js',
+        'classes/MenuItemServerSettings.js',
         'classes/MenuItemUndo.js',
         'classes/Keyboard.js',
         'classes/ResizeHandles.js',
@@ -99,6 +101,7 @@
         'css/MenuItemBackgroundRepeat.css',
         'css/MenuItemCenter.css',
         'css/MenuItemFileManager.css',
+        'css/MenuItemNewPage.css',
         'css/MenuItemOutlines.css',
         'css/MenuItemPageTitle.css',
         'css/MenuItemPaste.css',
@@ -106,6 +109,7 @@
         'css/MenuItemSave.css',
         'css/MenuItemSaveAs.css',
         'css/MenuItemSaveRemote.css',
+        'css/MenuItemServerSettings.css',
         'css/MenuItemUndo.css',
         'css/ResizeHandles.css',
         'css/Selection.css',

src/firefox/data/content_probeForSG.js

@@ -39,6 +39,7 @@
         'classes/MenuItemBackgroundRepeat.js',
         'classes/MenuItemCenter.js',
         'classes/MenuItemFileManager.js',
+        'classes/MenuItemNewPage.js',
         'classes/MenuItemOutlines.js',
         'classes/MenuItemPageTitle.js',
         'classes/MenuItemPaste.js',
@@ -46,6 +47,7 @@
         'classes/MenuItemSave.js',
         'classes/MenuItemSaveAs.js',
         'classes/MenuItemSaveRemote.js',
+        'classes/MenuItemServerSettings.js',
         'classes/MenuItemUndo.js',
         'classes/Keyboard.js',
         'classes/ResizeHandles.js',
@@ -99,6 +101,7 @@
         'css/MenuItemBackgroundRepeat.css',
         'css/MenuItemCenter.css',
         'css/MenuItemFileManager.css',
+        'css/MenuItemNewPage.css',
         'css/MenuItemOutlines.css',
         'css/MenuItemPageTitle.css',
         'css/MenuItemPaste.css',
@@ -106,6 +109,7 @@
         'css/MenuItemSave.css',
         'css/MenuItemSaveAs.css',
         'css/MenuItemSaveRemote.css',
+        'css/MenuItemServerSettings.css',
         'css/MenuItemUndo.css',
         'css/ResizeHandles.css',
         'css/Selection.css',