From 7bbc3b93120c2d8673f4dd37caf4b622ce3d6a37 Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Fri, 4 Mar 2016 13:49:20 -0500
Subject: [PATCH] fixed line endings
---
themes/bootstrap3/templates/cart/cart.phtml | 220 +++++++++---------
themes/bootstrap3/templates/cart/email.phtml | 82 +++----
.../templates/myresearch/profile.phtml | 136 +++++------
3 files changed, 219 insertions(+), 219 deletions(-)
diff --git a/themes/bootstrap3/templates/cart/cart.phtml b/themes/bootstrap3/templates/cart/cart.phtml
index c372dc1e25c..113c01ba173 100644
--- a/themes/bootstrap3/templates/cart/cart.phtml
+++ b/themes/bootstrap3/templates/cart/cart.phtml
@@ -1,111 +1,111 @@
-<?
- // Set page title.
- $this->headTitle($this->translate('Book Bag'));
-
- // Set up breadcrumbs:
- $this->layout()->breadcrumbs = '<li>' . $this->searchMemory()->getLastSearchLink($this->transEsc('Search'), '', '</li> ')
- . '<li class="active">' . $this->transEsc('Book Bag') . '</li>';
-?>
-<?=$this->flashmessages()?>
-<form class="form-inline" action="<?=$this->url('cart-home')?>" method="post" name="cartForm">
- <? if (!$this->cart()->isEmpty()): ?>
- <div class="cart-controls clearfix">
- <div class="checkbox pull-left flip">
- <label>
- <input type="checkbox" name="selectAll" class="checkbox-select-all"/>
- <?=$this->transEsc('select_page')?>
- </label>
- </div>
- <? if ($this->userlist()->getMode() !== 'disabled'): ?>
- <button type="submit" class="btn btn-default" name="saveCart" title="<?=$this->transEsc('bookbag_save')?>" value="1">
- <i class="fa fa-save"></i>
- <?=$this->transEsc('Save')?>
- </button>
- <? endif; ?>
- <button type="submit" class="btn btn-default" name="email" title="<?=$this->transEsc('bookbag_email')?>" value="1">
- <i class="fa fa-envelope-o"></i>
- <?=$this->transEsc('Email')?>
- </button>
- <? $exportOptions = $this->export()->getActiveFormats('bulk'); if (count($exportOptions) > 0): ?>
- <button type="submit" class="btn btn-default" name="export" title="<?=$this->transEsc('bookbag_export')?>" value="1">
- <i class="fa fa-list-alt"></i>
- <?=$this->transEsc('Export')?>
- </button>
- <? endif; ?>
- <button type="submit" class="btn btn-default dropdown-toggle" name="print" title="<?=$this->transEsc('print_selected')?>" value="1">
- <i class="fa fa-print"></i>
- <?=$this->transEsc('Print')?>
- </button>
- <div class="btn-group" id="cartDelete">
- <button type="submit" name="delete" class="btn btn-default dropdown-toggle" data-toggle="dropdown" id="cart-delete-label" value="1">
- <i class="fa fa-trash"></i>
- <?=$this->transEsc('Delete')?>
- </button>
- <ul class="dropdown-menu" role="menu" aria-labelledby="cart-delete-label">
- <li><a id="cart-confirm-delete" onClick="submitFormWithIds(this, {'delete':'delete'})" title="<?=$this->transEsc('confirm_delete')?>"><?=$this->transEsc('confirm_dialog_yes')?></a></li>
- <li><a><?=$this->transEsc('confirm_dialog_no')?></a></li>
- </ul>
- </div>
- <div class="btn-group">
- <button type="submit" class="btn btn-default dropdown-toggle" name="empty" data-toggle="dropdown" id="cart-empty-label" value="1">
- <i class="fa fa-close"></i>
- <?=$this->transEsc('Empty Book Bag')?>
- </button>
- <ul class="dropdown-menu" role="menu" aria-labelledby="cart-empty-label">
- <li><a id="cart-confirm-empty" onClick="submitCartForm(this, {'empty':'empty'})" title="<?=$this->transEsc('bookbag_confirm_empty')?>"><?=$this->transEsc('confirm_dialog_yes')?></a></li>
- <li><a onClick="$('.fa.fa-spinner').remove()"><?=$this->transEsc('confirm_dialog_no')?></a></li>
- </ul>
- </div>
- </div>
- <? endif; ?>
- <?=$this->render('cart/contents.phtml')?>
-</form>
-<?
- $script = <<<JS
- function determineCallback(elem) {
- var modal = $(elem).parents('.modal');
- if(modal.length > 0) {
- return Lightbox.changeContent;
- } else {
- console.log('!');
- return function() {location.reload()}
- }
- }
- function submitCartForm(elem, data) {
- var url = VuFind.path + '/AJAX/JSON?method=getLightbox&submodule=Cart&subaction=Home';
- $.post(url, data, determineCallback(elem));
- }
- function submitFormWithIds(elem, data) {
- data['ids[]'] = [];
- var form = $(elem).closest('form')[0];
- var checkboxes = form.querySelectorAll('[name="ids[]"]:checked');
- for(var i=0;i<checkboxes.length;i++) {
- data['ids[]'].push(checkboxes[i].value);
- }
- submitCartForm(elem, data);
- }
- $('[name=cartForm] [type=submit]').click(function() {
- // Remove other clicks
- $('[name=cartForm] [clicked=true]').attr('clicked', false);
- // Add useful information
- $(this).attr("clicked", "true");
- });
- $('[name=cartForm]').submit(function() {
- var submit = $(this).find('[clicked=true]').attr('name');
- if(submit == 'delete' || submit == 'empty') {
- return false;
- } else {
- return true;
- }
- });
- $('#cartDelete').on('show.bs.dropdown', function () {
- var form = $(this).closest('form')[0];
- var checkboxes = form.querySelectorAll('[name="ids[]"]:checked');
- if(checkboxes.length == 0) {
- Lightbox.displayError(VuFind.translate('bulk_noitems_advice'));
- return false;
- }
- });
-JS;
-?>
+<?
+ // Set page title.
+ $this->headTitle($this->translate('Book Bag'));
+
+ // Set up breadcrumbs:
+ $this->layout()->breadcrumbs = '<li>' . $this->searchMemory()->getLastSearchLink($this->transEsc('Search'), '', '</li> ')
+ . '<li class="active">' . $this->transEsc('Book Bag') . '</li>';
+?>
+<?=$this->flashmessages()?>
+<form class="form-inline" action="<?=$this->url('cart-home')?>" method="post" name="cartForm">
+ <? if (!$this->cart()->isEmpty()): ?>
+ <div class="cart-controls clearfix">
+ <div class="checkbox pull-left flip">
+ <label>
+ <input type="checkbox" name="selectAll" class="checkbox-select-all"/>
+ <?=$this->transEsc('select_page')?>
+ </label>
+ </div>
+ <? if ($this->userlist()->getMode() !== 'disabled'): ?>
+ <button type="submit" class="btn btn-default" name="saveCart" title="<?=$this->transEsc('bookbag_save')?>" value="1">
+ <i class="fa fa-save"></i>
+ <?=$this->transEsc('Save')?>
+ </button>
+ <? endif; ?>
+ <button type="submit" class="btn btn-default" name="email" title="<?=$this->transEsc('bookbag_email')?>" value="1">
+ <i class="fa fa-envelope-o"></i>
+ <?=$this->transEsc('Email')?>
+ </button>
+ <? $exportOptions = $this->export()->getActiveFormats('bulk'); if (count($exportOptions) > 0): ?>
+ <button type="submit" class="btn btn-default" name="export" title="<?=$this->transEsc('bookbag_export')?>" value="1">
+ <i class="fa fa-list-alt"></i>
+ <?=$this->transEsc('Export')?>
+ </button>
+ <? endif; ?>
+ <button type="submit" class="btn btn-default dropdown-toggle" name="print" title="<?=$this->transEsc('print_selected')?>" value="1">
+ <i class="fa fa-print"></i>
+ <?=$this->transEsc('Print')?>
+ </button>
+ <div class="btn-group" id="cartDelete">
+ <button type="submit" name="delete" class="btn btn-default dropdown-toggle" data-toggle="dropdown" id="cart-delete-label" value="1">
+ <i class="fa fa-trash"></i>
+ <?=$this->transEsc('Delete')?>
+ </button>
+ <ul class="dropdown-menu" role="menu" aria-labelledby="cart-delete-label">
+ <li><a id="cart-confirm-delete" onClick="submitFormWithIds(this, {'delete':'delete'})" title="<?=$this->transEsc('confirm_delete')?>"><?=$this->transEsc('confirm_dialog_yes')?></a></li>
+ <li><a><?=$this->transEsc('confirm_dialog_no')?></a></li>
+ </ul>
+ </div>
+ <div class="btn-group">
+ <button type="submit" class="btn btn-default dropdown-toggle" name="empty" data-toggle="dropdown" id="cart-empty-label" value="1">
+ <i class="fa fa-close"></i>
+ <?=$this->transEsc('Empty Book Bag')?>
+ </button>
+ <ul class="dropdown-menu" role="menu" aria-labelledby="cart-empty-label">
+ <li><a id="cart-confirm-empty" onClick="submitCartForm(this, {'empty':'empty'})" title="<?=$this->transEsc('bookbag_confirm_empty')?>"><?=$this->transEsc('confirm_dialog_yes')?></a></li>
+ <li><a onClick="$('.fa.fa-spinner').remove()"><?=$this->transEsc('confirm_dialog_no')?></a></li>
+ </ul>
+ </div>
+ </div>
+ <? endif; ?>
+ <?=$this->render('cart/contents.phtml')?>
+</form>
+<?
+ $script = <<<JS
+ function determineCallback(elem) {
+ var modal = $(elem).parents('.modal');
+ if(modal.length > 0) {
+ return Lightbox.changeContent;
+ } else {
+ console.log('!');
+ return function() {location.reload()}
+ }
+ }
+ function submitCartForm(elem, data) {
+ var url = VuFind.path + '/AJAX/JSON?method=getLightbox&submodule=Cart&subaction=Home';
+ $.post(url, data, determineCallback(elem));
+ }
+ function submitFormWithIds(elem, data) {
+ data['ids[]'] = [];
+ var form = $(elem).closest('form')[0];
+ var checkboxes = form.querySelectorAll('[name="ids[]"]:checked');
+ for(var i=0;i<checkboxes.length;i++) {
+ data['ids[]'].push(checkboxes[i].value);
+ }
+ submitCartForm(elem, data);
+ }
+ $('[name=cartForm] [type=submit]').click(function() {
+ // Remove other clicks
+ $('[name=cartForm] [clicked=true]').attr('clicked', false);
+ // Add useful information
+ $(this).attr("clicked", "true");
+ });
+ $('[name=cartForm]').submit(function() {
+ var submit = $(this).find('[clicked=true]').attr('name');
+ if(submit == 'delete' || submit == 'empty') {
+ return false;
+ } else {
+ return true;
+ }
+ });
+ $('#cartDelete').on('show.bs.dropdown', function () {
+ var form = $(this).closest('form')[0];
+ var checkboxes = form.querySelectorAll('[name="ids[]"]:checked');
+ if(checkboxes.length == 0) {
+ Lightbox.displayError(VuFind.translate('bulk_noitems_advice'));
+ return false;
+ }
+ });
+JS;
+?>
<?=$this->inlineScript(\Zend\View\Helper\HeadScript::SCRIPT, $script, 'SET') ?>
\ No newline at end of file
diff --git a/themes/bootstrap3/templates/cart/email.phtml b/themes/bootstrap3/templates/cart/email.phtml
index 31b7b62a319..8f11eddc1a3 100644
--- a/themes/bootstrap3/templates/cart/email.phtml
+++ b/themes/bootstrap3/templates/cart/email.phtml
@@ -1,42 +1,42 @@
-<?
- // Set page title.
- $this->headTitle($this->translate('email_selected_favorites'));
-
- // Set up breadcrumbs:
- $this->layout()->breadcrumbs = '<li>' . $this->searchMemory()->getLastSearchLink($this->transEsc('Search'), '', '</li> ')
- . '<li><a href="' .$this->url('cart-home'). '">' .$this->transEsc('Cart'). '</a></li> '
- . '<li class="active">' . $this->transEsc('email_selected_favorites') . '</li>';
-?>
-<?=$this->flashmessages()?>
-<form class="form-horizontal" action="<?=$this->url('cart-email')?>" method="post" name="bulkEmail">
- <? foreach ($this->records as $current): ?>
- <input type="hidden" name="ids[]" value="<?=$this->escapeHtmlAttr($current->getSourceIdentifier() . '|' . $current->getUniqueId())?>" />
- <? endforeach; ?>
- <div class="form-group">
- <label class="col-sm-3 control-label"><?=$this->transEsc('Title')?></label>
- <div class="col-sm-9">
- <? if(count($this->records) > 1): ?>
- <button type="button" class="btn btn-default hidden" data-toggle="collapse" data-target="#itemhide">
- <?=count($this->records).' '.$this->transEsc('items') ?>
- </button>
- <div id="itemhide" class="collapse in">
- <ul>
- <? foreach ($this->records as $current): ?>
- <li><?=$this->escapeHtml($current->getBreadcrumb())?></li>
- <? endforeach; ?>
- </ul>
- </div>
- <? else: ?>
- <p class="form-control-static"><?=$this->records[0]->getBreadcrumb() ?></p>
- <? endif; ?>
- </div>
- </div>
- <?=$this->render('Helpers/email-form-fields.phtml')?>
-</form>
-<?
- $script = <<<JS
- $('button.btn.hidden').removeClass('hidden');
- $('#itemhide').removeClass('in');
-JS;
-?>
+<?
+ // Set page title.
+ $this->headTitle($this->translate('email_selected_favorites'));
+
+ // Set up breadcrumbs:
+ $this->layout()->breadcrumbs = '<li>' . $this->searchMemory()->getLastSearchLink($this->transEsc('Search'), '', '</li> ')
+ . '<li><a href="' .$this->url('cart-home'). '">' .$this->transEsc('Cart'). '</a></li> '
+ . '<li class="active">' . $this->transEsc('email_selected_favorites') . '</li>';
+?>
+<?=$this->flashmessages()?>
+<form class="form-horizontal" action="<?=$this->url('cart-email')?>" method="post" name="bulkEmail">
+ <? foreach ($this->records as $current): ?>
+ <input type="hidden" name="ids[]" value="<?=$this->escapeHtmlAttr($current->getSourceIdentifier() . '|' . $current->getUniqueId())?>" />
+ <? endforeach; ?>
+ <div class="form-group">
+ <label class="col-sm-3 control-label"><?=$this->transEsc('Title')?></label>
+ <div class="col-sm-9">
+ <? if(count($this->records) > 1): ?>
+ <button type="button" class="btn btn-default hidden" data-toggle="collapse" data-target="#itemhide">
+ <?=count($this->records).' '.$this->transEsc('items') ?>
+ </button>
+ <div id="itemhide" class="collapse in">
+ <ul>
+ <? foreach ($this->records as $current): ?>
+ <li><?=$this->escapeHtml($current->getBreadcrumb())?></li>
+ <? endforeach; ?>
+ </ul>
+ </div>
+ <? else: ?>
+ <p class="form-control-static"><?=$this->records[0]->getBreadcrumb() ?></p>
+ <? endif; ?>
+ </div>
+ </div>
+ <?=$this->render('Helpers/email-form-fields.phtml')?>
+</form>
+<?
+ $script = <<<JS
+ $('button.btn.hidden').removeClass('hidden');
+ $('#itemhide').removeClass('in');
+JS;
+?>
<?=$this->inlineScript(\Zend\View\Helper\HeadScript::SCRIPT, $script, 'SET') ?>
\ No newline at end of file
diff --git a/themes/bootstrap3/templates/myresearch/profile.phtml b/themes/bootstrap3/templates/myresearch/profile.phtml
index a9e32b52793..b8c25d720ef 100644
--- a/themes/bootstrap3/templates/myresearch/profile.phtml
+++ b/themes/bootstrap3/templates/myresearch/profile.phtml
@@ -1,69 +1,69 @@
-<?
- // 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();?>
-
- <?=$this->context($this)->renderInContext('librarycards/selectcard.phtml', array('user' => $this->auth()->isLoggedIn())); ?>
-
- <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" 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>
+<?
+ // 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();?>
+
+ <?=$this->context($this)->renderInContext('librarycards/selectcard.phtml', array('user' => $this->auth()->isLoggedIn())); ?>
+
+ <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" 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
--
GitLab