diff --git a/themes/bootstrap3/templates/myresearch/profile.phtml b/themes/bootstrap3/templates/myresearch/profile.phtml
index fdb3d50c1e68df1aa713109190ca429dc7de25ff..9ff77a1d02ba2ad3431042d3775024c6ad6ed4f3 100644
--- a/themes/bootstrap3/templates/myresearch/profile.phtml
+++ b/themes/bootstrap3/templates/myresearch/profile.phtml
@@ -1,66 +1,66 @@
-<?
- // Set up page title:
- $this->headTitle($this->translate('My Profile'));
-
- // Set up breadcrumbs:
- $this->layout()->breadcrumbs = '<li><a href="' . $this->url('myresearch-home') . '">' . $this->transEsc('Your Account') . '</a></li> <li class="active">' . $this->transEsc('Profile') . '</li>';
-
- // Only display home library form if we have multiple pickup locations:
- $showHomeLibForm = (isset($this->pickup) && count($this->pickup) > 1);
-
- // Template for use by the renderArray helper:
- $arrTemplate = '<tr><th>%%LABEL%%:</th><td> %%VALUE%%</td></tr>';
-?>
-
-<div class="row">
- <div class="<?=$this->layoutClass('mainbody')?>">
- <h2><?=$this->transEsc('Your Profile')?></h2>
- <?=$this->flashmessages();?>
- <table class="table table-striped">
- <?
- echo $this->renderArray(
- $arrTemplate, $this->profile,
- array(
- $this->transEsc('First Name') => 'firstname',
- $this->transEsc('Last Name') => 'lastname'
- )
- );
- ?>
- <? if ($showHomeLibForm): ?>
- <tr><th><?=$this->transEsc('Preferred Library')?>:</th>
- <?
- $selected = (isset($this->profile['home_library']) && $this->profile['home_library'] != "")
- ? $this->profile['home_library'] : $this->defaultPickupLocation
- ?>
- <td>
- <form id="profile_form" class="form-inline" action="" method="post">
- <select id="home_library" name="home_library">
- <? foreach ($this->pickup as $lib): ?>
- <option value="<?=$this->escapeHtmlAttr($lib['locationID'])?>"<?=($selected == $lib['locationID'])?' selected="selected"':''?>><?=$this->escapeHtml($lib['locationDisplay'])?></option>
- <? endforeach; ?>
- </select>
- <input class="btn btn-default" type="submit" value="<?=$this->transEsc('Save')?>" />
- </form>
- </td>
- <? endif; ?>
- <?
- echo $this->renderArray(
- $arrTemplate, $this->profile,
- array(
- $this->transEsc('Address') . ' 1' => 'address1',
- $this->transEsc('Address') . ' 2' => 'address2',
- $this->transEsc('Zip') => 'zip',
- $this->transEsc('City') => 'city',
- $this->transEsc('Country') => 'country',
- $this->transEsc('Phone Number') => 'phone',
- $this->transEsc('Group') => 'group'
- )
- );
- ?>
- </table>
- </div>
-
- <div class="<?=$this->layoutClass('sidebar')?>">
- <?=$this->context($this)->renderInContext("myresearch/menu.phtml", array('active' => 'profile'))?>
- </div>
+<?
+ // Set up page title:
+ $this->headTitle($this->translate('My Profile'));
+
+ // Set up breadcrumbs:
+ $this->layout()->breadcrumbs = '<li><a href="' . $this->url('myresearch-home') . '">' . $this->transEsc('Your Account') . '</a></li> <li class="active">' . $this->transEsc('Profile') . '</li>';
+
+ // Only display home library form if we have multiple pickup locations:
+ $showHomeLibForm = (isset($this->pickup) && count($this->pickup) > 1);
+
+ // Template for use by the renderArray helper:
+ $arrTemplate = '<tr><th>%%LABEL%%:</th><td> %%VALUE%%</td></tr>';
+?>
+
+<div class="row">
+ <div class="<?=$this->layoutClass('mainbody')?>">
+ <h2><?=$this->transEsc('Your Profile')?></h2>
+ <?=$this->flashmessages();?>
+ <table class="table table-striped">
+ <?
+ echo $this->renderArray(
+ $arrTemplate, $this->profile,
+ array(
+ $this->transEsc('First Name') => 'firstname',
+ $this->transEsc('Last Name') => 'lastname'
+ )
+ );
+ ?>
+ <? if ($showHomeLibForm): ?>
+ <tr><th><?=$this->transEsc('Preferred Library')?>:</th>
+ <?
+ $selected = (isset($this->profile['home_library']) && $this->profile['home_library'] != "")
+ ? $this->profile['home_library'] : $this->defaultPickupLocation
+ ?>
+ <td>
+ <form id="profile_form" class="form-inline" action="" method="post">
+ <select id="home_library" name="home_library" class="form-control">
+ <? foreach ($this->pickup as $lib): ?>
+ <option value="<?=$this->escapeHtmlAttr($lib['locationID'])?>"<?=($selected == $lib['locationID'])?' selected="selected"':''?>><?=$this->escapeHtml($lib['locationDisplay'])?></option>
+ <? endforeach; ?>
+ </select>
+ <input class="btn btn-default" type="submit" value="<?=$this->transEsc('Save')?>" />
+ </form>
+ </td>
+ <? endif; ?>
+ <?
+ echo $this->renderArray(
+ $arrTemplate, $this->profile,
+ array(
+ $this->transEsc('Address') . ' 1' => 'address1',
+ $this->transEsc('Address') . ' 2' => 'address2',
+ $this->transEsc('Zip') => 'zip',
+ $this->transEsc('City') => 'city',
+ $this->transEsc('Country') => 'country',
+ $this->transEsc('Phone Number') => 'phone',
+ $this->transEsc('Group') => 'group'
+ )
+ );
+ ?>
+ </table>
+ </div>
+
+ <div class="<?=$this->layoutClass('sidebar')?>">
+ <?=$this->context($this)->renderInContext("myresearch/menu.phtml", array('active' => 'profile'))?>
+ </div>
</div>
\ No newline at end of file
diff --git a/themes/bootstrap3/templates/search/advanced/eds.phtml b/themes/bootstrap3/templates/search/advanced/eds.phtml
index b2f0f2c340af216eaf872541576cf8ec0b5dd95d..c9313cdb787920feba14baec431c54d02f6f83b1 100644
--- a/themes/bootstrap3/templates/search/advanced/eds.phtml
+++ b/themes/bootstrap3/templates/search/advanced/eds.phtml
@@ -1,76 +1,76 @@
-<div class="row">
- <? if (!empty($this->expanderList)): ?>
- <fieldset class="col-sm-4">
- <legend><?=$this->transEsc('eds_modes_and_expanders')?></legend>
- <? foreach ($this->expanderList as $field => $expander):
- $value = $expander['Value'] ?>
- <div class="checkbox">
- <label for="expand_<?=$this->escapeHtmlAttr(str_replace(' ', '+', $field))?>">
- <input id="expand_<?=$this->escapeHtmlAttr(str_replace(' ', '+', $field))?>" type="checkbox" <?=(isset($expander['selected']) && $expander['selected'])?'checked="checked"':''?> name="filter[]" value="EXPAND:<?=$this->escapeHtmlAttr($value)?>">
- <?=$this->transEsc('eds_expander_' . $value, array(), $expander['Label'])?>
- </label>
- </div>
- <? endforeach; ?>
-
- <label class="displayBlock" for="searchModes"><?=$this->transEsc('Search Mode')?></label>
- <select id="searchMode_<?=$this->escapeHtmlAttr($field)?>" name="filter[]">
- <? foreach ($this->searchModes as $field => $searchMode):
- $value = $searchMode['Value'] ?>
- <option <?=(isset($searchMode['selected']) && $searchMode['selected'])?'selected="selected"':''?> value="SEARCHMODE:<?=$this->escapeHtmlAttr($value)?>">
- <?= /* 'Label' comes from API and is always in English; try to translate structured value before using it: */ $this->transEsc('eds_mode_' . $value, array(), $searchMode['Label']) ?>
- </option>
- <? endforeach; ?>
- </select>
- </fieldset>
- <? endif; ?>
-
- <? if (!empty($this->limiterList)): ?>
- <fieldset class="col-sm-4">
- <legend><?=$this->transEsc('Limit To')?></legend>
- <? foreach ($this->limiterList as $field => $facet): ?>
- <? switch($facet['Type']){
- case 'multiselectvalue': ?>
- <label for="limit_<?=$this->escapeHtmlAttr(str_replace(' ', '+', $field))?>"><?=$this->transEsc($facet['Label'])?></label><br/>
- <select id="limit_<?=$this->escapeHtmlAttr($field)?>" name="filter[]" multiple="multiple" size="10">
- <? foreach ($facet['LimiterValues'] as $id => $facetValue): ?>
- <? $value = $facetValue['Value']; ?>
- <option value="<?='LIMIT|'.$this->escapeHtmlAttr($field . ':' . $facetValue['Value'])?>"<?=(isset($facetValue['selected']) && $facetValue['selected'])?' selected="selected"':''?>><?=$this->escapeHtml($facetValue['Value'])?></option>
- <? endforeach; ?>
- </select>
- <!-- <br/> -->
- <? break;
- case 'select':
- $value = $facet['LimiterValues'][0]['Value'] ?>
- <div class="checkbox">
- <label for="limit_<?=$this->escapeHtmlAttr(str_replace(' ', '+', $field))?>">
- <input id="limit_<?=$this->escapeHtmlAttr(str_replace(' ', '+', $field))?>" type="checkbox" <?=(isset($facet['LimiterValues'][0]['selected']) && $facet['LimiterValues'][0]['selected'])?'checked="checked"':''?> name="filter[]" value="<?=$this->escapeHtmlAttr('LIMIT|'.$field . ':' . $value)?>">
- <?=$this->transEsc('eds_limiter_' . $field, array(), $facet['Label'])?>
- </label>
- </div>
- <? break;
- case 'text': ?>
- <!-- not implemented -->
- <? break;
- case 'numeric':?>
- <!-- not implemented -->
- <? break;
- case 'numericrange':?>
- <!-- not implemented -->
- <? break;
- case 'ymrange': ?>
- <!-- not implemented -->
- <? break;
- case 'yrange': ?>
- <!-- not implemented -->
- <? break;
- case 'historicalrange':?>
- <!-- not implemented -->
- <? break;
- case 'singleselectvalue':?>
- <!-- not implemented -->
- <? break;
- }; ?>
- <? endforeach; ?>
- </fieldset>
- <? endif; ?>
+<div class="row">
+ <? if (!empty($this->expanderList)): ?>
+ <fieldset class="col-sm-4">
+ <legend><?=$this->transEsc('eds_modes_and_expanders')?></legend>
+ <? foreach ($this->expanderList as $field => $expander):
+ $value = $expander['Value'] ?>
+ <div class="checkbox">
+ <label for="expand_<?=$this->escapeHtmlAttr(str_replace(' ', '+', $field))?>">
+ <input id="expand_<?=$this->escapeHtmlAttr(str_replace(' ', '+', $field))?>" type="checkbox" <?=(isset($expander['selected']) && $expander['selected'])?'checked="checked"':''?> name="filter[]" value="EXPAND:<?=$this->escapeHtmlAttr($value)?>">
+ <?=$this->transEsc('eds_expander_' . $value, array(), $expander['Label'])?>
+ </label>
+ </div>
+ <? endforeach; ?>
+
+ <label class="displayBlock" for="searchModes"><?=$this->transEsc('Search Mode')?></label>
+ <select id="searchMode_<?=$this->escapeHtmlAttr($field)?>" name="filter[]" class="form-control">
+ <? foreach ($this->searchModes as $field => $searchMode):
+ $value = $searchMode['Value'] ?>
+ <option <?=(isset($searchMode['selected']) && $searchMode['selected'])?'selected="selected"':''?> value="SEARCHMODE:<?=$this->escapeHtmlAttr($value)?>">
+ <?= /* 'Label' comes from API and is always in English; try to translate structured value before using it: */ $this->transEsc('eds_mode_' . $value, array(), $searchMode['Label']) ?>
+ </option>
+ <? endforeach; ?>
+ </select>
+ </fieldset>
+ <? endif; ?>
+
+ <? if (!empty($this->limiterList)): ?>
+ <fieldset class="col-sm-4">
+ <legend><?=$this->transEsc('Limit To')?></legend>
+ <? foreach ($this->limiterList as $field => $facet): ?>
+ <? switch($facet['Type']){
+ case 'multiselectvalue': ?>
+ <label for="limit_<?=$this->escapeHtmlAttr(str_replace(' ', '+', $field))?>"><?=$this->transEsc($facet['Label'])?></label><br/>
+ <select id="limit_<?=$this->escapeHtmlAttr($field)?>" name="filter[]" multiple="multiple" size="10" class="form-control">
+ <? foreach ($facet['LimiterValues'] as $id => $facetValue): ?>
+ <? $value = $facetValue['Value']; ?>
+ <option value="<?='LIMIT|'.$this->escapeHtmlAttr($field . ':' . $facetValue['Value'])?>"<?=(isset($facetValue['selected']) && $facetValue['selected'])?' selected="selected"':''?>><?=$this->escapeHtml($facetValue['Value'])?></option>
+ <? endforeach; ?>
+ </select>
+ <!-- <br/> -->
+ <? break;
+ case 'select':
+ $value = $facet['LimiterValues'][0]['Value'] ?>
+ <div class="checkbox">
+ <label for="limit_<?=$this->escapeHtmlAttr(str_replace(' ', '+', $field))?>">
+ <input id="limit_<?=$this->escapeHtmlAttr(str_replace(' ', '+', $field))?>" type="checkbox" <?=(isset($facet['LimiterValues'][0]['selected']) && $facet['LimiterValues'][0]['selected'])?'checked="checked"':''?> name="filter[]" value="<?=$this->escapeHtmlAttr('LIMIT|'.$field . ':' . $value)?>">
+ <?=$this->transEsc('eds_limiter_' . $field, array(), $facet['Label'])?>
+ </label>
+ </div>
+ <? break;
+ case 'text': ?>
+ <!-- not implemented -->
+ <? break;
+ case 'numeric':?>
+ <!-- not implemented -->
+ <? break;
+ case 'numericrange':?>
+ <!-- not implemented -->
+ <? break;
+ case 'ymrange': ?>
+ <!-- not implemented -->
+ <? break;
+ case 'yrange': ?>
+ <!-- not implemented -->
+ <? break;
+ case 'historicalrange':?>
+ <!-- not implemented -->
+ <? break;
+ case 'singleselectvalue':?>
+ <!-- not implemented -->
+ <? break;
+ }; ?>
+ <? endforeach; ?>
+ </fieldset>
+ <? endif; ?>
</div>
\ No newline at end of file