From 25ca30ce28ff8d23fe367d4f765370c9901c8842 Mon Sep 17 00:00:00 2001 From: benweet Date: Wed, 7 Aug 2013 23:34:12 +0100 Subject: [PATCH] Upgrade to Bootstrap 3 --- cache.manifest | 2 +- js/extensions/dialogAbout.js | 10 +- js/html/bodyIndex.html | 42 +-- js/html/dialogAbout.html | 101 +++++--- js/main-min.js | 479 +++++++++++++++++++---------------- js/utils.js | 2 +- run_deploy | 2 - tools/run_optimize | 2 + 8 files changed, 340 insertions(+), 300 deletions(-) diff --git a/cache.manifest b/cache.manifest index ca8d3724..8a3ff647 100644 --- a/cache.manifest +++ b/cache.manifest @@ -1,5 +1,5 @@ CACHE MANIFEST -# Sun 4 Aug 2013 18:48:25 IST +# Wed 7 Aug 2013 23:32:48 IST CACHE: index.html diff --git a/js/extensions/dialogAbout.js b/js/extensions/dialogAbout.js index 5cbf02af..bb565302 100644 --- a/js/extensions/dialogAbout.js +++ b/js/extensions/dialogAbout.js @@ -1,9 +1,10 @@ define([ - "jquery", "underscore", + "utils", "classes/Extension", + "text!../../version", "text!html/dialogAbout.html", -], function($, _, Extension, dialogAboutHTML) { +], function(_, utils, Extension, version, dialogAboutHTML) { var dialogAbout = new Extension("dialogAbout", 'Dialog "About"'); @@ -42,9 +43,10 @@ define([ }; dialogAbout.onReady = function() { - $("#modal-about .modal-body").html(_.template(dialogAboutHTML, { + utils.addModal('modal-about', _.template(dialogAboutHTML, { libraries: libraries, - projects: projects + projects: projects, + version: version })); }; diff --git a/js/html/bodyIndex.html b/js/html/bodyIndex.html index c536c065..2eac9104 100644 --- a/js/html/bodyIndex.html +++ b/js/html/bodyIndex.html @@ -21,7 +21,7 @@
  • + type="text" id="file-search" class="form-control">
    • @@ -43,16 +43,6 @@
    -
    - -
    -
    -
    -
    -
    +
    + +
    +
    +
    +
    +
    + +