updated a few dependencies

Kingboard · Feb 2, 2014 · 6865c9b · 6865c9b
1 parent a6fcaf8
commit 6865c9b
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 38 deletions.
diff --git a/composer.json b/composer.json
@@ -7,9 +7,9 @@
         "king23/king23": "0.3.*",
         "kingboard/ccpdump": "dev-master",
         "michelf/php-markdown": "1.3",
-        "twbs/bootstrap": "3.0.0",
+        "twbs/bootstrap": "3.1.*",
         "kriswallsmith/assetic": "1.1.2",
-        "frameworks/jquery": "1.10.2",
+        "frameworks/jquery": "1.11.*",
         "twitter/typeahead.js": "dev-master",
         "twig/extensions": "*",
         "packagist/yuicompressor-bin": "2.4.*"

diff --git a/composer.lock b/composer.lock
diff --git a/conf/assets.php b/conf/assets.php
@@ -14,7 +14,7 @@
 // js files
 $assets['js'][] = APP_PATH . "/vendor/frameworks/jquery/jquery.js";
 $assets['js'][] = APP_PATH . "/vendor/twbs/bootstrap/dist/js/bootstrap.min.js";
-$assets['js'][] = APP_PATH . "/vendor/twitter/typeahead.js/dist/typeahead.min.js";
+$assets['js'][] = APP_PATH . "/vendor/twitter/typeahead.js/dist/typeahead.jquery.js";
 $assets['js'][] = APP_PATH . "/public/js/common.js";
 $assets['js'][] = APP_PATH . "/public/js/bootstrap-datetimepicker.js";
 

diff --git a/src/Kingboard/Views/Base.php b/src/Kingboard/Views/Base.php
@@ -29,6 +29,10 @@ protected function isIGB()
         return isset($_SERVER['HTTP_EVE_TRUSTED']);
     }
 
+    protected function isCacheable() {
+        return false;
+    }
+
     /**
      * constructor, should be called by all derived views
      * will cause redirect if $loginrequired and not logged in

diff --git a/templates/kill.html b/templates/kill.html
@@ -136,13 +136,13 @@ <h3 class="panel-title">{{ killdata.killTime.sec|date("Y-m-d H:i:s") }}
     <li><a href="#comments" data-toggle="tab" data-disqus-identifier="{{ killdata.killID }}">Comments</a>
     </li>
     {% endif %}
-    <li><a href="#fittings" data-toggle="tab">Fittings</a></li>
+    {% if igb %} <li><a href="#fittings" data-toggle="tab">Fittings</a></li>{% endif %}
 </ul>
 <div class="page-header">
 </div>
 <div class="tab-content">
 <div class="tab-pane active" id="overview">
-    <div class="row">
+    <div class="col-md-12">
         <div class="col-md-4">
             <h3>Involved
                 <small>Alliance(s) / Corp(s)</small>
@@ -419,11 +419,11 @@ <h3>Item(s)
             class="logo-disqus">Disqus</span></a>
 </div>
 {% endif %}
+{% if igb %}
 <div id="fittings" class="tab-pane">
-    {% if igb %}<a
-        href="javascript:CCPEVE.showFitting('{{ killdata.victim.shipTypeID }}:{% for item in killdata.items %}{{ item.typeID }};{{ item.qtyDropped + item.qtyDestroyed }}:{% endfor %}:')">DNA
-    Fitting</a>{% endif %}
+    <a href="javascript:CCPEVE.showFitting('{{ killdata.victim.shipTypeID }}:{% for item in killdata.items %}{{ item.typeID }};{{ item.qtyDropped + item.qtyDestroyed }}:{% endfor %}:')">DNA Fitting</a>
 </div>
+{% endif %}
 </div>
 </div>
 </div>