Deploy from travis build

freifunk-berlin · Jan 4, 2017 · 8ab1fef · 8ab1fef
1 parent b71a740
commit 8ab1fef
Show file tree

Hide file tree

Showing 7 changed files with 77 additions and 158 deletions.
diff --git a/index.css b/index.css
diff --git a/index.css.map b/index.css.map
diff --git a/index.html b/index.html
@@ -1,64 +1,20 @@
 <!doctype html>
 
-<html data-ng-app="WizardApp">
+<html data-ng-app="WizardApp" ng-strict-di>
   <head>
     <title>Freifunk Berlin · Router configuration wizard</title>
-
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
   <link href="index.css" rel="stylesheet"></head>
-  <body data-ng-controller="WizardCtrl">
+  <body>
+    <navbar></navbar>
+    <ui-view></ui-view>
 
-    <!-- content -->
-    <div class="wizard-bg-highlight navbar navbar-fixed-top">
-      <div class="container">
-        <div class="row">
-          <div class="col-md-12">
-            <div class="navbar-form navbar-right">
-              <a href ng-click="loadRouterInformation()" translate>loadrouterinfolink</a>
-              <a href ng-click="showLoadConfigModal()" translate>loadconfiglink</a>
-              <select class="form-control form-inline" data-ng-model="selectedLanguage">
-                <option value="en">English</option>
-                <option value="de">Deutsch</option>
-              </select>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="jumbotron wizard-bg-highlight">
-      <div class="container">
-        <h1>
-        <span class="fa-stack fa-lg">
-          <i class="fa fa-circle fa-stack-2x"></i>
-          <i class="fa fa-star fa-stack-1x fa-inverse"></i>
-        </span>
-        {{'heading' | translate }}</h1>
-        <p class="intro" translate>description</p>
-      </div>
-      <div class="container">
-        <div>
-          <p class="description" translate>freifunk</p>
-        </div>
-      </div>
-    </div>
-
-    <form novalidate name="wizardForm" ng-submit="submit()"
-        class="form-horizontal wizard-categories">
-      <ng-include src="'shared/loadConfig/loadConfig.html'"></ng-include>
-      <ng-include src="'shared/passwordModal/passwordModal.html'"></ng-include>
-      <div ng-if="!isOnline()" class="wizard-category">
-        <ng-include src="'shared/offlineWarning/offlineWarning.html'"></ng-include>
-      </div>
-      <div class="wizard-category">
-        <ng-include src="'shared/basicRouterSetup/basicRouterSetup.html'"></ng-include>
-      </div>
+    <!--
       <div class="wizard-category">
         <ng-include src="'shared/contactDetails/contactDetails.html'"></ng-include>
       </div>
-      <div class="wizard-category">
-        <ng-include src="'shared/routerLocation/routerLocation.html'"></ng-include>
-      </div>
+
       <div class="wizard-category">
         <ng-include src="'shared/internetSharing/internetSharing.html'"></ng-include>
       </div>
@@ -71,34 +27,6 @@ <h1>
       <div class="wizard-category">
         <ng-include src="'shared/advancedWifi/advancedWifi.html'"></ng-include>
       </div>
-
-      <!-- submission -->
-      <div class="wizard-category">
-        <div class="container text-right">
-          <span class="text-danger" translate
-              ng-if="wizardForm.$submitted && wizardForm.$invalid">
-              configIncorrect
-          </span>
-          <span class="text-success" translate
-                ng-show="state.apply.uploaded && state.apply.success">
-            applysuccesful
-          </span>
-          <span class="text-danger" translate
-                ng-show="state.apply.uploaded && ! state.apply.success">
-            applyerror
-          </span>
-          <span class="text-danger" translate
-                ng-show="state.apply.error && ! state.apply.success">
-            uploaderror
-          </span>
-          <button type="button" class="btn btn-default" ng-click="downloadConfig()">
-            <i class="fa fa-download"></i> <span translate>download</span>
-          </button>
-          <button type="submit" class="btn btn-primary" data-ng-class="{disabled: wizardForm.$invalid}">
-            <i class="fa fa-check"></i> <span translate>save</span>
-          </button>
-        </div>
-      </div>
-    </form>
+  -->
   <script type="text/javascript" src="index.js"></script></body>
 </html>
diff --git a/index.js b/index.js
diff --git a/index.js.map b/index.js.map
diff --git a/nls/locale-de.json b/nls/locale-de.json
@@ -298,19 +298,5 @@
   "applyerror": "Deine Konfiguration konnte nicht gespeichert werden. Bitte schau in den Logs auf dem Router nach Details.",
   "uploaderror": "Deine Konfiguration konnte nicht zum Router geladen werden. Prüfe bitte deine Verbindung und deinen Router.",
   "save": "Speichern &amp; Neustarten",
-  "download": "Konfiguration herunterladen",
-  "olsrinfo": {
-    "headline": "OLSR Statusinformationen",
-    "help": "Diese Tabelle zeigt die OLSR-Nachbarn.",
-    "label": "Nachbarn",
-    "urllabel": "URL zum Router",
-    "refresh": "Tabelle aktualisieren",
-    "column": {
-      "localip": "Lokale IP",
-      "remoteip": "Entfernte IP",
-      "lq": "Linkqualität",
-      "nlq": "Linkqualität aus Sicht des Nachbarn",
-      "etx" : "Kosten"
-    }
-  }
+  "download": "Konfiguration herunterladen"
 }
diff --git a/nls/locale-en.json b/nls/locale-en.json
@@ -7,7 +7,7 @@
   "freifunk": "We agree to the <a href=\"\" target=\"_blank\">pico peering agreement</a>, please read more about the <a href=\"https://freifunk.net/en/what-is-it-about/our-vision/\" target=\"_blank\">vision</a> and our <a href=\"http://blog.freifunk.net/2015/memorandum-understanding\" target=\"_blank\">memorandum of understanding</a>",
   "offlineWarning": {
     "headline": "No internet connection",
-    "help" : "You don't seam to have an internet connection. Some features of this wizard need a connection. You could either connect your router to the internet or use the <a href=\"#\">online version of this wizard</a> with another connection, save the config file there and then apply it to your router"
+    "help" : "You don't seem to have an internet connection. Some features of this wizard need a connection. You could either connect your router to the internet or use the <a href=\"#\">online version of this wizard</a> with another connection, save the config file there and then apply it to your router"
   },
   "authentication": {
     "headline": "Authentication",
@@ -25,9 +25,17 @@
       "dropnotsupported": "Your browser doesn't support drag and drop for file uploads :("
     }
   },
+  "device": {
+    "headline": "Device",
+    "model": {
+      "label": "Device model"
+    },
+    "wireless": {
+      "label": "Wireless devices"
+    }
+  },
   "basicRouterSetup": {
     "headline": "Basic router setup",
-    "model": " for {{model}}",
     "routerName": {
       "label": "Router name",
       "placeholder": "funkenpumpe3000",
@@ -211,11 +219,11 @@
       "error.ipSubnet": "Not a valid IPv4 subnet.",
       "error.ipSubnetSmall": "The IPv4 subnet must be larger than /30.",
       "wifi": {
-        "label": "Mesh {{index}}",
+        "label": "Mesh IP {{index}}",
         "help": "A single IPv4 address for the wifi device {{name}}."
       },
       "lan": {
-        "label": "Mesh 3",
+        "label": "Mesh IP LAN",
         "help": "A single IPv4 address for the LAN interface."
       }
     },
@@ -303,18 +311,21 @@
   "uploaderror": "Your config could not be uploaded. Check your connection and your router.",
   "save": "Save &amp; Restart",
   "download": "Download configuration",
-  "olsrinfo": {
-    "headline": "OLSR Status Information",
-    "help": "This table shows your OLSR neighbors.",
-    "label": "Neighbors",
-    "urllabel": "URL to your Router",
+  "statusOlsr": {
+    "headline": "OLSR status information",
+    "help": "This page shows OLSR neighbors, routes and interfaces",
     "refresh": "Refresh table",
-    "column": {
-      "localip": "Local IP",
-      "remoteip": "Remote IP",
-      "lq": "Link Quality",
-      "nlq": "Neighbor Link Quality",
-      "etx" : "Link Cost"
+    "neighbors": {
+      "title": "Neighbors",
+      "noData": "Currently there is no data from OLSR.",
+      "noNeighbors": "Currently there are no neighbors.",
+      "columns": {
+        "localip": "Local IP",
+        "remoteip": "Remote IP",
+        "lq": "Link Quality",
+        "nlq": "Neighbor Link Quality",
+        "etx" : "Link Cost"
+      }
     }
   }
 }