Merge pull request #1694 from cormacmccarthy/fix-template-structure

fixes new templates structure source (destination was correct)

templates/underscore/bootstrap/button-group.html

@@ -0,0 +1,11 @@
+<!-- Button Group http://getbootstrap.com/components/#btn-groups -->
+<div class="form-group">
+  <label class="control-label<% if(horizontal) { %> col-sm-2<% } %>"><%= label %></label>
+  <div class="<%= buttonalign %><% if(horizontal) {%> col-sm-10<% } %>">
+    <div id="<%= id %>Group" class="btn-group" role="group" aria-label="<%= label %>">
+      <button type="<%= button1type %>" id="<%= id %>" name="<%= id %>" class='btn <%= button1style %><% if(inputsize.length > 0) {%> <%= inputsize %><% } %>' <% if(isDisabled) {%> disabled <% } %> aria-label="<%= button1label %>"><%= button1label %></button>
+      <button type="<%= button2type %>" id="<%= id2 %>" name="<%= id2 %>" class='btn <%= button2style %><% if(inputsize.length > 0) {%> <%= inputsize %><% } %>' <% if(isDisabled) {%> disabled <% } %> aria-label="<%= button1label %>"><%= button2label %></button>
+    </div>
+    <% if (helptext.length > 0) { %><p class="help-block"><%= helptext %></p><% } %>
+  </div>
+</div>

templates/underscore/bootstrap/button.html

@@ -0,0 +1,8 @@
+<!-- Button http://getbootstrap.com/css/#buttons -->
+<div class="form-group">
+  <label class="control-label<% if(horizontal) { %> col-sm-2<% } %>" for="<%= id %>"><%= label %></label>
+  <div class="<%= buttonalign %><% if(horizontal) {%> col-sm-10<% } %>">
+    <button type="<%= buttontype %>" id="<%= id %>" name="<%= id %>" class='btn <%= buttonstyle %><% if(inputsize.length > 0) {%> <%= inputsize %><% } %>' <% if(isDisabled) {%> disabled <% } %> aria-label="<%= label %>"><%= buttonlabel %></button>
+    <% if (helptext.length > 0) { %><p class="help-block"><%= helptext %></p><% } %>
+  </div>
+</div>

templates/underscore/bootstrap/file-button.html

@@ -0,0 +1,8 @@
+<!-- File Button http://getbootstrap.com/css/#forms -->
+<div class="form-group">
+  <label for="<%= id %>" class="control-label<% if(horizontal) { %> col-sm-2<% } %>"><%= label %></label>
+  <% if(horizontal) {%><div class="col-sm-10"><% } %>
+  <input type="file" id="<%= id %>" name="<%= id %>" <% if(required) {%> required <% } %><% if(readonly) {%> readonly <% } %><% if(isDisabled) {%> disabled <% } %>>
+  <% if (helptext.length > 0) { %><p class="help-block"><%= helptext %></p><% } %>
+  <% if(horizontal) {%></div><% } %>
+</div>

templates/underscore/bootstrap/input-with-button-dropdown.html

@@ -0,0 +1,18 @@
+<!-- Button Drop Down http://getbootstrap.com/components/#input-groups-buttons-dropdowns -->
+<div class="form-group<% if(horizontal && inputsize.length > 0) {%> form-group-<%= inputsize %><% } %>">
+  <label class="control-label<% if(horizontal) { %> col-sm-2<% } %>" for="<%= id %>Input"><%= label %></label>
+  <% if(horizontal) {%><div class="col-sm-10"><% } %>
+    <div class="input-group<% if(inputsize.length > 0) {%> input-group-<%= inputsize %><% } %>" id="<%= id %>">
+      <% if(placement=="appended") { %><input id="<%= id %>Input" name="<%= id %>Input" type="<%= inputtype %>" class="form-control<% if(!horizontal && inputsize.length > 0) {%> input-<%= inputsize %><% } %>" placeholder="<%= placeholder %>" aria-label=""<% if(required) {%> required <% } %><% if(readonly) {%> readonly <% } %><% if(isDisabled) {%> disabled <% } %>/><% } %>
+      <div class="input-group-btn<% if(placement=="appended") { %> pull-right<% } %>">
+        <button type="button" class="btn <%= buttonstyle %> dropdown-toggle<% if(inputsize.length > 0) {%> btn-<%= inputsize %><% } %>" data-toggle="dropdown" aria-label="<%= label %> related options" aria-haspopup="true" aria-expanded="false"<% if(required) {%> required <% } %><% if(readonly) {%> readonly <% } %><% if(isDisabled) {%> disabled <% } %>><%= buttontext %>&nbsp;<span class="caret"></span>
+        </button>
+        <ul class="dropdown-menu"><% _.each(buttonoptions, function(value) { %>
+          <li><a href="#"><%= value %></a></li><% }); %>
+        </ul>
+      </div><!-- /btn-group -->
+      <% if(placement=="prepended") { %><input id="<%= id %>Input" name="<%= id %>Input" type="<%= inputtype %>" class="form-control<% if(!horizontal && inputsize.length > 0) {%> input-<%= inputsize %><% } %>" placeholder="<%= placeholder %>" aria-label=""<% if(required) {%> required <% } %><% if(readonly) {%> readonly <% } %><% if(isDisabled) {%> disabled <% } %>/><% } %>
+    </div><!-- /input-group -->
+  <% if (helptext.length > 0) { %><p class="help-block"><%= helptext %></p><% } %>
+  <% if(horizontal) {%></div><% } %>
+</div>

templates/underscore/bootstrap/input-with-checkbox.html

@@ -0,0 +1,14 @@
+<!-- Appended checkbox http://getbootstrap.com/components/#input-groups-checkboxes-radios -->
+<div class="form-group<% if(horizontal && inputsize.length > 0) {%> form-group-<%= inputsize %><% } %>">
+  <label class="control-label<% if(horizontal) { %> col-sm-2<% } %>" for="<%= id %>Input"><%= label %></label>
+  <% if(horizontal) {%><div class="col-sm-10"><% } %>
+    <div class="input-group<% if(inputsize.length > 0) {%> input-group-<%= inputsize %><% } %>" id="<%= id %>">
+      <% if(placement=="appended") { %><input id="<%= id %>Input" name="<%= id %>Input" type="<%= inputtype %>" class="form-control<% if(!horizontal && inputsize.length > 0) {%> input-<%= inputsize %><% } %>" placeholder="<%= placeholder %>" aria-label=""<% if(required) {%> required <% } %><% if(readonly) {%> readonly <% } %><% if(isDisabled) {%> disabled <% } %> /><% } %>
+      <label class="input-group-addon checkbox-custom" data-initialize="checkbox">
+        <input class="sr-only" type="checkbox" aria-label="<%= checkboxValue %>" <% if (checked){ %>checked="checked"<% } %> id="<%= id %>Checkbox" value="<%= checkboxValue %>" <% if(readonly) {%> readonly <% } %><% if(isDisabled) {%> disabled <% } %> >
+      </label>
+      <% if(placement=="prepended") { %><input id="<%= id %>Input" name="<%= id %>Input" type="<%= inputtype %>" class="form-control<% if(!horizontal && inputsize.length > 0) {%> input-<%= inputsize %><% } %>" placeholder="<%= placeholder %>" aria-label=""<% if(required) {%> required <% } %><% if(readonly) {%> readonly <% } %><% if(isDisabled) {%> disabled <% } %> /><% } %>
+    </div>
+    <% if (helptext.length > 0) { %><p class="help-block"><%= helptext %></p><% } %>
+  <% if(horizontal) {%></div><% } %>
+</div>

templates/underscore/bootstrap/input-with-text.html

@@ -0,0 +1,12 @@
+<!-- Prepended text http://getbootstrap.com/components/#input-groups -->
+<div class="form-group<% if(horizontal && inputsize.length > 0) {%> form-group-<%= inputsize %><% } %>">
+  <label class="control-label<% if(horizontal) { %> col-sm-2<% } %>" for="<%= id %>"><%= label %></label>
+  <% if(horizontal) {%><div class="col-sm-10"><% } %>
+    <div class="input-group<% if(inputsize.length > 0) {%> input-group-<%= inputsize %><% } %>">
+      <% if(prepend) { %><span id="<%= id %>Prepend" class="input-group-addon<% if(!horizontal && inputsize.length > 0) {%> input-<%= inputsize %><% } %>"><%= prepend %></span><% } %>
+      <input id="<%= id %>" name="<%= id %>" class="form-control<% if(!horizontal && inputsize.length > 0) {%> input-<%= inputsize %><% } %>" placeholder="<%= placeholder %>" type="text"<% if(required) {%> required <% } %><% if(readonly) {%> readonly <% } %><% if(isDisabled) {%> disabled <% } %> />
+      <% if(append) { %><span id="<%= id %>Append" class="input-group-addon<% if(!horizontal && inputsize.length > 0) {%> input-<%= inputsize %><% } %>"><%= append %></span><% } %>
+    </div>
+    <% if (helptext.length > 0) { %><p class="help-block"><%= helptext %></p><% } %>
+  <% if(horizontal) {%></div><% } %>
+</div>

templates/underscore/bootstrap/input.html

@@ -0,0 +1,8 @@
+<!-- Text input http://getbootstrap.com/css/#forms -->
+<div class="form-group<% if(horizontal && inputsize.length > 0) {%> form-group-<%= inputsize %><% } %>">
+  <label for="<%= id %>" class="control-label<% if(horizontal) { %> col-sm-2<% } %>"><%= label %></label>
+  <% if(horizontal) {%><div class="col-sm-10"><% } %>
+    <input type="<%= inputtype %>" class="<% if(!horizontal && inputsize.length > 0) {%>input-<%= inputsize %> <% } %>form-control" id="<%= id %>" placeholder="<%= placeholder %>"<% if(required) {%> required <% } %><% if(readonly) {%> readonly <% } %><% if(isDisabled) {%> disabled <% } %>>
+    <% if (helptext.length > 0) { %><p class="help-block"><%= helptext %></p><% } %>
+  <% if(horizontal) {%></div><% } %>
+</div>

templates/underscore/bootstrap/select.html

@@ -0,0 +1,10 @@
+<!-- Bootstrap Select http://getbootstrap.com/css/#selects -->
+<div class="form-group">
+  <label class="control-label<% if(horizontal) { %> col-sm-2<% } %>" for="<%= id %>"><%= label %></label>
+  <div class="controls <% if(horizontal) {%> col-sm-10<% } %>">
+    <select id="<%= id %>" name="<%= id %>" class="form-control<% if(inputsize.length > 0) {%> <%= inputsize %><% } %>"<% if(multiple) {%> multiple <% } %><% if(required) {%> required <% } %><% if(readonly) {%> readonly <% } %><% if(isDisabled) {%> disabled <% } %>><% _.each(options, function(option) { %>
+      <option><%= option %></option><% }); %>
+    </select>
+    <% if (helptext.length > 0) { %><p class="help-block"><%= helptext %></p><% } %>
+  </div>
+</div>

templates/underscore/bootstrap/textarea.html

@@ -0,0 +1,8 @@
+<!-- Textarea http://getbootstrap.com/css/#textarea -->
+<div class="form-group">
+  <label class="control-label<% if(horizontal) { %> col-sm-2<% } %>" for="<%= id %>"><%= label %></label>
+  <% if(horizontal) {%><div class="col-sm-10"><% } %>
+    <textarea class="form-control" id="<%= id %>" name="<%= id %>" rows="<%= rows %>"<% if(required) {%> required <% } %><% if(readonly) {%> readonly <% } %><% if(isDisabled) {%> disabled <% } %>><%= textarea %></textarea>
+    <% if (helptext.length > 0) { %><p class="help-block"><%= helptext %></p><% } %>
+  <% if(horizontal) {%></div><% } %>
+</div>

templates/underscore/fuelux/checkboxes-inline.html

@@ -0,0 +1,11 @@
+<!-- Fuel UX Checkboxes Inline http://getfuelux.com/javascript.html#checkbox-examples-inline -->
+<div class="form-group">
+  <label for="<%= name %>" class="control-label<% if(horizontal) { %> col-sm-2<% } %>"><%= label %></label>
+
+  <div class="checkbox<% if(horizontal) {%> col-sm-10<% } %><% if(required) {%> required<% } %>">
+    <% _.each(checkboxes, function(checkbox, i){ %><label class="checkbox-custom checkbox-inline<% if(isDisabled) {%> disabled<% } %>" data-initialize="checkbox" id="<%= name+'-'+i %>">
+      <input class="sr-only" name="<%= name %>" type="checkbox" value="<%= checkbox %>"<% if(readonly) {%> readonly <% } %><% if(isDisabled) {%> disabled <% } %>> <span class="checkbox-label"><%= checkbox %></span>
+    </label><% }); %>
+    <% if (helptext.length > 0) { %><p class="help-block"><%= helptext %></p><% } %>
+  </div>
+</div>

templates/underscore/fuelux/checkboxes.html

@@ -0,0 +1,13 @@
+<!-- Fuel UX Checkboxes http://getfuelux.com/javascript.html#checkbox -->
+<div class="form-group">
+  <label for="<%= name %>" class="control-label<% if(horizontal) { %> col-sm-2<% } %>"><%= label %></label>
+  <div class="<% if(horizontal) {%> col-sm-10<% } %><% if(required) {%> required<% } %>">
+    <% _.each(checkboxes, function(checkbox, i){ %><div class="checkbox">
+      <label class="checkbox-custom<% if(isDisabled) {%> disabled<% } %>" data-initialize="checkbox" id="<%= name+'-'+i %>">
+        <input class="sr-only" name="<%= name %>" type="checkbox" value="<%= checkbox %>"<% if(readonly) {%> readonly <% } %><% if(isDisabled) {%> disabled <% } %>>
+        <span class="checkbox-label"><%= checkbox %></span>
+      </label>
+    </div><% }); %>
+    <% if (helptext.length > 0) { %><p class="help-block"><%= helptext %></p><% } %>
+  </div>
+</div>

templates/underscore/fuelux/input-with-combobox.html

@@ -0,0 +1,17 @@
+<!-- Input With Combobox http://getfuelux.com/javascript.html#combobox -->
+<div class="form-group<% if(horizontal && inputsize.length > 0) {%> form-group-<%= inputsize %><% } %>">
+  <label class="control-label<% if(horizontal) { %> col-sm-2<% } %>" for="<%= id %>Input"><%= label %></label>
+  <% if(horizontal) {%><div class="col-sm-10"><% } %>
+    <div class="input-group <% if(placement=="appended") { %>input-append<% } else { %>input-prepend<% } %> dropdown combobox<% if(inputsize.length > 0) {%> input-group-<%= inputsize %><% } %>" data-initialize="combobox" id="<%= id %>">
+      <% if(placement=="appended") { %><input id="<%= id %>Input" name="<%= id %>Input" type="<%= inputtype %>" aria-label="" class="form-control<% if(!horizontal && inputsize.length > 0) {%> input-<%= inputsize %><% } %>" placeholder="<%= placeholder %>" <% if(required) {%> required <% } %><% if(readonly) {%> readonly <% } %><% if(isDisabled) {%> disabled <% } %> /><% } %>
+      <div class="input-group-btn">
+        <button type="button" class="btn <%= buttonstyle %> dropdown-toggle<% if(inputsize.length > 0) {%> btn-<%= inputsize %><% } %>" aria-label="<%= label %> autofill suggestions" data-toggle="dropdown"><span class="caret"></span></button>
+        <ul class="dropdown-menu dropdown-menu-right" role="menu"><% _.each(buttonoptions, function(value) { %>
+          <li data-value="<%= value %>"><a href="#"><%= value %></a></li><% }); %>
+        </ul>
+      </div>
+      <% if(placement=="prepended") { %><input id="<%= id %>Input" name="<%= id %>Input" type="<%= inputtype %>" aria-label="" class="form-control<% if(!horizontal && inputsize.length > 0) {%> input-<%= inputsize %><% } %>" placeholder="<%= placeholder %>"<% if(required) {%> required <% } %><% if(readonly) {%> readonly <% } %><% if(isDisabled) {%> disabled <% } %> /><% } %>
+    </div>
+    <% if (helptext.length > 0) { %><p class="help-block"><%= helptext %></p><% } %>
+  <% if(horizontal) {%></div><% } %>
+</div>

templates/underscore/fuelux/radios-inline.html

@@ -0,0 +1,11 @@
+<!-- Fuel UX Radios Inline http://getfuelux.com/javascript.html#radio-examples-inline -->
+<div class="form-group">
+  <label for="<%= name %>" class="control-label<% if(horizontal) { %> col-sm-2<% } %>"><%= label %></label>
+
+  <div class="radio<% if(horizontal) {%> col-sm-10<% } %><% if(required) {%> required <% } %>">
+      <% _.each(radios, function(radio, i){ %><label class="radio-custom radio-inline<% if(isDisabled) {%> disabled<% } %>" data-initialize="radio" id="<%= name+'-'+i %>">
+        <input class="sr-only" name="<%= name %>" type="radio" value="<%= radio %>"<% if(readonly) {%> readonly <% } %><% if(isDisabled) {%> disabled <% } %>> <span class="radio-label"><%= radio %></span>
+      </label><% }); %>
+    <% if (helptext.length > 0) { %><p class="help-block"><%= helptext %></p><% } %>
+  </div>
+</div>

templates/underscore/fuelux/radios.html

@@ -0,0 +1,13 @@
+<!-- Fuel UX Radios http://getfuelux.com/javascript.html#radio -->
+<div class="form-group">
+  <label for="<%= name %>" class="control-label<% if(horizontal) { %> col-sm-2<% } %>"><%= label %></label>
+  <div class="<% if(horizontal) {%> col-sm-10<% } %><% if(required) {%> required<% } %>">
+    <% _.each(radios, function(radio, i){ %><div class="radio">
+      <label class="radio-custom<% if(isDisabled) {%> disabled<% } %>" data-initialize="radio" id="<%= name+'-'+i %>">
+        <input class="sr-only" name="<%= name %>" type="radio" value="<%= radio %>"<% if(readonly) {%> readonly <% } %><% if(isDisabled) {%> disabled <% } %>>
+        <span class="radio-label"><%= radio %></span>
+      </label>
+    </div><% }); %>
+    <% if (helptext.length > 0) { %><p class="help-block"><%= helptext %></p><% } %>
+  </div>
+</div>

templates/underscore/fuelux/search.html

@@ -0,0 +1,17 @@
+<!-- Input With Search http://getfuelux.com/javascript.html#search-->
+<div class="form-group<% if(horizontal && inputsize.length > 0) {%> form-group-<%= inputsize %><% } %>">
+  <label class="control-label<% if(horizontal) { %> col-sm-2<% } %>" for="<%= id %>Input"><%= label %></label>
+  <% if(horizontal) {%><div class="col-sm-10"><% } %>
+    <div class="search input-group<% if(inputsize.length > 0) {%> input-group-<%= inputsize %><% } %>" data-initialize="search" role="search" id="<%= id %>">
+      <% if(placement=="appended") { %><input id="<%= id %>Input" name="<%= id %>Input" class="form-control<% if(!horizontal && inputsize.length > 0) {%> input-<%= inputsize %><% } %>" placeholder="<%= placeholder %>" type="search"<% if(required) {%> required <% } %><% if(readonly) {%> readonly <% } %><% if(isDisabled) {%> disabled <% } %>/><% } %>
+      <span class="input-group-btn">
+        <button class="btn btn-default<% if(inputsize.length > 0) {%> btn-<%= inputsize %><% } %>" type="button"<% if(readonly) {%> readonly <% } %><% if(isDisabled) {%> disabled <% } %>>
+          <span class="glyphicon glyphicon-search"></span>
+          <span class="sr-only">Search</span>
+        </button>
+      </span>
+      <% if(placement=="prepended") { %><input id="<%= id %>Input" name="<%= id %>Input" class="form-control<% if(!horizontal && inputsize.length > 0) {%> input-<%= inputsize %><% } %>" placeholder="<%= placeholder %>" type="search"<% if(required) {%> required <% } %><% if(readonly) {%> readonly <% } %><% if(isDisabled) {%> disabled <% } %>/><% } %>
+    </div>
+    <% if (helptext.length > 0) { %><p class="help-block"><%= helptext %></p><% } %>
+  <% if(horizontal) {%></div><% } %>
+</div>

templates/underscore/fuelux/selectlist.html

@@ -0,0 +1,18 @@
+<!-- Fuel UX Select http://getfuelux.com/javascript.html#selectlist -->
+<div class="form-group">
+  <label class="control-label<% if(horizontal) { %> col-sm-2<% } %>" for="<%= id %>"><%= label %></label>
+  <div class="controls <%= buttonalign %><% if(horizontal) {%> col-sm-10<% } %>">
+    <div class="btn-group selectlist" data-initialize="selectlist" data-resize="auto" id="<%= id %>">
+      <button class="btn btn-default dropdown-toggle<% if(inputsize.length > 0) {%> <%= inputsize %><% } %>" data-toggle="dropdown" type="button"<% if(required) {%> required <% } %><% if(readonly) {%> readonly <% } %><% if(isDisabled) {%> disabled <% } %>>
+        <span class="selected-label">&nbsp;</span>
+        <span class="caret"></span>
+        <span class="sr-only">Toggle Dropdown</span>
+      </button>
+      <ul class="dropdown-menu" role="menu"><% _.each(options, function(option) { %>
+        <li data-value="<%= option %>"><a href="#"><%= option %></a></li><% }); %>
+      </ul>
+      <input class="hidden hidden-field" name="<%= id %>" readonly="readonly" aria-hidden="true" type="text"/>
+    </div>
+    <% if (helptext.length > 0) { %><p class="help-block"><%= helptext %></p><% } %>
+  </div>
+</div>

templates/underscore/fuelux/spinbox.html

@@ -0,0 +1,18 @@
+<!-- Spinbox http://getfuelux.com/javascript.html#spinbox -->
+<div class="form-group">
+  <label for="<%= id %>" class="control-label<% if(horizontal) { %> col-sm-2<% } %>"><%= label %></label>
+  <div<% if(horizontal) {%> class="col-sm-10"<% } %>>
+    <div class="spinbox" data-initialize="spinbox" id="<%= id %>">
+      <input id="<%= id %>Input" type="text" class="form-control input-mini spinbox-input" value="<%= placeholder %>" <% if(required) {%> required <% } %><% if(readonly) {%> readonly <% } %><% if(isDisabled) {%> disabled <% } %>>
+      <div class="spinbox-buttons btn-group btn-group-vertical">
+        <button type="button" class="btn btn-default spinbox-up btn-xs"<% if(isDisabled) {%> disabled<% } %>>
+          <span class="glyphicon glyphicon-chevron-up"></span><span class="sr-only">Increase</span>
+        </button>
+        <button type="button" class="btn btn-default spinbox-down btn-xs"<% if(isDisabled) {%> disabled<% } %>>
+          <span class="glyphicon glyphicon-chevron-down"></span><span class="sr-only">Decrease</span>
+        </button>
+      </div>
+    </div>
+    <% if (helptext.length > 0) { %><p class="help-block"><%= helptext %></p><% } %>
+  </div>
+</div>