Merge pull request #41 from gitpie/HOT-FIX-CONFIG

Hot fix config

Author: mapaiva

app/core/git.js

@@ -741,7 +741,7 @@ Git.prototype.alterGitConfig = function (path, opts) {
     concatConfig('merge.tool', opts.mergeTool);
 
     if (wos.isWindows()) {
-      concatConfig(`mergetool.${opts.mergeTool}.cmd`, `'${opts.mergeTool}.exe $PWD/$LOCAL $PDW/$MERGED $PWD/$REMOTE'`);
+      concatConfig(`mergetool.${opts.mergeTool}.cmd`, `\"${opts.mergeTool}.exe $PWD/$LOCAL $PDW/$MERGED $PWD/$REMOTE\"`);
       concatConfig(`mergetool.${opts.mergeTool}.trustExitCode`, 'true');
     } else {
       concatConfig(`mergetool.${opts.mergeTool}.cmd`, `'${opts.mergeTool} "$LOCAL" "$MERGED" "$REMOTE"'`);

app/frontend/global/notification.js

@@ -21,6 +21,7 @@ class GPNotification {
     this.showLoad = opts.showLoad;
     this.notificationElement = null;
     this.autoclose = opts.autoclose;
+    this.closable = opts.closable;
   }
 
   pop() {
@@ -56,6 +57,19 @@ class GPNotification {
       }
 
       this.notificationElement.innerHTML += `<section class="content">${bodyText || titleText}</section>`;
+      
+      if (this.closable) {
+          let closeBtn = document.createElement('button');
+          
+          closeBtn.className = 'close-button';
+          closeBtn.title = MSGS.Close;
+          closeBtn.innerHTML = '<span class="octicon octicon-x"></span>';
+          closeBtn.onclick = function () {
+              this.close();
+          }.bind(this);
+          
+          this.notificationElement.appendChild(closeBtn);
+      }
 
       container.appendChild(this.notificationElement);
 

app/frontend/modules/settings-page.js

@@ -1,3 +1,5 @@
+'use strict';
+
 (function () {
 
   angular.module('settings', []).directive('settingsPage', function () {
@@ -24,6 +26,8 @@
           { code: 'en', description: 'English'},
           { code: 'pt-BR', description: 'Portuguese (Brazil)'}
         ];
+        
+        this.appVersion = require('./package').version;
 
         this.hideSettingsPage = function () {
           this.showSettingsPage = false;
@@ -36,9 +40,9 @@
 
         this.getGlobalGitConfigs = function () {
           GIT.getGlobalConfigs(function (err, configs) {
-
+              
             if (err) {
-              alert(err.message);
+              new GPNotification(MSGS['It seems that a git username and email are not set globally. You can fix this accessing the Settings menu'], { closable: true }).pop();
             } else {
               this.globalGitConfigs = configs;
             }

app/frontend/view/content/settings-page.html

@@ -140,6 +140,13 @@
             <li>{{ MSGS.SettingsPage["GitPie is an open source git client that have the goal to be the most simple and nice client for any project and for any people"] }}</li>
           </ul>
         </li>
+        
+        <li>
+          <div class="label">{{ MSGS.SettingsPage.Version }}</div>
+          <ul>
+            <li>{{ settingsCtrl.appVersion }}</li>
+          </ul>
+        </li>
 
         <li>
           <div class="label">{{ MSGS.SettingsPage.License }}</div>

language/en.json

@@ -98,6 +98,8 @@
   "It happends with me all the time too. But lets's try find your project again!": "It happends with me all the time too. But let's try find your project again!",
   "Start adding, clonning or creating some awesome things": "Start adding, clonning or creating some awesome things",
   "Nothing for me here.\n The folder {folder} is not a git project": "Nothing for me here.\n The folder {folder} is not a git project",
+  "Close": "Close",
+  "It seems that a git username and email are not set globally. You can fix this accessing the Settings menu": "It seems that a git username and email are not set globally. You can fix this accessing the Settings menu",
 
   "Error counting commits. Error: ": "Error counting commits. Error: ",
   "Error adding files. Error:": "Error adding files. Error:",
@@ -143,7 +145,8 @@
     "Navigate between repositories top to bottom": "Navigate between repositories top to bottom",
     "Navigate between repositories bottom to top": "Navigate between repositories bottom to top",
     "Add focus on the \"Search repositories\" field": "Add focus on the \"Search repositories\" field",
-    "Close modal windows and header menus": "Close modal windows and header menus"
+    "Close modal windows and header menus": "Close modal windows and header menus",
+    "Version": "Version"
   },
 
   "Authentication required": "Authentication required",

language/pt-BR.json

@@ -98,6 +98,8 @@
   "It happends with me all the time too. But lets's try find your project again!": "Isso acontece comigo o tempo todo. Mas vamos tentar achar o seu projeto de novo!",
   "Start adding, clonning or creating some awesome things": "Comece adicionando, clonando ou criando coisas incríveis",
   "Nothing for me here.\n The folder {folder} is not a git project": "Nada pra mim aqui.\n A pasta {folder} não é um projeto git",
+  "Close": "Fechar",
+  "It seems that a git username and email are not set globally. You can fix this accessing the Settings menu": "Parece que um usuário e email git não estão definidos globalmente. Você pode corrigir isso acessando o menu de Configurações",
 
   "Error counting commits. Error: ": "Erro contando commits. Erro: ",
   "Error adding files. Error:": "Erro adicionando arquivos. Erro:",
@@ -143,7 +145,8 @@
     "Navigate between repositories top to bottom": "Navega entre os repositórios de cima para baixo",
     "Navigate between repositories bottom to top": "Navega entre os repositórios de baixo para cima",
     "Add focus on the \"Search repositories\" field": "Adiciona foco no campo \"Procurar repositórios\"",
-    "Close modal windows and header menus": "Fecha janelas modais e menus de cabeçalho"
+    "Close modal windows and header menus": "Fecha janelas modais e menus de cabeçalho",
+    "Version": "Versão"
   },
 
   "Authentication required": "Autenticação requerida",

resources/sass/all.scss

@@ -579,6 +579,22 @@ body {
       .content {
         flex: 1 1 auto;
       }
+      
+      .close-button {
+        padding: 0;
+        padding-left: 20px;
+        padding-right: 10px;
+        color: #FFF;
+        background-color: #404040;
+        border: 0;
+        box-shadow: none;
+        cursor: pointer;
+        transition: color ease 0.2s;
+        
+        &:hover {
+          color: rgba(255, 255, 255, 0.7);  
+        }
+      }
     }
 
     /* Header of the application */