make qrcode page large

codeskyblue · May 22, 2017 · caef8c0 · caef8c0
1 parent ea3d3fd
commit caef8c0
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 8 deletions.
diff --git a/res/css/style.css b/res/css/style.css
@@ -24,3 +24,11 @@ div.dropzone {
 .qrcode-title {
     font-size: 0.8em;
 }
+
+.clearfix::after {
+    clear: both;
+}
+
+#qrcodeCanvas {
+    padding-right: 20px;
+}
diff --git a/res/index.tmpl.html b/res/index.tmpl.html
@@ -165,7 +165,7 @@ <h3 class="panel-title" style="font-weight: normal">
     <div class="col-md-12" id="content">
       <!-- Small qrcode modal -->
       <div id="qrcode-modal" class="modal fade" tabindex="-1" role="dialog">
-        <div class="modal-dialog modal-sm">
+        <div class="modal-dialog">
           <div class="modal-content">
             <div class="modal-header">
               <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
@@ -174,8 +174,13 @@ <h4 class="modal-title">
                 <a style="font-size: 0.6em" href="#" id="qrcode-link">[view]</a>
               </h4>
             </div>
-            <div class="modal-body">
-              <div id="qrcodeCanvas"></div>
+            <div class="modal-body clearfix">
+              <div id="qrcodeCanvas" class="pull-left"></div>
+              <div id="qrcodeRight" class="pull-left">
+                <p>
+                  <a href="#">下载链接</a>
+                </p>
+              </div>
             </div>
           </div>
         </div>

diff --git a/res/js/index.js b/res/js/index.js
@@ -147,13 +147,15 @@ var vm = new Vue({
       }
       return encodeURI(urlPath);
     },
-    genQrcode: function(text, title) {
-      var urlPath = this.genInstallURL(text);
-      $("#qrcode-title").html(title || text);
-      $("#qrcode-link").attr("href", urlPath);
+    genQrcode: function(name, title) {
+      var installURL = this.genInstallURL(name);
+      $("#qrcode-title").html(title || name);
+      $("#qrcode-link").attr("href", installURL);
       $('#qrcodeCanvas').empty().qrcode({
-        text: urlPath
+        text: installURL
       });
+      console.log(name, location.origin, this.genDownloadURL(name));
+      $("#qrcodeRight a").attr("href", location.origin + encodeURI(pathJoin([location.pathname, name])));
       $("#qrcode-modal").modal("show");
     },
     genDownloadURL: function(f) {