Merge branch 'master' into plugin-system

2025-11-01 19:15:59 +01:00 · 2014-06-05 20:54:28 +09:00
parent 0cb2116bdf 280113497b
commit 6f666ca49f
2 changed files with 3 additions and 3 deletions
--- a/src/main/twirl/main.scala.html
+++ b/src/main/twirl/main.scala.html
@@ -80,8 +80,8 @@
            </div><!--/.nav-collapse -->
          </div>
        </div>
-      </form>
-    </div>
+      </div>
+    </form>
    @body
    <script>
      $(function(){
--- a/src/main/twirl/wiki/page.scala.html
+++ b/src/main/twirl/wiki/page.scala.html
@@ -28,7 +28,7 @@
    <div style="width: 200px;" class="pull-right">
      <table class="table table-bordered">
        <tr>
-          <th class="metal">Pages</th>
+          <th class="metal">Pages <span class="label">@pages.length</span></th>
        </tr>
        <tr>
          <td>