Explorar o código

Clean up GUI directory

Jakob Borg %!s(int64=11) %!d(string=hai) anos
pai
achega
89885b9fb9

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 2 - 2
auto/gui.files.go


+ 6 - 6
build.go

@@ -243,20 +243,20 @@ func xdr() {
 }
 
 func translate() {
-	os.Chdir("gui")
-	runPipe("lang-en-new.json", "go", "run", "../cmd/translate/main.go", "lang-en.json", "index.html")
+	os.Chdir("gui/lang")
+	runPipe("lang-en-new.json", "go", "run", "../../cmd/translate/main.go", "lang-en.json", "../index.html")
 	os.Remove("lang-en.json")
 	err := os.Rename("lang-en-new.json", "lang-en.json")
 	if err != nil {
 		log.Fatal(err)
 	}
-	os.Chdir("..")
+	os.Chdir("../..")
 }
 
 func transifex() {
-	os.Chdir("gui")
-	runPrint("go", "run", "../cmd/transifexdl/main.go")
-	os.Chdir("..")
+	os.Chdir("gui/lang")
+	runPrint("go", "run", "../../cmd/transifexdl/main.go")
+	os.Chdir("../..")
 	assets()
 }
 

+ 0 - 0
gui/angular-translate-loader.min.js → gui/angular/angular-translate-loader.min.js


+ 0 - 0
gui/angular-translate.min.js → gui/angular/angular-translate.min.js


+ 0 - 0
gui/angular.min.js → gui/angular/angular.min.js


+ 1 - 1
gui/app.js

@@ -15,7 +15,7 @@ syncthing.config(function ($httpProvider, $translateProvider) {
     $httpProvider.defaults.xsrfCookieName = 'CSRF-Token';
 
     $translateProvider.useStaticFilesLoader({
-        prefix: 'lang-',
+        prefix: 'lang/lang-',
         suffix: '.json'
     });
 });

+ 0 - 0
gui/raleway-500.woff → gui/font/raleway-500.woff


+ 0 - 0
gui/raleway.css → gui/font/raleway.css


+ 0 - 0
gui/favicon.png → gui/img/favicon.png


+ 0 - 0
gui/logo-text-256.png → gui/img/logo-text-256.png


+ 0 - 0
gui/logo-text-64.png → gui/img/logo-text-64.png


+ 10 - 91
gui/index.html

@@ -11,93 +11,12 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <meta name="description" content="">
   <meta name="author" content="">
-  <link rel="shortcut icon" href="favicon.png">
+  <link rel="shortcut icon" href="img/favicon.png">
 
   <title>Syncthing | {{thisNodeName()}}</title>
   <link href="bootstrap/css/bootstrap.min.css" rel="stylesheet">
-  <link href="raleway.css" rel="stylesheet">
-  <style type="text/css">
-    body {
-      padding-bottom: 70px;
-      font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-    }
-
-    h1, h2, h3, h4, h5 {
-      font-family: "Raleway", "Helvetica Neue", Helvetica, Arial, sans-serif;
-    }
-
-    ul+h5 {
-      margin-top: 1.5em;
-    }
-
-    .text-monospace {
-      font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
-    }
-
-    .table-condensed>thead>tr>th, .table-condensed>tbody>tr>th, .table-condensed>tfoot>tr>th, .table-condensed>thead>tr>td, .table-condensed>tbody>tr>td, .table-condensed>tfoot>tr>td {
-      border-top: none;
-    }
-
-    .logo {
-      margin: 0;
-      padding: 0;
-      top: -5px;
-      position: relative;
-    }
-
-    .list-no-bullet {
-      list-style-type: none
-    }
-
-    .li-column {
-      display: inline-block;
-      min-width: 7em;
-      margin-right: 1em;
-      background-color: rgb(236, 240, 241);
-      border-radius: 3px;
-      padding: 1px 4px;
-      margin: 2px 2px;
-    }
-    .li-column span.data {
-      margin-left: 0.5em;
-      min-width: 10em;
-      text-align: right;
-      display: inline-block;
-    }
-
-    .ng-cloak {
-      display: none !important;
-    }
-
-    .table th {
-      white-space: nowrap;
-      font-weight: 400;
-    }
-
-    .table td {
-      padding-left: 20px !important;
-    }
-
-    .table td.small-data {
-      white-space: nowrap;
-    }
-
-    table.table-condensed {
-      table-layout: fixed;
-    }
-    table.table-condensed td {
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-    }
-    @media (max-width:767px) {
-      table.table-condensed td {
-        /* for mobile phones to allow linebreaks in long repro folder/shared with
-         * columns. */
-        white-space: normal;
-      }
-    }
-  </style>
+  <link href="font/raleway.css" rel="stylesheet">
+  <link href="overrides.css" rel="stylesheet">
 </head>
 
 <body>
@@ -107,7 +26,7 @@
 
   <nav class="navbar navbar-top navbar-default" role="navigation">
     <div class="container">
-      <span class="navbar-brand"><img class="logo" src="logo-text-64.png" height="32" width="117"/></span>
+      <span class="navbar-brand"><img class="logo" src="img/logo-text-64.png" height="32" width="117"/></span>
       <p class="navbar-text hidden-xs">{{thisNodeName()}}</p>
       <ul class="nav navbar-nav navbar-right">
         <li ng-if="upgradeInfo.newer">
@@ -757,7 +676,7 @@
   <!-- About modal -->
 
   <modal id="about" large="yes" close="yes" status="info" title="About">
-    <h1 class="text-center"><img alt="Syncthing" title="Syncthing" src="logo-text-256.png" style="vertical-align: -16px" height="100" width="366"/><br/><small>{{version}}</small></h1>
+    <h1 class="text-center"><img alt="Syncthing" title="Syncthing" src="img/logo-text-256.png" style="vertical-align: -16px" height="100" width="366"/><br/><small>{{version}}</small></h1>
     <hr/>
 
     <p translate>Copyright &copy; 2014 Jakob Borg and the following Contributors:</p>
@@ -803,12 +722,12 @@
   </modal>
 
 
-  <script src="angular.min.js"></script>
-  <script src="angular-translate.min.js"></script>
-  <script src="angular-translate-loader.min.js"></script>
-  <script src="jquery-2.0.3.min.js"></script>
+  <script src="angular/angular.min.js"></script>
+  <script src="angular/angular-translate.min.js"></script>
+  <script src="angular/angular-translate-loader.min.js"></script>
+  <script src="jquery/jquery-2.0.3.min.js"></script>
   <script src="bootstrap/js/bootstrap.min.js"></script>
-  <script src="valid-langs.js"></script>
+  <script src="lang/valid-langs.js"></script>
   <script src="app.js"></script>
 </body>
 </html>

+ 0 - 0
gui/jquery-2.0.3.min.js → gui/jquery/jquery-2.0.3.min.js


+ 0 - 0
gui/lang-bg.json → gui/lang/lang-bg.json


+ 0 - 0
gui/lang-da.json → gui/lang/lang-da.json


+ 0 - 0
gui/lang-de.json → gui/lang/lang-de.json


+ 0 - 0
gui/lang-el.json → gui/lang/lang-el.json


+ 0 - 0
gui/lang-en.json → gui/lang/lang-en.json


+ 0 - 0
gui/lang-es.json → gui/lang/lang-es.json


+ 0 - 0
gui/lang-fr.json → gui/lang/lang-fr.json


+ 0 - 0
gui/lang-hu.json → gui/lang/lang-hu.json


+ 0 - 0
gui/lang-it.json → gui/lang/lang-it.json


+ 0 - 0
gui/lang-lt.json → gui/lang/lang-lt.json


+ 0 - 0
gui/lang-nl.json → gui/lang/lang-nl.json


+ 0 - 0
gui/lang-pt-PT.json → gui/lang/lang-pt-PT.json


+ 0 - 0
gui/lang-ru.json → gui/lang/lang-ru.json


+ 0 - 0
gui/lang-sv.json → gui/lang/lang-sv.json


+ 0 - 0
gui/lang-tr.json → gui/lang/lang-tr.json


+ 0 - 0
gui/lang-uk.json → gui/lang/lang-uk.json


+ 0 - 0
gui/lang-zh-CN.json → gui/lang/lang-zh-CN.json


+ 0 - 0
gui/lang-zh-TW.json → gui/lang/lang-zh-TW.json


+ 0 - 0
gui/valid-langs.js → gui/lang/valid-langs.js


+ 80 - 0
gui/overrides.css

@@ -0,0 +1,80 @@
+    body {
+      padding-bottom: 70px;
+      font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+    }
+
+    h1, h2, h3, h4, h5 {
+      font-family: "Raleway", "Helvetica Neue", Helvetica, Arial, sans-serif;
+    }
+
+    ul+h5 {
+      margin-top: 1.5em;
+    }
+
+    .text-monospace {
+      font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
+    }
+
+    .table-condensed>thead>tr>th, .table-condensed>tbody>tr>th, .table-condensed>tfoot>tr>th, .table-condensed>thead>tr>td, .table-condensed>tbody>tr>td, .table-condensed>tfoot>tr>td {
+      border-top: none;
+    }
+
+    .logo {
+      margin: 0;
+      padding: 0;
+      top: -5px;
+      position: relative;
+    }
+
+    .list-no-bullet {
+      list-style-type: none
+    }
+
+    .li-column {
+      display: inline-block;
+      min-width: 7em;
+      margin-right: 1em;
+      background-color: rgb(236, 240, 241);
+      border-radius: 3px;
+      padding: 1px 4px;
+      margin: 2px 2px;
+    }
+    .li-column span.data {
+      margin-left: 0.5em;
+      min-width: 10em;
+      text-align: right;
+      display: inline-block;
+    }
+
+    .ng-cloak {
+      display: none !important;
+    }
+
+    .table th {
+      white-space: nowrap;
+      font-weight: 400;
+    }
+
+    .table td {
+      padding-left: 20px !important;
+    }
+
+    .table td.small-data {
+      white-space: nowrap;
+    }
+
+    table.table-condensed {
+      table-layout: fixed;
+    }
+    table.table-condensed td {
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+    @media (max-width:767px) {
+      table.table-condensed td {
+        /* for mobile phones to allow linebreaks in long repro folder/shared with
+         * columns. */
+        white-space: normal;
+      }
+    }

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio