瀏覽代碼

Add reload button (#557)

* Add reload and forget session button
* Remove red app upgrade warning box

Fixes #545
Garand Tyson 7 年之前
父節點
當前提交
0a05fef53f
共有 5 個文件被更改,包括 15 次插入24 次删除
  1. 1 1
      public/i18n/de.json
  2. 1 1
      public/i18n/en.json
  3. 6 7
      src/partials/welcome.html
  4. 1 1
      src/sass/layout/_main.scss
  5. 6 14
      src/sass/sections/_welcome.scss

+ 1 - 1
public/i18n/de.json

@@ -17,8 +17,8 @@
         "UNLOCK_FAILED_TITLE": "Verbindung aufbauen fehlgeschlagen",
         "ALTERNATIVELY": "Alternativ:",
         "UNLOCK_FAILED_FORGOTTEN": "Haben Sie Ihr Passwort vergessen? W\u00e4hlen Sie \"gespeicherte Sitzung l\u00f6schen\" und setzen Sie ein neues Passwort.",
-        "IF_YOU_WANT": "Wenn Sie möchten, können Sie die",
         "FORGET_SESSION": "gespeicherte Sitzung löschen",
+        "FORGET_SESSION_BTN": "Sitzung vergessen",
         "BTN_RECONNECT": "Verbindung aufbauen",
         "BROWSER_NOT_SUPPORTED": "Dieser Browser wird nicht unterst\u00fctzt",
         "BROWSER_NOT_SUPPORTED_ANDROID": "Dieser Browser wird von Android-Geräten nicht unterst\u00fctzt",

+ 1 - 1
public/i18n/en.json

@@ -17,8 +17,8 @@
         "UNLOCK_FAILED_TITLE": "Unlocking failed",
         "ALTERNATIVELY": "Alternatively,",
         "UNLOCK_FAILED_FORGOTTEN": "If you can't remember your password, simply choose \"forget this session\", and set a new password.",
-        "IF_YOU_WANT": "If you want, you can",
         "FORGET_SESSION": "forget this session",
+        "FORGET_SESSION_BTN": "forget session",
         "BTN_RECONNECT": "Reconnect",
         "BROWSER_NOT_SUPPORTED": "This browser is not supported",
         "BROWSER_NOT_SUPPORTED_ANDROID": "This browser is not supported on Android",

+ 6 - 7
src/partials/welcome.html

@@ -94,13 +94,12 @@
                                 <span translate>troubleshooting.ADBLOCKER</span>
                             </li>
                         </ul>
-                        <p class="forget" ng-if="ctrl.state === 'push'">
-                            <span translate>welcome.IF_YOU_WANT</span>
-                            <a href="#" ng-click="ctrl.deleteSession()" translate>welcome.FORGET_SESSION</a>.
-                        </p>
-                        <div class="protocol-updated" ng-if="ctrl.config.PREV_PROTOCOL_LAST_VERSION !== null">
-                            <p ng-bind-html="ctrl.pleaseUpdateAppMsg"></p>
-                        </div>
+                        <md-button class="md-raised md-primary reload-btn" ng-click="ctrl.deleteSession()" ng-if="ctrl.state === 'push'">
+                        	<span translate>welcome.FORGET_SESSION_BTN</span>
+                        </md-button>
+                        <md-button class="md-raised md-primary reload-btn" ng-click="ctrl.reload()">
+                        	<i class="material-icons">refresh</i> <span translate>welcome.RELOAD</span>
+                        </md-button>
                     </div>
                 </div>
             </div>

+ 1 - 1
src/sass/layout/_main.scss

@@ -43,7 +43,7 @@
 
     // Set min height of welcome screen
     &:not(.wide) #main {
-        min-height: 560px;
+        min-height: 620px;
         height: auto;
     }
 

+ 6 - 14
src/sass/sections/_welcome.scss

@@ -134,20 +134,6 @@
             }
         }
 
-        .protocol-updated {
-            font-size: 0.9em;
-            background-color: $status-error;
-            color: white;
-            font-weight: bold;
-            position: absolute;
-            bottom: 148px;
-            padding: 8px 8px;
-            width: calc(100% - 16px);
-            a {
-                color: #9dd0f2;
-            }
-        }
-
         .troubleshoot {
             $troubleshoot-height: 190px;
             height: $troubleshoot-height;
@@ -167,6 +153,12 @@
             .forget {
                 margin-top: 8px;
             }
+            
+            .reload-btn {
+            	margin: 20px 20px 0px;
+            	width: 130px;
+            	height: 35px;
+            }
         }
     }