move proxy all option to 2nd position in modal

getlantern · May 25, 2015 · 111bbb4 · 111bbb4
1 parent afdc0e3
commit 111bbb4
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/src/github.com/getlantern/lantern-ui/app/index.html b/src/github.com/getlantern/lantern-ui/app/index.html
@@ -82,6 +82,12 @@ <h3 ng-if="!lanternWelcomeKey">
                   {{ 'AUTO_START' | translate }}
               </label>
 
+              <label class="checkbox">
+                  <input type="checkbox" ng-model="model.settings.proxyAll" focus-on="show"
+                  ng-click="changeProxyAll(model.settings.proxyAll)">
+                  {{ 'PROXY_ALL_TRAFFIC' | translate }}
+              </label>
+
               <div>
                   <label class="checkbox">
                       <input type="checkbox" ng-change="changeReporting(model.settings.autoReport)" ng-model="model.settings.autoReport">
@@ -97,12 +103,6 @@ <h3 ng-if="!lanternWelcomeKey">
                 {{ 'NO_AUTOREPORT_WARNING' | translate }}
               </div>
 
-              <label class="checkbox">
-                  <input type="checkbox" ng-model="model.settings.proxyAll" focus-on="show"
-                  ng-click="changeProxyAll(model.settings.proxyAll)">
-                  {{ 'PROXY_ALL_TRAFFIC' | translate }}
-              </label>
-
             </div>
           </div>
           <div ng-if="lanternWelcomeKey">

diff --git a/src/github.com/getlantern/lantern-ui/app/partials/modals.html b/src/github.com/getlantern/lantern-ui/app/partials/modals.html
@@ -222,6 +222,12 @@ <h3>
           {{ 'AUTO_START' | translate }}
       </label>
 
+        <label class="checkbox">
+          <input type="checkbox" ng-model="model.settings.proxyAll" focus-on="show"
+          ng-click="changeProxyAll(model.settings.proxyAll)">
+          {{ 'PROXY_ALL_TRAFFIC' | translate }}
+        </label>
+
         <div>
           <label class="checkbox">
             <input type="checkbox" ng-model="model.settings.autoReport" ng-change="changeReporting(model.settings.autoReport)">
@@ -237,12 +243,6 @@ <h3>
           {{ 'NO_AUTOREPORT_WARNING' | translate }}
         </div>
 
-        <label class="checkbox">
-          <input type="checkbox" ng-model="model.settings.proxyAll" focus-on="show"
-          ng-click="changeProxyAll(model.settings.proxyAll)">
-          {{ 'PROXY_ALL_TRAFFIC' | translate }}
-        </label>
-
       </dd>
     </dl>
   </div>

diff --git a/src/github.com/getlantern/lantern-ui/dist/index.html b/src/github.com/getlantern/lantern-ui/dist/index.html
@@ -3,4 +3,4 @@
  <body>
  <p class="chromeframe">You are using an outdated browser. Please <a href="https://www.google.com/chrome/">upgrade your browser</a> and try again.</p>
  </body>
-<![endif]--><!--[if (!IE)|(gte IE 10)]><!--><body ng-controller=RootCtrl ng-cloak="" lang="{{ lang }}" dir="{{ langDirection }}" ng-class="{showVis: model.showVis, getMode: inGetMode, giveMode: inGiveMode}"><div id=fb-root></div><div id=welcomescreen ng-show="wsConnected && currentModal == 'welcome'" modal=show class=modal ng-cloak=""><div class=modal-header><h3 ng-if=!lanternWelcomeKey>{{ 'WELCOME_TO_LANTERN' | translate }}</h3></div><div class=modal-body><div ng-controller=SettingsCtrl ng-if=!lanternWelcomeKey><p class=configure_system>{{'CONFIGURE_SYSTEM' | translate }}</p><div id=app-settings><label class=checkbox><input type=checkbox ng-model=model.settings.autoLaunch focus-on=show ng-click=changeAutoLaunch(model.settings.autoLaunch)> {{ 'AUTO_START' | translate }}</label><div><label class=checkbox><input type=checkbox ng-change=changeReporting(model.settings.autoReport) ng-model=model.settings.autoReport> {{ 'AUTOREPORT_PROMPT' | translate }} <a ng-click=openExternal(EXTERNAL_URL.autoReportPrivacy) class=more-info>{{ 'MORE_INFO' | translate }}<sup><i class=icon-external-link></i></sup></a></label></div><div id=autoreport-warning ng-show=!model.settings.autoReport><i class=icon-exclamation-sign></i> {{ 'NO_AUTOREPORT_WARNING' | translate }}</div><label class=checkbox><input type=checkbox ng-model=model.settings.proxyAll focus-on=show ng-click=changeProxyAll(model.settings.proxyAll)> {{ 'PROXY_ALL_TRAFFIC' | translate }}</label></div></div><div ng-if=lanternWelcomeKey><p>{{ 'NOW_ACCESS' | translate }}</p><div class=logos><div class=social-logo><a href=https://facebook.com target=_blank><img src=../img/fb.png></a><div class=share-button><div class=fb-share-button data-href=https://getlantern.org data-layout=button_count></div></div></div><div class=social-logo><a href=https://twitter.com target=_blank><img src=../img/twitter.png></a><div class=share-button><iframe src="https://platform.twitter.com/widgets/tweet_button.html?&url=http%3A%2F%2Fgetlantern.org&via=getlantern&related=circumvention%2Ccensorship&text=I%27m%20using%20Lantern%20--%20an%20app%20for%20defeating%20Internet%20censorship" width=140 title="Twitter Tweet Button" style="border: 0; overflow: hidden;"></iframe></div></div></div></div></div><div class=modal-footer><button id=continueFromWelcome type=button class="btn btn-primary" ng-click=closeModal()>{{ 'CONTINUE' | translate }}</button></div></div><div id=waiting ng-show=!wsConnected><div ng-show=!backendIsGone><div>{{ 'WAITING_FOR_LANTERN' | translate }}</div><img src=img/spinner.gif></div><div ng-show=backendIsGone><div>{{ 'LANTERN_GONE' | translate }}</div><button type=button class="btn btn-primary" onclick=window.close();>{{ 'CLOSE_WINDOW' | translate }}</button></div></div><div ng-include="" src="'partials/topbar.html'"></div><div ng-include="" src="'partials/modals.html'"></div><div ng-include="" src="'partials/vis.html'" id=vis-container></div><div ng-include="" src="'partials/footer.html'"></div><div ng-include="" src="'partials/developer.html'"></div></body><!--<![endif]--></html>
+<![endif]--><!--[if (!IE)|(gte IE 10)]><!--><body ng-controller=RootCtrl ng-cloak="" lang="{{ lang }}" dir="{{ langDirection }}" ng-class="{showVis: model.showVis, getMode: inGetMode, giveMode: inGiveMode}"><div id=fb-root></div><div id=welcomescreen ng-show="wsConnected && currentModal == 'welcome'" modal=show class=modal ng-cloak=""><div class=modal-header><h3 ng-if=!lanternWelcomeKey>{{ 'WELCOME_TO_LANTERN' | translate }}</h3></div><div class=modal-body><div ng-controller=SettingsCtrl ng-if=!lanternWelcomeKey><p class=configure_system>{{'CONFIGURE_SYSTEM' | translate }}</p><div id=app-settings><label class=checkbox><input type=checkbox ng-model=model.settings.autoLaunch focus-on=show ng-click=changeAutoLaunch(model.settings.autoLaunch)> {{ 'AUTO_START' | translate }}</label> <label class=checkbox><input type=checkbox ng-model=model.settings.proxyAll focus-on=show ng-click=changeProxyAll(model.settings.proxyAll)> {{ 'PROXY_ALL_TRAFFIC' | translate }}</label><div><label class=checkbox><input type=checkbox ng-change=changeReporting(model.settings.autoReport) ng-model=model.settings.autoReport> {{ 'AUTOREPORT_PROMPT' | translate }} <a ng-click=openExternal(EXTERNAL_URL.autoReportPrivacy) class=more-info>{{ 'MORE_INFO' | translate }}<sup><i class=icon-external-link></i></sup></a></label></div><div id=autoreport-warning ng-show=!model.settings.autoReport><i class=icon-exclamation-sign></i> {{ 'NO_AUTOREPORT_WARNING' | translate }}</div></div></div><div ng-if=lanternWelcomeKey><p>{{ 'NOW_ACCESS' | translate }}</p><div class=logos><div class=social-logo><a href=https://facebook.com target=_blank><img src=../img/fb.png></a><div class=share-button><div class=fb-share-button data-href=https://getlantern.org data-layout=button_count></div></div></div><div class=social-logo><a href=https://twitter.com target=_blank><img src=../img/twitter.png></a><div class=share-button><iframe src="https://platform.twitter.com/widgets/tweet_button.html?&url=http%3A%2F%2Fgetlantern.org&via=getlantern&related=circumvention%2Ccensorship&text=I%27m%20using%20Lantern%20--%20an%20app%20for%20defeating%20Internet%20censorship" width=140 title="Twitter Tweet Button" style="border: 0; overflow: hidden;"></iframe></div></div></div></div></div><div class=modal-footer><button id=continueFromWelcome type=button class="btn btn-primary" ng-click=closeModal()>{{ 'CONTINUE' | translate }}</button></div></div><div id=waiting ng-show=!wsConnected><div ng-show=!backendIsGone><div>{{ 'WAITING_FOR_LANTERN' | translate }}</div><img src=img/spinner.gif></div><div ng-show=backendIsGone><div>{{ 'LANTERN_GONE' | translate }}</div><button type=button class="btn btn-primary" onclick=window.close();>{{ 'CLOSE_WINDOW' | translate }}</button></div></div><div ng-include="" src="'partials/topbar.html'"></div><div ng-include="" src="'partials/modals.html'"></div><div ng-include="" src="'partials/vis.html'" id=vis-container></div><div ng-include="" src="'partials/footer.html'"></div><div ng-include="" src="'partials/developer.html'"></div></body><!--<![endif]--></html>
diff --git a/src/github.com/getlantern/lantern-ui/dist/partials/modals.html b/src/github.com/getlantern/lantern-ui/dist/partials/modals.html
@@ -222,6 +222,12 @@ <h3>
           {{ 'AUTO_START' | translate }}
       </label>
 
+        <label class="checkbox">
+          <input type="checkbox" ng-model="model.settings.proxyAll" focus-on="show"
+          ng-click="changeProxyAll(model.settings.proxyAll)">
+          {{ 'PROXY_ALL_TRAFFIC' | translate }}
+        </label>
+
         <div>
           <label class="checkbox">
             <input type="checkbox" ng-model="model.settings.autoReport" ng-change="changeReporting(model.settings.autoReport)">
@@ -237,12 +243,6 @@ <h3>
           {{ 'NO_AUTOREPORT_WARNING' | translate }}
         </div>
 
-        <label class="checkbox">
-          <input type="checkbox" ng-model="model.settings.proxyAll" focus-on="show"
-          ng-click="changeProxyAll(model.settings.proxyAll)">
-          {{ 'PROXY_ALL_TRAFFIC' | translate }}
-        </label>
-
       </dd>
     </dl>
   </div>