move "add file" button to bottom button bar

diff --git a/data/templates/edit-add-button.htm b/data/templates/edit-add-button.htm
new file mode 100644 (file)
index 0000000..45e8873
--- /dev/null
+++ b/data/templates/edit-add-button.htm
@@ -0,0 +1,4 @@
+ <a class="btn" href="#" style="display:none" id="add-button">
+  <i class="icon-plus"></i>
+  Add file
+ </a>

diff --git a/data/templates/edit-add.htm b/data/templates/edit-add.htm
index 4713b5e1c3ad80c959bcddb518e45185a34cdd84..3a3741b4073b31fac664b98b8cd06fd94d15c29f 100644 (file)
--- a/data/templates/edit-add.htm
+++ b/data/templates/edit-add.htm
@@ -1,18 +1,11 @@
- <div class="well" style="text-align: center; display:none" id="add-button">
-    <a class="btn" href="#">
-     <i class="icon-plus"></i>
-     Add file
-    </a>
- </div>
-
- {% include 'edit-file.htm' with {'file': null, 'fileid': 'new', 'newfile': true} %}
+{% include 'edit-file.htm' with {'file': null, 'fileid': 'new', 'newfile': true} %}

 
 <script type="application/javascript">
 $(document).ready(function() {
     $('#add-button').show();
     $('#filegroupnew').hide();
 
 <script type="application/javascript">
 $(document).ready(function() {
     $('#add-button').show();
     $('#filegroupnew').hide();

-    $('#add-button a').bind('click', function() {
-        $('#add-button').before("{% filter escape('js') %}
+    $('#add-button').bind('click', function() {
+        $('.filegroup:last').before("{% filter escape('js') %}

             {% include 'edit-file.htm' with {'file': null, 'fileid': '###', 'newfile': true} %}
             {% endfilter %}"
             .replace(/###/g, $('.filegroup').length)
             {% include 'edit-file.htm' with {'file': null, 'fileid': '###', 'newfile': true} %}
             {% endfilter %}"
             .replace(/###/g, $('.filegroup').length)

diff --git a/data/templates/edit.htm b/data/templates/edit.htm
index 3f73fb685d8d17e5c80031cfa1d9c5bd83acd38c..2237e10916079b3724cce56e6f8af2e87cc10ce2 100644 (file)
--- a/data/templates/edit.htm
+++ b/data/templates/edit.htm
@@ -18,19 +18,20 @@
 
  {% include 'edit-add.htm' %}
 
 
  {% include 'edit-add.htm' %}
 

- <div class="well">
-  <div class="row-fluid">
-   <div class="span6">
+  <div class="row-fluid formbuttons">
+   <div class="span4">

     <a class="btn" href="{{repo.getLink('display')}}">Cancel</a>
    </div>
     <a class="btn" href="{{repo.getLink('display')}}">Cancel</a>
    </div>

-   <div class="span6" style="text-align: right">
+   <div class="span4" style="text-align: center">
+    {% include 'edit-add-button.htm' %}
+   </div>
+   <div class="span4" style="text-align: right">

     <button class="btn btn-primary" type="submit">
      <i class="icon-check icon-white"></i>
      Save
     </button>
    </div>
   </div>
     <button class="btn btn-primary" type="submit">
      <i class="icon-check icon-white"></i>
      Save
     </button>
    </div>
   </div>

- </div>

 
 </form>
 <script type="application/javascript">
 
 </form>
 <script type="application/javascript">

diff --git a/data/templates/new.htm b/data/templates/new.htm
index 8029b8c3dc8aa115b40bb735082b9e4b264d3aed..bc6c762a53e34e38b7bcfba60c19a61d0a842576 100644 (file)
--- a/data/templates/new.htm
+++ b/data/templates/new.htm
@@ -12,11 +12,17 @@
 
  {% include 'edit-add.htm' %}
 
 
  {% include 'edit-add.htm' %}
 

- <div class="well" style="text-align: right">
-  <button class="btn btn-primary" type="submit">
-   <i class="icon-check icon-white"></i>
-   Create
-  </button>
+ <div class="row-fluid formbuttons">
+  <div class="span4"></div>
+  <div class="span4" style="text-align: center">
+   {% include 'edit-add-button.htm' %}
+  </div>
+  <div class="span4" style="text-align: right">
+   <button class="btn btn-primary" type="submit">
+    <i class="icon-check icon-white"></i>
+    Create
+   </button>
+  </div>

  </div>
 
 </form>
  </div>
 
 </form>