Skip to content

Commit

Permalink
www: Bootstrap-styled buttons
Browse files Browse the repository at this point in the history
Replaced buttons with Bootstrap-styled ones. While at it, I took the
opportunity to changed the color from red (which generally symbolizes
errors) to green.

Also made a small CSS change to remove the white space to the left of
the date selector at the add/edit prefix page.
  • Loading branch information
garberg committed Oct 26, 2014
1 parent 47d9980 commit 68eef70
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions nipap-www/nipapwww/public/templates/pool_form.html
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,8 @@ <h3 ng-show="method == 'add'" class="options-group-heading">Properties of new po
<dt>
</dt>
<dd>
<input type="submit" class="button button_green" value="Add pool" ng-show="method == 'add'">
<input type="submit" class="button button_green" value="Save pool" ng-show="method == 'edit'">
<button class="btn btn-success" ng-show="method == 'add'">Add pool</button>
<button class="btn btn-success" ng-show="method == 'edit'">Save pool</button>
</dd>
</dl>
</div>
Expand Down
6 changes: 3 additions & 3 deletions nipap-www/nipapwww/public/templates/prefix_form.html
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ <h3 class="options-group-heading">Prefix options</h3>
Expires
</dt>
<dd>
<div class="col-md-6">
<div class="col-md-6" style="padding: 0px">
<p class="input-group">
<input type="text" class="form-control input-sm" datepicker-popup="yyyy-MM-dd HH:mm:ss" ng-model="prefix.expires" is-open="$parent.dpOpened" starting-day="1" ng-required="true" close-text="Close" />
<span class="input-group-btn">
Expand Down Expand Up @@ -364,8 +364,8 @@ <h3 class="options-group-heading">Prefix options</h3>
<dt>
</dt>
<dd>
<input class="button button_green" type="submit" value="Add" ng-show="method == 'add'">
<input class="button button_green" type="submit" value="Save" ng-show="method == 'edit'">
<button class="btn btn-success" ng-show="method == 'add'">Add prefix</button>
<button class="btn btn-success" ng-show="method == 'edit'">Save prefix</button>
</dd>
</dl>
</div>
Expand Down
4 changes: 2 additions & 2 deletions nipap-www/nipapwww/public/templates/vrf_form.html
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,8 @@ <h3 class="options-group-heading" ng-show="method == 'edit'">
<dl>
<dt></dt>
<dd>
<input class="button button_green" type="submit" value="Add" ng-show="method == 'add'">
<input class="button button_green" type="submit" value="Save" ng-show="method == 'edit'">
<button class="btn btn-success" ng-show="method == 'add'">Add VRF</button>
<button class="btn btn-success" ng-show="method == 'edit'">Save VRF</button>
</dd>
</dl>
</div>
Expand Down
6 changes: 3 additions & 3 deletions nipap-www/nipapwww/templates/macros.html
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
</div>
</td>
<td style="vertical-align: top; width: 87px; !important">
<div id="sbd">
<input name="search_button" type="submit" value="Search">
</div>
<button class="btn btn-primary" style="width: 70px">
<span class="glyphicon glyphicon-search"></span>
</button>
</td>
</tr>
</table>
Expand Down
2 changes: 1 addition & 1 deletion nipap-www/nipapwww/templates/pool_list.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</div>

<div style="position: absolute; right: 20px; top: 14px;">
{{ nipap.button('Add pool', color='red', url=h.url(controller = 'pool', action = 'add')) }}
<a href="/ng/pool#/pool/add" class="btn btn-success">Add pool</a>
</div>

<div style="text-align: center; padding: 30px;">
Expand Down
2 changes: 1 addition & 1 deletion nipap-www/nipapwww/templates/prefix_list.html
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
{{ nipap.prefix_search_form(c.search_opt_parent, c.search_opt_child) }}
<div style="position: absolute; right: 20px; top: 55px;">
<div class="btn-group" dropdown>
<button type="button" class="btn btn-danger dropdown-toggle">
<button type="button" class="btn btn-success dropdown-toggle">
Add prefix <span class="caret"></span>
</button>
<ul class="dropdown-menu" style="min-width: 120px">
Expand Down
2 changes: 1 addition & 1 deletion nipap-www/nipapwww/templates/vrf_list.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
{% block content %}

<div style="position: absolute; right: 20px; top: 14px;">
{{ nipap.button('Add VRF', color='red', url='/ng/vrf#/vrf/add') }}
<a href="/ng/vrf#/vrf/add" class="btn btn-success">Add VRF</a>
</div>

<div style="text-align: center; padding: 20px;">
Expand Down

0 comments on commit 68eef70

Please sign in to comment.