From 03b01c844edfee767cf31fa054cb1374c22fdff3 Mon Sep 17 00:00:00 2001 From: Chris Hallberg <crhallberg@gmail.com> Date: Wed, 16 Jul 2014 11:14:07 -0400 Subject: [PATCH] btn-default added to regular buttons to drastially simplify styling. --- themes/bootprint3/less/bootprint.less | 27 +++++++++++-------- themes/bootstrap3/less/bootstrap.less | 1 - .../templates/Auth/Database/recovery.phtml | 2 +- .../Recommend/CollectionSideFacets.phtml | 2 +- .../templates/Recommend/SideFacets.phtml | 2 +- .../RecordDriver/SolrDefault/toolbar.phtml | 4 +-- .../templates/RecordTab/hierarchytree.phtml | 2 +- .../templates/RecordTab/usercomments.phtml | 2 +- .../templates/alphabrowse/home.phtml | 2 +- themes/bootstrap3/templates/author/home.phtml | 2 +- themes/bootstrap3/templates/cart/cart.phtml | 12 ++++----- themes/bootstrap3/templates/cart/export.phtml | 2 +- themes/bootstrap3/templates/cart/save.phtml | 2 +- .../templates/collections/home.phtml | 2 +- .../templates/confirm/confirm.phtml | 2 +- .../templates/install/fixdatabase.phtml | 2 +- .../templates/install/fixsecurity.phtml | 4 +-- .../myresearch/bulk-action-buttons.phtml | 8 +++--- .../templates/myresearch/checkedout.phtml | 4 +-- .../templates/myresearch/profile.phtml | 2 +- themes/bootstrap3/templates/oai/home.phtml | 12 ++++----- .../search/bulk-action-buttons.phtml | 2 +- .../templates/search/controls/sort.phtml | 2 +- .../templates/search/reservessearch.phtml | 2 +- .../templates/upgrade/getsourcedir.phtml | 4 +-- .../templates/upgrade/showsql.phtml | 2 +- themes/bootstrap3/templates/vudl/record.phtml | 4 +-- .../templates/vudl/views/page.phtml | 10 +++---- 28 files changed, 64 insertions(+), 60 deletions(-) diff --git a/themes/bootprint3/less/bootprint.less b/themes/bootprint3/less/bootprint.less index 449229c29e6..d88e5d97fcf 100644 --- a/themes/bootprint3/less/bootprint.less +++ b/themes/bootprint3/less/bootprint.less @@ -27,17 +27,19 @@ body { padding-top:.3em; } } -.btn:not(.btn-danger):not(.btn-info):not(.btn-link):not(.btn-primary):not(.btn-success):not(.btn-warning) { - background:@gray-lighter; - background-image:linear-gradient(#FFF, @nav-tabs-border-color); - border:1px solid @gray-light; - color:@gray-darker; - text-shadow:0 1px 0 #FFF; - &:hover { - background:@link-color; - border:1px solid @link-color; - color:#FFF; - text-shadow:none; +.btn { + padding:3px 5px 2px; + &.btn-default { + background:@gray-lighter; + background-image:linear-gradient(#FFF, @nav-tabs-border-color); + border:1px solid @gray-light; + color:@gray-darker; + text-shadow:0 1px 0 #FFF; + &:hover { + border:1px solid @gray-dark; + color:@gray-darker; + text-shadow:none; + } } } .btn-danger, .btn-danger:hover {border-color:darken(@brand-danger, 12%);font-weight:bold;} @@ -140,6 +142,9 @@ header { .nav-tabs { padding:0 6px; } + #searchForm_lookfor { + border-color:@brand-primary; + } .tab-content { border:0; .navbar-text { diff --git a/themes/bootstrap3/less/bootstrap.less b/themes/bootstrap3/less/bootstrap.less index bf1836f813d..16813a4f9fb 100644 --- a/themes/bootstrap3/less/bootstrap.less +++ b/themes/bootstrap3/less/bootstrap.less @@ -1,7 +1,6 @@ @import "bootstrap/bootstrap"; @import "a11y"; -.btn {&:extend(.btn-default all);} .fa {cursor:default} .form-control { @media(min-width:768px) { diff --git a/themes/bootstrap3/templates/Auth/Database/recovery.phtml b/themes/bootstrap3/templates/Auth/Database/recovery.phtml index df0b6b927a4..4ec81769123 100644 --- a/themes/bootstrap3/templates/Auth/Database/recovery.phtml +++ b/themes/bootstrap3/templates/Auth/Database/recovery.phtml @@ -13,5 +13,5 @@ <?=$this->recaptcha()->html($this->useRecaptcha) ?> <div class="form-group"> <div class="col-sm-9 col-sm-offset-3"> - <input class="btn" name="submit" type="submit"/> + <input class="btn btn-default" name="submit" type="submit"/> </div> \ No newline at end of file diff --git a/themes/bootstrap3/templates/Recommend/CollectionSideFacets.phtml b/themes/bootstrap3/templates/Recommend/CollectionSideFacets.phtml index 16a2c774997..d800ffdec57 100644 --- a/themes/bootstrap3/templates/Recommend/CollectionSideFacets.phtml +++ b/themes/bootstrap3/templates/Recommend/CollectionSideFacets.phtml @@ -32,7 +32,7 @@ <input type="hidden" name="filter[]" value="<?=$this->escapeHtmlAttr($filter['field'])?>:"<?=$this->escapeHtmlAttr($filter['value'])?>"" /> <? endforeach; ?> <? endforeach; ?> - <input class="btn" type="submit" name="submit" value="<?=$this->transEsc('Set')?>"/> + <input class="btn btn-default" type="submit" name="submit" value="<?=$this->transEsc('Set')?>"/> </form> </div> </div> diff --git a/themes/bootstrap3/templates/Recommend/SideFacets.phtml b/themes/bootstrap3/templates/Recommend/SideFacets.phtml index 58bbd663eda..e6793ccfb92 100644 --- a/themes/bootstrap3/templates/Recommend/SideFacets.phtml +++ b/themes/bootstrap3/templates/Recommend/SideFacets.phtml @@ -81,7 +81,7 @@ <? if ($rangeFacets[$title]['type'] == 'date'): ?> <div class="slider-container"><input type="text" class="hidden" id="<?=$this->escapeHtmlAttr($title)?><?=$this->escapeHtml($rangeFacets[$title]['type'])?>Slider"/></div> <? endif; ?> - <input class="btn" type="submit" value="<?=$this->transEsc('Set')?>"/> + <input class="btn btn-default" type="submit" value="<?=$this->transEsc('Set')?>"/> </form> </li> <? if ($rangeFacets[$title]['type'] == 'date'): ?> diff --git a/themes/bootstrap3/templates/RecordDriver/SolrDefault/toolbar.phtml b/themes/bootstrap3/templates/RecordDriver/SolrDefault/toolbar.phtml index e3b74989055..5cf00aa3b64 100644 --- a/themes/bootstrap3/templates/RecordDriver/SolrDefault/toolbar.phtml +++ b/themes/bootstrap3/templates/RecordDriver/SolrDefault/toolbar.phtml @@ -44,9 +44,9 @@ <form method="post" name="addForm" action="<?=$this->url('cart-home')?>"> <input type="hidden" name="ids[]" value="<?=$this->escapeHtmlAttr($cartId)?>" /> <? if ($cart->contains($cartId)): ?> - <input class="btn" type="submit" name="delete" value="<?=$this->transEsc('Remove from Book Bag')?>"/> + <input class="btn btn-default" type="submit" name="delete" value="<?=$this->transEsc('Remove from Book Bag')?>"/> <? else: ?> - <input class="btn" type="submit" name="add" value="<?=$this->transEsc('Add to Book Bag')?>"/> + <input class="btn btn-default" type="submit" name="add" value="<?=$this->transEsc('Add to Book Bag')?>"/> <? endif; ?> </form> </noscript> diff --git a/themes/bootstrap3/templates/RecordTab/hierarchytree.phtml b/themes/bootstrap3/templates/RecordTab/hierarchytree.phtml index 3096abc9113..bb65137713e 100644 --- a/themes/bootstrap3/templates/RecordTab/hierarchytree.phtml +++ b/themes/bootstrap3/templates/RecordTab/hierarchytree.phtml @@ -40,7 +40,7 @@ <option value="AllFields"><?=$this->transEsc('All Fields')?></option> <option value="Title"><?=$this->transEsc('Title')?></option> </select> - <input type="submit" class="btn" value="<?=$this->transEsc('Search') ?>"/> + <input type="submit" class="btn btn-default" value="<?=$this->transEsc('Search') ?>"/> <i id="treeSearchLoadingImg" class="fa fa-spinner fa-spin hidden"></i> </div> <div id="treeSearchNoResults" class="alert alert-danger hidden"><?=$this->translate('nohit_heading')?></div> diff --git a/themes/bootstrap3/templates/RecordTab/usercomments.phtml b/themes/bootstrap3/templates/RecordTab/usercomments.phtml index 7c66f6d8355..5d0167dd793 100644 --- a/themes/bootstrap3/templates/RecordTab/usercomments.phtml +++ b/themes/bootstrap3/templates/RecordTab/usercomments.phtml @@ -12,7 +12,7 @@ </div> <div class="col-sm-9"> <textarea id="comment" name="comment" class="form-control" rows="3" required></textarea><br/> - <input class="btn" data-loading-text="<?=$this->transEsc('Submitting') ?>..." type="submit" value="<?=$this->transEsc("Add your comment")?>"/> + <input class="btn btn-default" data-loading-text="<?=$this->transEsc('Submitting') ?>..." type="submit" value="<?=$this->transEsc("Add your comment")?>"/> </div> <input type="hidden" name="id" value="<?=$this->escapeHtmlAttr($this->driver->getUniqueId())?>"/> <input type="hidden" name="source" value="<?=$this->escapeHtmlAttr($this->driver->getResourceSource())?>"/> diff --git a/themes/bootstrap3/templates/alphabrowse/home.phtml b/themes/bootstrap3/templates/alphabrowse/home.phtml index f44a9ee03c7..83c152b8482 100644 --- a/themes/bootstrap3/templates/alphabrowse/home.phtml +++ b/themes/bootstrap3/templates/alphabrowse/home.phtml @@ -33,7 +33,7 @@ </select> <label for="alphaBrowseForm_from"><?=$this->transEsc('starting from') ?></label> <input type="text" name="from" id="alphaBrowseForm_from" value="<?=$this->escapeHtmlAttr($this->from) ?>"/> - <input class="btn" type="submit" value="<?=$this->transEsc('Browse') ?>"/> + <input class="btn btn-default" type="submit" value="<?=$this->transEsc('Browse') ?>"/> </form> </div> diff --git a/themes/bootstrap3/templates/author/home.phtml b/themes/bootstrap3/templates/author/home.phtml index d4f21dc9a3a..2944175077c 100644 --- a/themes/bootstrap3/templates/author/home.phtml +++ b/themes/bootstrap3/templates/author/home.phtml @@ -8,5 +8,5 @@ <form class="form-inline" method="get" action="<?=$this->url('author-search')?>"> <label for="author_lookfor"><?=$this->transEsc('Author Results for')?>:</label></br> <input type="text" id="author_lookfor" name="lookfor" /> - <input class="btn" type="submit" value="<?=$this->transEsc('Find')?>" /> + <input class="btn btn-default" type="submit" value="<?=$this->transEsc('Find')?>" /> </form> diff --git a/themes/bootstrap3/templates/cart/cart.phtml b/themes/bootstrap3/templates/cart/cart.phtml index f6a1de42b5f..f7e3db42c4a 100644 --- a/themes/bootstrap3/templates/cart/cart.phtml +++ b/themes/bootstrap3/templates/cart/cart.phtml @@ -14,15 +14,15 @@ | <?=$this->transEsc('with_selected')?>: </label> <? if ($this->userlist()->getMode() !== 'disabled'): ?> - <input class="btn" type="submit" name="saveCart" value="<?=$this->transEsc('bookbag_save_selected')?>" title="<?=$this->transEsc('bookbag_save')?>"/> + <input class="btn btn-default" type="submit" name="saveCart" value="<?=$this->transEsc('bookbag_save_selected')?>" title="<?=$this->transEsc('bookbag_save')?>"/> <? endif; ?> - <input class="btn" type="submit" name="email" value="<?=$this->transEsc('bookbag_email_selected')?>" title="<?=$this->transEsc('bookbag_email')?>"/> + <input class="btn btn-default" type="submit" name="email" value="<?=$this->transEsc('bookbag_email_selected')?>" title="<?=$this->transEsc('bookbag_email')?>"/> <? $exportOptions = $this->export()->getBulkOptions(); if (count($exportOptions) > 0): ?> - <input class="btn" type="submit" name="export" value="<?=$this->transEsc('bookbag_export_selected')?>" title="<?=$this->transEsc('bookbag_export')?>"/> + <input class="btn btn-default" type="submit" name="export" value="<?=$this->transEsc('bookbag_export_selected')?>" title="<?=$this->transEsc('bookbag_export')?>"/> <? endif; ?> - <input class="btn" type="submit" name="print" value="<?=$this->transEsc('bookbag_print_selected')?>" title="<?=$this->transEsc('print_selected')?>"/> - <input class="btn" type="submit" name="delete" value="<?=$this->transEsc('bookbag_delete_selected')?>" title="<?=$this->transEsc('bookbag_delete')?>"/> - <input class="btn" type="submit" name="empty" value="<?=$this->transEsc('Empty Book Bag')?>" title="<?=$this->transEsc('Empty Book Bag')?>"/> + <input class="btn btn-default" type="submit" name="print" value="<?=$this->transEsc('bookbag_print_selected')?>" title="<?=$this->transEsc('print_selected')?>"/> + <input class="btn btn-default" type="submit" name="delete" value="<?=$this->transEsc('bookbag_delete_selected')?>" title="<?=$this->transEsc('bookbag_delete')?>"/> + <input class="btn btn-default" type="submit" name="empty" value="<?=$this->transEsc('Empty Book Bag')?>" title="<?=$this->transEsc('Empty Book Bag')?>"/> <? endif; ?> <?=$this->render('cart/contents.phtml')?> </form> diff --git a/themes/bootstrap3/templates/cart/export.phtml b/themes/bootstrap3/templates/cart/export.phtml index 46afe27bc48..a31c90df546 100644 --- a/themes/bootstrap3/templates/cart/export.phtml +++ b/themes/bootstrap3/templates/cart/export.phtml @@ -47,7 +47,7 @@ </div> <div class="form-group"> <div class="col-sm-9 col-sm-offset-3"> - <input class="btn" type="submit" name="submit" value="<?=$this->transEsc('Export')?>"/> + <input class="btn btn-default" type="submit" name="submit" value="<?=$this->transEsc('Export')?>"/> </div> </div> </form> diff --git a/themes/bootstrap3/templates/cart/save.phtml b/themes/bootstrap3/templates/cart/save.phtml index ada7ec1d3ff..a0577f70a19 100644 --- a/themes/bootstrap3/templates/cart/save.phtml +++ b/themes/bootstrap3/templates/cart/save.phtml @@ -63,7 +63,7 @@ <? endif; ?> <div class="form-group"> <div class="col-sm-9 col-sm-offset-3"> - <input class="btn" type="submit" name="submit" value="<?=$this->transEsc('Save') ?>"/> + <input class="btn btn-default" type="submit" name="submit" value="<?=$this->transEsc('Save') ?>"/> </div> </div> </form> diff --git a/themes/bootstrap3/templates/collections/home.phtml b/themes/bootstrap3/templates/collections/home.phtml index 001cd7a9fba..f84452b719d 100644 --- a/themes/bootstrap3/templates/collections/home.phtml +++ b/themes/bootstrap3/templates/collections/home.phtml @@ -24,7 +24,7 @@ <? else: ?> <li class="disabled"><a href="#"><?=$this->transEsc('Next')?> »</a></li> <? endif; ?> - <input type="submit" class="btn" value="<?=$this->transEsc('Jump to')?>" /> + <input type="submit" class="btn btn-default" value="<?=$this->transEsc('Jump to')?>" /> <input type="text" name="from" value="<?=$this->escapeHtmlAttr($from)?>" /> </ul> </form> diff --git a/themes/bootstrap3/templates/confirm/confirm.phtml b/themes/bootstrap3/templates/confirm/confirm.phtml index 3fac6c2e05e..4c35c08772b 100644 --- a/themes/bootstrap3/templates/confirm/confirm.phtml +++ b/themes/bootstrap3/templates/confirm/confirm.phtml @@ -20,7 +20,7 @@ <input class="btn btn-primary" type="submit" name="confirm" value="<?=$this->transEsc('confirm_dialog_yes') ?>" /> </form> <form class="pad" action="<?=$this->escapeHtmlAttr($this->cancel) ?>" method="post"> - <input class="btn" type="submit" name="cancel" value="<?=$this->transEsc('confirm_dialog_no') ?>" /> + <input class="btn btn-default" type="submit" name="cancel" value="<?=$this->transEsc('confirm_dialog_no') ?>" /> </form> <div class="clearer"></div> </div> diff --git a/themes/bootstrap3/templates/install/fixdatabase.phtml b/themes/bootstrap3/templates/install/fixdatabase.phtml index aa0495b1688..4af6cda48ec 100644 --- a/themes/bootstrap3/templates/install/fixdatabase.phtml +++ b/themes/bootstrap3/templates/install/fixdatabase.phtml @@ -71,7 +71,7 @@ <div class="form-group"> <label class="col-sm-3 control-label" for="printsql">If you don't have the credentials or you wish to print the SQL out :</label> <div class="col-sm-9"> - <p class="form-control-static">Click here to <input class="btn" type="submit" name="printsql" value="Skip"/> credentials.</p> + <p class="form-control-static">Click here to <input class="btn btn-default" type="submit" name="printsql" value="Skip"/> credentials.</p> </div> </div> </form> \ No newline at end of file diff --git a/themes/bootstrap3/templates/install/fixsecurity.phtml b/themes/bootstrap3/templates/install/fixsecurity.phtml index 1d7f0439995..117ad5785ce 100644 --- a/themes/bootstrap3/templates/install/fixsecurity.phtml +++ b/themes/bootstrap3/templates/install/fixsecurity.phtml @@ -19,8 +19,8 @@ </p> <p><i>Do you still wish to proceed with enabling enhanced security in the database?</i></p> <form method="post" action="<?=$this->url('install-fixsecurity')?>"> - <input type="submit" name="fix-user-table" value="Yes" class="btn"/> - <input type="submit" name="fix-user-table" value="No" class="btn"/> + <input type="submit" name="fix-user-table" value="Yes" class="btn btn-default"/> + <input type="submit" name="fix-user-table" value="No" class="btn btn-default"/> </form> <? else: ?> <p>No security problems found.</p> diff --git a/themes/bootstrap3/templates/myresearch/bulk-action-buttons.phtml b/themes/bootstrap3/templates/myresearch/bulk-action-buttons.phtml index b8dc273f87c..19eb10d9dca 100644 --- a/themes/bootstrap3/templates/myresearch/bulk-action-buttons.phtml +++ b/themes/bootstrap3/templates/myresearch/bulk-action-buttons.phtml @@ -7,14 +7,14 @@ <input type="checkbox" name="selectAll" class="checkbox-select-all"/> <?=$this->transEsc('select_page')?> | <?=$this->transEsc('with_selected')?>: </label> -<input class="btn" type="submit" name="email" value="<?=$this->transEsc('Email')?>" title="<?=$this->transEsc('email_selected')?>"/> +<input class="btn btn-default" type="submit" name="email" value="<?=$this->transEsc('Email')?>" title="<?=$this->transEsc('email_selected')?>"/> <? if ((!is_null($this->list) && $this->list->editAllowed($user)) || is_null($this->list) && $user): ?> - <input class="btn" id="<?=$this->idPrefix?>delete_list_items_<?=!is_null($this->list) ? $this->escapeHtmlAttr($this->list->id) : ''?>" type="submit" name="delete" value="<?=$this->transEsc('Delete')?>" title="<?=$this->transEsc('delete_selected')?>"/> + <input class="btn btn-default" id="<?=$this->idPrefix?>delete_list_items_<?=!is_null($this->list) ? $this->escapeHtmlAttr($this->list->id) : ''?>" type="submit" name="delete" value="<?=$this->transEsc('Delete')?>" title="<?=$this->transEsc('delete_selected')?>"/> <? endif; ?> <? $exportOptions = $this->export()->getBulkOptions(); if (count($exportOptions) > 0): ?> - <input class="btn" type="submit" name="export" value="<?=$this->transEsc('Export')?>" title="<?=$this->transEsc('export_selected')?>"/> + <input class="btn btn-default" type="submit" name="export" value="<?=$this->transEsc('Export')?>" title="<?=$this->transEsc('export_selected')?>"/> <? endif; ?> -<input class="btn" type="submit" name="print" value="<?=$this->transEsc('Print')?>" title="<?=$this->transEsc('print_selected')?>"/> +<input class="btn btn-default" type="submit" name="print" value="<?=$this->transEsc('Print')?>" title="<?=$this->transEsc('print_selected')?>"/> <? if ($this->cart()->isActive()): ?> <input class="btn button floatleft bookbagAdd" id="<?=$this->idPrefix?>updateCart" type="submit" name="add" value="<?=$this->transEsc('Add to Book Bag')?>"/> <? endif; ?> \ No newline at end of file diff --git a/themes/bootstrap3/templates/myresearch/checkedout.phtml b/themes/bootstrap3/templates/myresearch/checkedout.phtml index edcfc8ae6d5..55178280389 100644 --- a/themes/bootstrap3/templates/myresearch/checkedout.phtml +++ b/themes/bootstrap3/templates/myresearch/checkedout.phtml @@ -14,8 +14,8 @@ <? if ($this->renewForm): ?> <form name="renewals" action="" method="post" id="renewals"> <div class="toolbar"> - <input type="submit" class="btn" name="renewSelected" value="<?=$this->transEsc("renew_selected")?>" /> - <input type="submit" class="btn" name="renewAll" value="<?=$this->transEsc('renew_all')?>" /> + <input type="submit" class="btn btn-default" name="renewSelected" value="<?=$this->transEsc("renew_selected")?>" /> + <input type="submit" class="btn btn-default" name="renewAll" value="<?=$this->transEsc('renew_all')?>" /> </div> <? endif; ?> diff --git a/themes/bootstrap3/templates/myresearch/profile.phtml b/themes/bootstrap3/templates/myresearch/profile.phtml index 757f1c9df16..d34e8daea32 100644 --- a/themes/bootstrap3/templates/myresearch/profile.phtml +++ b/themes/bootstrap3/templates/myresearch/profile.phtml @@ -38,7 +38,7 @@ <option value="<?=$this->escapeHtmlAttr($lib['locationID'])?>"<?=($selected == $lib['locationID'])?' selected="selected"':''?>><?=$this->escapeHtml($lib['locationDisplay'])?></option> <? endforeach; ?> </select> - <input class="btn" type="submit" value="<?=$this->transEsc('Save')?>" /> + <input class="btn btn-default" type="submit" value="<?=$this->transEsc('Save')?>" /> </form> </td> <? endif; ?> diff --git a/themes/bootstrap3/templates/oai/home.phtml b/themes/bootstrap3/templates/oai/home.phtml index af583954715..eac861b64e3 100644 --- a/themes/bootstrap3/templates/oai/home.phtml +++ b/themes/bootstrap3/templates/oai/home.phtml @@ -17,7 +17,7 @@ <p class="help-block">Returns the Identification information of this OAI Server.</p> <input type="hidden" name="verb" value="Identify"/> <p class="help-block">Accepts no additional parameters.</p> - <input class="btn" type="submit" name="submit" value="<?=$this->transEsc('Go')?>"/> + <input class="btn btn-default" type="submit" name="submit" value="<?=$this->transEsc('Go')?>"/> </form> </dd> @@ -48,7 +48,7 @@ <td><input id="ListIdentifier_resumptionToken" type="text" name="resumptionToken"/></td> </tr> </table> - <input class="btn" type="submit" name="submit" value="<?=$this->transEsc('Go')?>"/> + <input class="btn btn-default" type="submit" name="submit" value="<?=$this->transEsc('Go')?>"/> </form> </dd> @@ -58,7 +58,7 @@ <p class="help-block">Returns a listing of available metadata formats.</p> <input type="hidden" name="verb" value="ListMetadataFormats"/> <label for="ListMetadataFormats_identifier"><?=$this->transEsc('Identifier')?>:</label> <input id="ListMetadataFormats_identifier" type="text" name="identifier"/><br/> - <input class="btn" type="submit" name="submit" value="<?=$this->transEsc('Go')?>"/> + <input class="btn btn-default" type="submit" name="submit" value="<?=$this->transEsc('Go')?>"/> </form> </dd> @@ -69,7 +69,7 @@ <input type="hidden" name="verb" value="ListSets"/> <label for="ListSets_metadataPrefix"><?=$this->transEsc('Metadata Prefix')?>:</label> <input id="ListSets_metadataPrefix" type="text" name="metadataPrefix"/><br class="clear"/> <label for="ListSets_resumptionToken"><?=$this->transEsc('Resumption Token')?>:</label> <input id="ListSets_resumptionToken" type="text" name="resumptionToken"/><br class="clear"/> - <input class="btn" type="submit" name="submit" value="<?=$this->transEsc('Go')?>"/><br class="clear"/> + <input class="btn btn-default" type="submit" name="submit" value="<?=$this->transEsc('Go')?>"/><br class="clear"/> </form> </dd> @@ -100,7 +100,7 @@ <td><input id="ListRecord_resumptionToken" type="text" name="resumptionToken"/></td> </tr> </table> - <input class="btn" type="submit" name="submit" value="<?=$this->transEsc('Go')?>"/> + <input class="btn btn-default" type="submit" name="submit" value="<?=$this->transEsc('Go')?>"/> </form> </dd> @@ -111,7 +111,7 @@ <input type="hidden" name="verb" value="GetRecord"/> <label for="GetRecord_identifier"><?=$this->transEsc('Identifier')?>:</label> <input id="GetRecord_identifier" type="text" name="identifier"/><br class="clear"/> <label for="GetRecord_metadataPrefix"><?=$this->transEsc('Metadata Prefix')?>:</label> <input id="GetRecord_metadataPrefix" type="text" name="metadataPrefix"/><br class="clear"/> - <input class="btn" type="submit" name="submit" value="<?=$this->transEsc('Go')?>"/><br class="clear"/> + <input class="btn btn-default" type="submit" name="submit" value="<?=$this->transEsc('Go')?>"/><br class="clear"/> </form> </dd> </dl> \ No newline at end of file diff --git a/themes/bootstrap3/templates/search/bulk-action-buttons.phtml b/themes/bootstrap3/templates/search/bulk-action-buttons.phtml index 26ceb3d7a9c..e3202c3aa6c 100644 --- a/themes/bootstrap3/templates/search/bulk-action-buttons.phtml +++ b/themes/bootstrap3/templates/search/bulk-action-buttons.phtml @@ -4,6 +4,6 @@ <input type="checkbox" class="checkbox-select-all" name="selectAll" id="<?=$this->idPrefix?>addFormCheckboxSelectAll"/> <?=$this->transEsc('select_page')?> | <?=$this->transEsc('with_selected')?>: </label> - <input id="<?=$this->idPrefix?>updateCart" type="submit" class="btn" name="add" value="<?=$this->transEsc('Add to Book Bag')?>"/> + <input id="<?=$this->idPrefix?>updateCart" type="submit" class="btn btn-default" name="add" value="<?=$this->transEsc('Add to Book Bag')?>"/> </div> <? endif; ?> diff --git a/themes/bootstrap3/templates/search/controls/sort.phtml b/themes/bootstrap3/templates/search/controls/sort.phtml index e522febde0e..961630a5fa8 100644 --- a/themes/bootstrap3/templates/search/controls/sort.phtml +++ b/themes/bootstrap3/templates/search/controls/sort.phtml @@ -7,6 +7,6 @@ <option value="<?=$this->escapeHtmlAttr($sortType)?>"<?=$sortData['selected']?' selected="selected"':''?>><?=$this->transEsc($sortData['desc'])?></option> <? endforeach; ?> </select> - <noscript><input type="submit" class="btn" value="<?=$this->transEsc("Set")?>" /></noscript> + <noscript><input type="submit" class="btn btn-default" value="<?=$this->transEsc("Set")?>" /></noscript> </form> <? endif; ?> diff --git a/themes/bootstrap3/templates/search/reservessearch.phtml b/themes/bootstrap3/templates/search/reservessearch.phtml index ed259c16a2c..572074e8c6b 100644 --- a/themes/bootstrap3/templates/search/reservessearch.phtml +++ b/themes/bootstrap3/templates/search/reservessearch.phtml @@ -14,7 +14,7 @@ <form class="form-inline" method="get" action="" name="reservesSearchForm"> <label for="reservesSearchForm_lookfor"><?=$this->transEsc("Your search terms")?></label> <input id="reservesSearchForm_lookfor" type="text" name="lookfor" size="40" value="<?=$this->escapeHtmlAttr($reservesLookfor)?>" <?=$this->searchOptions('SolrReserves')->autocompleteEnabled() ? ' class="autocomplete searcher:SolrReserves type:Reserves"' : ''?> /> - <input class="btn" type="submit" name="submit" value="<?=$this->transEsc("Find")?>"/> + <input class="btn btn-default" type="submit" name="submit" value="<?=$this->transEsc("Find")?>"/> </form> <script type="text/javascript">$("#reservesSearchForm_lookfor").focus()</script> diff --git a/themes/bootstrap3/templates/upgrade/getsourcedir.phtml b/themes/bootstrap3/templates/upgrade/getsourcedir.phtml index a3e8ad91260..790fd54e944 100644 --- a/themes/bootstrap3/templates/upgrade/getsourcedir.phtml +++ b/themes/bootstrap3/templates/upgrade/getsourcedir.phtml @@ -10,10 +10,10 @@ <p class="lead">Option 1: Upgrade from VuFind 1.x</p> <p>Please enter the full path of the directory containing your previous version of VuFind (e.g. /usr/local/vufind):</p> <form class="form-inline" method="post" action="<?=$this->url('upgrade-getsourcedir')?>"> - <input type="text" name="sourcedir" /> <input class="btn" type="submit" /> + <input type="text" name="sourcedir" /> <input class="btn btn-default" type="submit" /> </form> <p class="lead">Option 2: Upgrade from VuFind 2.x</p> <p>Please enter the version number you are upgrading from (e.g. 2.0.1):</p> <form class="form-inline" method="post" action="<?=$this->url('upgrade-getsourceversion')?>"> - <input type="text" name="sourceversion" /> <input class="btn" type="submit" /> + <input type="text" name="sourceversion" /> <input class="btn btn-default" type="submit" /> </form> diff --git a/themes/bootstrap3/templates/upgrade/showsql.phtml b/themes/bootstrap3/templates/upgrade/showsql.phtml index 2f6379b6c36..395bfd38141 100644 --- a/themes/bootstrap3/templates/upgrade/showsql.phtml +++ b/themes/bootstrap3/templates/upgrade/showsql.phtml @@ -19,5 +19,5 @@ <textarea class="pre" rows="20"><?=trim($this->sql) ?></textarea> <form method="post" action="<?=$this->url('upgrade-showsql')?>"> - <input class="btn" type="submit" name="continue" value="Next" /> + <input class="btn btn-default" type="submit" name="continue" value="Next" /> </form> \ No newline at end of file diff --git a/themes/bootstrap3/templates/vudl/record.phtml b/themes/bootstrap3/templates/vudl/record.phtml index 1d6962c0a35..722aa026dae 100644 --- a/themes/bootstrap3/templates/vudl/record.phtml +++ b/themes/bootstrap3/templates/vudl/record.phtml @@ -50,7 +50,7 @@ </script> <form class="form-horizontal text-center siblings-form" action="<?=$this->url('vudl-sibling') ?>" method="get"> <input type="hidden" name="id" value="<?=$this->layout()->vudlID ?>"/> - <button class="btn" type="submit" name="prev_x" value="1" title="<?=$this->transEsc('Prev Item in Collection')?>">← <?=$this->transEsc('Prev Item')?></button> + <button class="btn btn-default" type="submit" name="prev_x" value="1" title="<?=$this->transEsc('Prev Item in Collection')?>">← <?=$this->transEsc('Prev Item')?></button> <? $uniqueParents = array(); ?> <? foreach($this->parents as $trail): ?> <? if(!in_array(key($trail), $uniqueParents)): ?> @@ -68,7 +68,7 @@ <? else: ?> <input type="hidden" name="trail" value="<?=current(array_keys($this->parents[0]))?>"/> <? endif; ?> - <button class="btn" type="submit" name="next_x" value="1" title="<?=$this->transEsc('Next Item in Collection')?>"><?=$this->transEsc('Next Item')?> →</button> + <button class="btn btn-default" type="submit" name="next_x" value="1" title="<?=$this->transEsc('Next Item in Collection')?>"><?=$this->transEsc('Next Item')?> →</button> </form> <div class="vudl"> <div class="panel-group col-sm-3" id="side-nav"> diff --git a/themes/bootstrap3/templates/vudl/views/page.phtml b/themes/bootstrap3/templates/vudl/views/page.phtml index 9cc42efe812..0f5aa1fcb22 100644 --- a/themes/bootstrap3/templates/vudl/views/page.phtml +++ b/themes/bootstrap3/templates/vudl/views/page.phtml @@ -62,9 +62,9 @@ </script> <? if($this->counts[0] > 1): ?> <div class="row btn-group visible-xs"> - <a href="javascript:prevPage()" class="btn">Prev Page</a> + <a href="javascript:prevPage()" class="btn btn-default">Prev Page</a> <a href="<?=$this->url('vudl-grid', array('id'=>$this->id)) ?>" class="btn grid-btn"><i class="fa fa-th"></i></a> - <a href="javascript:nextPage()" class="btn">Next Page</a> + <a href="javascript:nextPage()" class="btn btn-default">Next Page</a> </div> <? endif; ?> <ul class="nav nav-tabs"> @@ -99,9 +99,9 @@ <img id="preview" src="<?=isset($this->medium) ? $this->medium : '' ?>"> </div> <div class="tab-pane text-center" id="zoom"> - <a href="#" class="btn" onClick="Zoomy.turnLeft()">Turn Left</a> - <a href="#" class="btn" onClick="Zoomy.zoom(0,1)">[1:1]</a> - <a href="#" class="btn" onClick="Zoomy.turnRight()">Turn Right</a> + <a href="#" class="btn btn-default" onClick="Zoomy.turnLeft()">Turn Left</a> + <a href="#" class="btn btn-default" onClick="Zoomy.zoom(0,1)">[1:1]</a> + <a href="#" class="btn btn-default" onClick="Zoomy.turnRight()">Turn Right</a> <canvas id="zoomy"></canvas> </div> <div class="tab-pane text-center" id="master"> -- GitLab