⬆️ 0.0.9 and some UI improvement

Author: rafajaques

app/css/index.css

@@ -22,6 +22,11 @@ body{
 .top-margin{
   margin-top: 30px;
 }
+.btn-dark{
+  background-color: transparent;
+  border:1px solid rgb(61, 61, 61);
+  color: rgb(100, 100, 100);
+}
 /**
  * Sidebar stuff
  */
@@ -57,7 +62,7 @@ body{
   text-align: center;
   width: 100px;
 }
-#toggle-mode{
+#sidebar .mode button{
   cursor: default;
 }
 #sidebar span[data-string]{

app/index.html

@@ -19,7 +19,7 @@
     <!-- Sidebar -->
     <div id="sidebar">
       <!-- Menu -->
-      <ul>
+      <ul style="margin-top:25px;">
         <li data-event="sidebar-run"><span class="glyphicon glyphicon-play" aria-hidden="true"></span> <span data-string="Run code"></span> <span id="run-version"></span></li>
         <li data-event="sidebar-clear"><span class="glyphicon glyphicon-erase" aria-hidden="true"></span> <span data-string="Clear"></span></li>
         <li data-event="sidebar-import"><span class="glyphicon glyphicon-open-file" aria-hidden="true"></span> <span data-string="Import from file"></span></li>
@@ -29,7 +29,12 @@
         <li data-event="sidebar-about" data-toggle="modal" data-target="#about"><span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span> <span data-string="About"></span></li>
       </ul>
       <!-- Toggle mode -->
-      <div class="mode"><button id="toggle-mode" class="btn btn-default btn-xs btn-primary" data-string="RAW mode"></button></div>
+      <div class="mode text-center">
+        <div class="btn-group btn-group-xs">
+        <button class="toggle-mode-raw btn btn-primary">RAW</button>
+        <button class="toggle-mode-html btn btn-dark">HTML</button>
+      </div>
+      </div>
     </div>
     <div id="content">
       <div id="editor"></div>

app/js/main.functions.js

@@ -21,17 +21,21 @@ function preventLinkDefault() {
  */
 
 /* Toggle RAW and HTML modes */
-function toggleMode() {
-  const btn = $('#toggle-mode');
-  btn.toggleClass('btn-primary btn-success');
-  if (mode === 'raw') {
-    btn.html(i18n.__('HTML mode'));
-    mode = 'html';
+function toggleMode(switchMode) {
+  if (switchMode === 'html') {
+    // Swap classes
+    $('.toggle-mode-html').addClass('btn-primary').removeClass('btn-dark');
+    $('.toggle-mode-raw').addClass('btn-dark').removeClass('btn-primary');
+
+    // Swap consoles
     $('#console').css('display', 'none');
     $('#console-html').css('display', 'block');
   } else {
-    btn.html(i18n.__('RAW mode'));
-    mode = 'raw';
+    // Swap classes
+    $('.toggle-mode-html').addClass('btn-dark').removeClass('btn-primary');
+    $('.toggle-mode-raw').addClass('btn-primary').removeClass('btn-dark');
+
+    // Swap consoles
     $('#console').css('display', 'block');
     $('#console-html').css('display', 'none');
   }
@@ -256,7 +260,8 @@ function renderApp(refresh) {
       $('*[data-event="sidebar-import"]').click(importFromFile);
 
       // "Toggle mode" button click
-      $('#toggle-mode').click(toggleMode);
+      $('.toggle-mode-raw').click(() => toggleMode('raw'));
+      $('.toggle-mode-html').click(() => toggleMode('html'));
 
       // Presentation mode
       $('*[data-event="sidebar-fullscreen"]').click(toggleFullscreen);

app/locales/da.json

@@ -3,8 +3,6 @@
 	"Clear": "Ryd",
 	"Settings": "Indstillinger",
 	"About": "Om",
-	"RAW mode": "RAW mode",
-	"HTML mode": "HTML mode",
 	"Save": "Gem",
 	"Cancel": "Annuller",
 	"General": "General",
@@ -88,4 +86,4 @@
 	"Be careful! This is not a sandbox. The indiscriminate use of some functions may damage the system.": "Be careful! This is not a sandbox. The indiscriminate use of some functions may damage the system.",
 	"None": "None",
 	"Add binary": "Add binary"
-}
+}

app/locales/de.json

@@ -3,8 +3,6 @@
 	"Clear": "Leeren",
 	"Settings": "Einstellungen",
 	"About": "Über",
-	"RAW mode": "RAW Modus",
-	"HTML mode": "HTML Modus",
 	"Save": "Speichern",
 	"Cancel": "Abbrechen",
 	"General": "Allgemein",
@@ -88,4 +86,4 @@
 	"Be careful! This is not a sandbox. The indiscriminate use of some functions may damage the system.": "Be careful! This is not a sandbox. The indiscriminate use of some functions may damage the system.",
 	"None": "None",
 	"Add binary": "Add binary"
-}
+}

app/locales/en.json

@@ -3,8 +3,6 @@
 	"Clear": "Clear",
 	"Settings": "Settings",
 	"About": "About",
-	"RAW mode": "RAW mode",
-	"HTML mode": "HTML mode",
 	"Save": "Save",
 	"Cancel": "Cancel",
 	"General": "General",

app/locales/fr.json

@@ -3,8 +3,6 @@
 	"Clear": "Effacer",
 	"Settings": "Réglages",
 	"About": "À propos",
-	"RAW mode": "Mode RAW",
-	"HTML mode": "Mode HTML",
 	"Save": "Sauvegarder",
 	"Cancel": "Annuler",
 	"General": "Général",
@@ -88,4 +86,4 @@
 	"Be careful! This is not a sandbox. The indiscriminate use of some functions may damage the system.": "Be careful! This is not a sandbox. The indiscriminate use of some functions may damage the system.",
 	"None": "None",
 	"Add binary": "Add binary"
-}
+}

app/locales/pt-BR.json

@@ -3,8 +3,6 @@
 	"Clear": "Limpar",
 	"Settings": "Configurações",
 	"About": "Sobre",
-	"RAW mode": "Modo RAW",
-	"HTML mode": "Modo HTML",
 	"Save": "Salvar",
 	"Cancel": "Cancelar",
 	"General": "Geral",

app/main.js

@@ -58,6 +58,7 @@ app.on('ready', () => {
     height: 700,
     width: 900,
     center: true,
+    titleBarStyle: 'hidden',
     icon: Path.join(__dirname, 'gfx', 'app-icon.png'),
     skipTaskbar: conf.get('general.mode') === 'tray',
   });

app/package.json

@@ -1,7 +1,7 @@
 {
   "name": "phpassistant",
   "productName": "PHP Assistant",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "main": "main.js",
   "description": "A cross-platform desktop PHP runner",
   "author": "Rafael Jaques <[email protected]>",

appveyor.yml

@@ -46,7 +46,7 @@ deploy:
     subject: rafajaques
     repo: windows
     package: "php-assistant"
-    version: 0.0.8
+    version: 0.0.9
     publish: true
     override: true
     explode: true

deploy/descriptor-linux.json

@@ -16,10 +16,10 @@
     },
 
     "version": {
-        "name": "0.0.8",
+        "name": "0.0.9",
         "desc": "Minor release",
-        "released": "2016-06-02",
-        "vcs_tag": "0.0.8",
+        "released": "2016-06-06",
+        "vcs_tag": "0.0.9",
         "gpgSign": false
     },
 

deploy/descriptor-osx.json

@@ -16,10 +16,10 @@
     },
 
     "version": {
-        "name": "0.0.8",
+        "name": "0.0.9",
         "desc": "Minor release",
-        "released": "2016-06-02",
-        "vcs_tag": "0.0.8",
+        "released": "2016-06-06",
+        "vcs_tag": "0.0.9",
         "gpgSign": false
     },