Merge pull request #5 from falquinho/master

Made some changes to the layout. Mostly improved Mobile layout.
2024-12-28 16:11:55 +00:00 · 2018-05-21 14:05:57 -05:00 · 2018-05-21 14:05:57 -05:00 · d28e000b59
commit d28e000b59
parent ce951f71c8 7b0a5b2b59
6 changed files with 78 additions and 35 deletions
--- a/index.html
+++ b/index.html
@ -20,7 +20,7 @@

 </head>

-<body class="container-fluid">
+<body class="container-fluid" id="pageBody">
  <div class="row" id="title">
    <h1>Nintendo Switch Payload Loader</h1>
    <h4>Fusee Launcher ported to JavaScript using WebUSB.</h4>
@ -60,12 +60,7 @@

      <div class="alert alert-warning alert-dismissible" role="alert">
        <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-        <p>On Linux, you might get an access denied error! If you do, you can try creating a file at <code>/etc/udev/rules.d/50-switch.rules</code>With the following contents:<br><code>SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0955\", MODE=\"0664\", GROUP=\"plugdev\"</code></p>
-      </div>
-
-      <div class="alert alert-warning alert-dismissible" role="alert">
-        <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-        <p>Hekate for 4.x has not been tested, as I do not have a 4.x switch. However, all other payloads will be tested as they are uploaded.</p>
+        <p>On Linux, you might get an 'Access Denied' or 'No Compatible Device' error on the Connect dialog! If you do, you can try creating a file at <code>/etc/udev/rules.d/50-switch.rules</code>With the following contents:<br><code>SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0955\", MODE=\"0664\", GROUP=\"plugdev\"</code></p>
      </div>

      <div class="alert alert-warning alert-dismissible" role="alert">
@ -74,20 +69,21 @@
      </div>

      <div class="alert alert-info" role="alert">
-        <h4>Instructions:</h4>
+        <p><strong>Instructions:</strong></p>
        <ul>
          <li>Put the Switch in RCM, and connect it to your device.</li>
          <li>Select either the example payload, or upload one.</li>
          <li>Press 'Deliver Payload!'</li>
-          <li>On the consent screen that appears, select 'APX' and hit confirm.</li>
+          <li>On the consent screen that appears, select 'APX' and hit 'Connect'.</li>
          <li>If all goes well, the payload will launch!</li>
        </ul>
      </div>
+
    </div>
  </div>
  
  <div class="row">
-    <div class="class=col-md-8 col-md-offset-2 col-lg-6 col-lg-offset-3">
+    <div class="col-md-8 col-md-offset-2 col-lg-6 col-lg-offset-3">
        <h1>Setup Payload Delivery</h1>

        <form id="mainForm">
@ -108,7 +104,7 @@
          </div>

          <div class="row" id="uploadContainer" style="display: none">
-            <div class="row-xs-12">
+            <div class="col-xs-12">
              <input style="float: right" type="file" id="payloadUpload" accept=".bin"/>
            </div>
          </div>
@ -126,8 +122,8 @@
        </form>
  
        <div class="row margin-top-md">
-          <div class="col-xs-12">
-            <button class="btn btn-primary btn-lg pull-right" id="goButton">Deliver Payload!</button>
+          <div class="col-xs-6 col-xs-offset-6 col-md-4 col-md-offset-8">
+            <button class="btn btn-primary btn-lg btn-block" id="goButton">Deliver Payload!</button>
          </div>
        </div>
        
@ -136,7 +132,7 @@


  <div class="row">
-    <div class="class=col-md-8 col-md-offset-2 col-lg-6 col-lg-offset-3">
+    <div class="col-md-8 col-md-offset-2 col-lg-6 col-lg-offset-3">
        <h3>Log:</h3>
        <div id="output"></div>
        <button class="btn btn-primary pull-right margin-top-md" id="clearlogsbutton" onclick="clearLog();">Clear Logs</button><br><br>      
--- a/it_IT/index.html
+++ b/it_IT/index.html
@ -20,7 +20,7 @@

 </head>

-<body class="container-fluid">
+<body class="container-fluid" id="pageBody">
  <div class="row" id="title">
    <h1>Nintendo Switch Payload Loader</h1>
    <h4>Fusee Launcher portato a JavaScript usando WebUSB.</h4>
@ -58,18 +58,13 @@
        <p>Su Linux, potresti ottenere un errore Access Denied! Se succede, potresti provare a creare un file a <code>/etc/udev/rules.d/50-switch.rules</code>Con i seguenti contenuti:<br><code>SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0955\", MODE=\"0664\", GROUP=\"plugdev\"</code></p>
      </div>

-      <div class="alert alert-warning alert-dismissible" role="alert">
-        <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-        <p>Hekate 4.x non è stato testato visto che non ho una Switch 4.x. Tuttavia, tutti gli altri payload verranno testati al momento dell'aggiunta.</p>
-      </div>
-
      <div class="alert alert-warning alert-dismissible" role="alert">
        <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
        <p>Questo è stato testato e funziona su Linux, OSX, Android (no root) and Chromebooks. Risultati potrebbero variare.</p>
      </div>

      <div class="alert alert-info" role="alert">
-        <h4>Istruzioni:</h4>
+        <p><strong>Istruzioni:</strong></p>
        <ul>
          <li>Metti lo Switch in RCM e collega il dispositivo.</li>
          <li>Scegli il payload di esempio o caricane uno.</li>
@ -82,7 +77,7 @@
  </div>
  
  <div class="row">
-    <div class="class=col-md-8 col-md-offset-2 col-lg-6 col-lg-offset-3">
+    <div class="col-md-8 col-md-offset-2 col-lg-6 col-lg-offset-3">
        <h1>Setup Payload Delivery</h1>

        <form id="mainForm">
@ -103,7 +98,7 @@
          </div>

          <div class="row" id="uploadContainer" style="display: none">
-            <div class="row-xs-12">
+            <div class="col-xs-12">
              <input style="float: right" type="file" id="payloadUpload" accept=".bin"/>
            </div>
          </div>
@ -131,7 +126,7 @@


  <div class="row">
-    <div class="class=col-md-8 col-md-offset-2 col-lg-6 col-lg-offset-3">
+    <div class="col-md-8 col-md-offset-2 col-lg-6 col-lg-offset-3">
        <h3>Log:</h3>
        <div id="output"></div>
        <button class="btn btn-primary pull-right margin-top-md" id="clearlogsbutton" onclick="clearLog();">Pulisci Logs</button><br><br>      
--- a/it_IT/style.css
+++ b/it_IT/style.css
@ -1,5 +1,20 @@
@import url('https://fonts.googleapis.com/css?family=Open+Sans');

+@media only screen and (max-device-width: 768px) {
+  #title h1 {
+    font-size: 5vw;
+  }
+
+  #pageBody, #mainForm h4, #goButton, #clearlogsbutton, .btn-group a, #title h4 {
+    font-size: 3vw;
+  }
+
+  #shouldDebug {
+    width: 4vw;
+    height: 4vw;
+  }
+}
+
 body {
  margin-top: 0px;
  margin-left: 0px;
@ -20,6 +35,10 @@ body {
  top: 0px;
 }

+#uploadContainer {
+  margin-bottom: 8px;
+}
+
 #output {
  height: 200px;
  border: 1px solid black;
--- a/pt_BR/index.html
+++ b/pt_BR/index.html
@ -20,7 +20,7 @@

 </head>

-<body class="container-fluid">
+<body class="container-fluid" id="pageBody">
  <div class="row" id="title">
    <h1>Nintendo Switch Payload Loader</h1>
    <h4>Fusee Launcher portado para JavaScript usando WebUSB.</h4>
@ -55,12 +55,7 @@

      <div class="alert alert-warning alert-dismissible" role="alert">
        <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-        <p>No Linux você pode receber um erro de Acesso Negado! Caso receba, tente criar o arquivo <code>/etc/udev/rules.d/50-switch.rules</code> com o seguinte conteúdo: <br><code>SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0955\", MODE=\"0664\", GROUP=\"plugdev\"</code></p>
-      </div>
-
-      <div class="alert alert-warning alert-dismissible" role="alert">
-        <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-        <p>Hekate 4.x NÃO foi testado, já que não tenho um Switch na versão 4.x. Entretanto todos os outros payloads serão testados antes de disponibilizados.</p>
+        <p>No Linux você pode receber um erro de 'Acesso Negado' ou de 'Dispositivo Compatível não Encontrado'! Caso receba, tente criar o arquivo <code>/etc/udev/rules.d/50-switch.rules</code> com o seguinte conteúdo: <br><code>SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0955\", MODE=\"0664\", GROUP=\"plugdev\"</code></p>
      </div>

      <div class="alert alert-warning alert-dismissible" role="alert">
@ -69,12 +64,12 @@
      </div>

      <div class="alert alert-info" role="alert">
-        <h4>Instruções:</h4>
+        <p><strong>Instruções:</strong></p>
        <ul>
          <li>Coloque o Switch no modo RCM e conecte-o ao dispositivo.</li>
          <li>Escolha um dos payloads disponíveis ou faça upload de um.</li>
          <li>Clique em "Enviar Payload"!</li>
-          <li>No diálogo de confirmação escolha "APX" e clique em Confirmar</li>
+          <li>No diálogo de confirmação escolha "APX" e clique em 'Conectar-se'</li>
          <li>Se tudo der certo, o payload executará!</li>
        </ul>
      </div>
@ -103,7 +98,7 @@
          </div>

          <div class="row" id="uploadContainer" style="display: none">
-            <div class="row-xs-12">
+            <div class="col-xs-12">
              <input style="float: right" type="file" id="payloadUpload" accept=".bin"/>
            </div>
          </div>
@ -131,7 +126,7 @@


  <div class="row">
-    <div class="class=col-md-8 col-md-offset-2 col-lg-6 col-lg-offset-3">
+    <div class="col-md-8 col-md-offset-2 col-lg-6 col-lg-offset-3">
        <h3>Log:</h3>
        <div id="output"></div>
        <button class="btn btn-primary pull-right margin-top-md" id="clearlogsbutton" onclick="clearLog();">Limpar Logs</button><br><br>      
--- a/pt_BR/style.css
+++ b/pt_BR/style.css
@ -1,5 +1,20 @@
@import url('https://fonts.googleapis.com/css?family=Open+Sans');

+@media only screen and (max-device-width: 768px) {
+  #title h1 {
+    font-size: 5vw;
+  }
+
+  #pageBody, #mainForm h4, #goButton, #clearlogsbutton, .btn-group a, #title h4 {
+    font-size: 3vw;
+  }
+
+  #shouldDebug {
+    width: 4vw;
+    height: 4vw;
+  }
+}
+
 body {
  margin-top: 0px;
  margin-left: 0px;
@ -20,6 +35,10 @@ body {
  top: 0px;
 }

+#uploadContainer {
+  margin-bottom: 8px;
+}
+
 #output {
  height: 200px;
  border: 1px solid black;
--- a/style.css
+++ b/style.css
@ -1,5 +1,20 @@
@import url('https://fonts.googleapis.com/css?family=Open+Sans');

+@media only screen and (max-device-width: 768px) {
+  #title h1 {
+    font-size: 5vw;
+  }
+
+  #pageBody, #mainForm h4, #goButton, #clearlogsbutton, .btn-group a, #title h4 {
+    font-size: 3vw;
+  }
+
+  #shouldDebug {
+    width: 4vw;
+    height: 4vw;
+  }
+}
+
 body {
  margin-top: 0px;
  margin-left: 0px;
@ -20,6 +35,10 @@ body {
  top: 0px;
 }

+#uploadContainer {
+  margin-bottom: 8px;
+}
+
 #output {
  height: 200px;
  border: 1px solid black;