Author: sevein
Date: Tue Oct 11 11:05:34 2011
New Revision: 10018
Log:
Cosmetic and markup changes for consistency with other parts of the
application, remove inline js code in favour of multiRow.js behavior
Modified:
trunk/apps/qubit/modules/search/actions/advancedAction.class.php
trunk/apps/qubit/modules/search/templates/_searchFields.php
trunk/apps/qubit/modules/search/templates/advancedSuccess.php
Modified: trunk/apps/qubit/modules/search/actions/advancedAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/search/actions/advancedAction.class.php Tue Oct
11 11:03:18 2011 (r10017)
+++ trunk/apps/qubit/modules/search/actions/advancedAction.class.php Tue Oct
11 11:05:34 2011 (r10018)
@@ -21,7 +21,7 @@
{
public function execute($request)
{
- // get list of repositories
+ // Get list of repositories
$criteria = new Criteria;
// Do source culture fallback
@@ -30,7 +30,7 @@
$criteria->addAscendingOrderByColumn('authorized_form_of_name');
$this->repositories = QubitRepository::get($criteria);
- // get list of media types
+ // Get list of media types
$criteria = new Criteria;
$criteria->add(QubitTerm::TAXONOMY_ID, QubitTaxonomy::MATERIAL_TYPE_ID);
@@ -40,5 +40,4 @@
$criteria->addAscendingOrderByColumn('name');
$this->media = QubitTerm::get($criteria);
}
-
-}
\ No newline at end of file
+}
Modified: trunk/apps/qubit/modules/search/templates/_searchFields.php
==============================================================================
--- trunk/apps/qubit/modules/search/templates/_searchFields.php Tue Oct 11
11:03:18 2011 (r10017)
+++ trunk/apps/qubit/modules/search/templates/_searchFields.php Tue Oct 11
11:05:34 2011 (r10018)
@@ -1,31 +1,30 @@
-<tr id="searchField_<?php echo $i; ?>">
+<tr id="searchField_<?php echo $i ?>">
<td>
- <?php if ($i > 0) : ?>
- <select name="searchFields[<?php echo $i; ?>][operator]">
+ <?php if ($i > 0): ?>
+ <select name="searchFields[<?php echo $i ?>][operator]">
<option value="and">and</option>
<option value="or">or</option>
<option value="not">not</option>
- </select>
+ </select>
<?php endif; ?>
- </td>
- <td>
+ </td><td>
<input type="text" name="searchFields[<?php echo $i; ?>][query]"/>
</td><td>in
- <select style="width:90%;" name="searchFields[<?php echo $i; ?>][field]"
id="searchField_<?php echo $i; ?>_field">
- <option value=""><?php echo __('Any field'); ?></option>
- <option value="title"><?php echo __('Title'); ?></option>
- <option value="archivalhistory"><?php echo __('Archival history');
?></option>
- <option value="scopeAndContent"><?php echo __('Scope and content');
?></option>
- <option value="extentandmedium"><?php echo __('Extent and medium');
?></option>
- <option value="subject"><?php echo __('Subject access points');
?></option>
- <option value="name"><?php echo __('Name access points'); ?></option>
- <option value="place"><?php echo __('Place access points'); ?></option>
- <option value="identifier"><?php echo __('Identifier'); ?></option>
+ <select style="width: 90%;" name="searchFields[<?php echo $i; ?>][field]"
id="searchField_<?php echo $i ?>_field">
+ <option value=""><?php echo __('Any field') ?></option>
+ <option value="title"><?php echo __('Title') ?></option>
+ <option value="archivalhistory"><?php echo __('Archival history')
?></option>
+ <option value="scopeAndContent"><?php echo __('Scope and content')
?></option>
+ <option value="extentandmedium"><?php echo __('Extent and medium')
?></option>
+ <option value="subject"><?php echo __('Subject access points')
?></option>
+ <option value="name"><?php echo __('Name access points') ?></option>
+ <option value="place"><?php echo __('Place access points') ?></option>
+ <option value="identifier"><?php echo __('Identifier') ?></option>
</select>
</td><td>using
- <select name="searchFields[<?php echo $i; ?>][match]"
id="searchField_<?php echo $i; ?>_match" style="width: 100px;">
- <option value="keyword">keyword</option>
- <option value="phrase">phrase</option>
+ <select name="searchFields[<?php echo $i ?>][match]" id="searchField_<?php
echo $i ?>_match" style="width: 100px;">
+ <option value="keyword">keyword</option>
+ <option value="phrase">phrase</option>
</select>
</td>
</tr>
Modified: trunk/apps/qubit/modules/search/templates/advancedSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/search/templates/advancedSuccess.php Tue Oct
11 11:03:18 2011 (r10017)
+++ trunk/apps/qubit/modules/search/templates/advancedSuccess.php Tue Oct
11 11:05:34 2011 (r10018)
@@ -1,82 +1,66 @@
-<script type="text/javascript">
-<!--
-/*
- function add() {
- var orig = document.getElementById('searchFields');
- var count = parseInt(document.getElementById('count').value);
- var newDiv = document.createElement('tr');
- newDiv.setAttribute("id", "item"+count);
-
- var newContent = "<td>test</td>";
-
- newDiv.innerHTML = newContent;
- orig.appendChild(newDiv);
- document.getElementById('count').value = count+1;
-
- }
- function remove() {
- var count = parseInt(document.getElementById('count').value);
- if (count > 0) {
- var orig = document.getElementById('searchFields');
- var removeDiv =
document.getElementById('item'+(count-1));
- orig.removeChild(removeDiv);
- document.getElementById('count').value = count - 1;
- }
- }
-*/
-//-->
-</script>
-
-<h1 style="text-align: left;"><?php echo __('Advanced Search') ?></h1>
-
- <form action="<?php echo url_for(array('module' => 'search', 'action' =>
'index')) ?>" method="get">
- <fieldset>
-
- <div class="form-item form-item-identifier">
- <table class="multiRow" style="white-space:nowrap;">
- <tbody>
- <?php for ($i=0; $i < 4; $i++) {
- echo get_partial('search/searchFields', array('i' => $i)); } ?>
- </tbody>
- </table>
- </div>
-
- </fieldset>
-
- <fieldset class="collapsible collapsed" id="filterLimit">
- <legend><?php echo __('Filter/Limit') ?></legend>
-
- <div class="form-item form-item-identifier">
- <label for="repository" style="display: inline;"><?php echo
__("Repository") ?></label>
- <select name="repository" id="repository">
- <option value=""></option>
- <?php foreach ($repositories as $repo): ?>
- <option value="<?php echo $repo->id; ?>"><?php echo $repo;
?></option>
- <?php endforeach; ?>
- </select>
- </div>
-
- <div class="form-item form-item-identifier">
- <label for="media" style="display: inline;"><?php echo __("Media")
?></label>
- <select name="media" id="media" >
- <option value=""></option>
- <?php foreach ($media as $medium): ?>
- <option value="<?php echo $medium->id; ?>"><?php echo $medium;
?></option>
- <?php endforeach; ?>
- </select>
- </div>
-
- <div class="form-item form-item-identifier">
- <label for="digital_object" style="display: inline;"><?php echo
__("Digital object available") ?></label>
- <select name="hasDigitalObject" id="digital_object">
- <option value="" selected>All</option>
- <option value="true">Yes</option>
- <option value="false">No</option>
- </select>
- </div>
-
- </fieldset>
- <input type="submit" name="Submit" class="form-submit" />
- <input type="reset" name="Cancel" class="form-submit" value="Reset
values"/>
+<h1><?php echo __('Advanced Search') ?></h1>
- </form>
\ No newline at end of file
+<form action="<?php echo url_for(array('module' => 'search', 'action' =>
'index')) ?>" method="get">
+
+ <div class="form-item form-item-identifier">
+ <table class="multiRow" style="white-space: nowrap;">
+ <tbody style="border-top-width: 0;">
+ <?php for ($i = 0; $i < 4; $i++): ?>
+ <?php echo get_partial('search/searchFields', array('i' => $i)) ?>
+ <?php endfor; ?>
+ </tbody>
+ </table>
+ </div>
+
+ <fieldset class="collapsible collapsed" id="filterLimit">
+
+ <legend><?php echo __('Filter/Limit') ?></legend>
+
+ <div class="form-item form-item-identifier">
+ <label for="repository" class="inline"><?php echo __("Repository")
?></label>
+ <select name="repository" id="repository">
+ <option value=""></option>
+ <?php foreach ($repositories as $item): ?>
+ <option value="<?php echo $item->id ?>"><?php echo $item ?></option>
+ <?php endforeach; ?>
+ </select>
+ </div>
+
+ <div class="form-item form-item-identifier">
+ <label for="media" style="display: inline;"><?php echo __("Media")
?></label>
+ <select name="media" id="media">
+ <option value=""></option>
+ <?php foreach ($media as $item): ?>
+ <option value="<?php echo $item->id ?>"><?php echo $item ?></option>
+ <?php endforeach; ?>
+ </select>
+ </div>
+
+ <div class="form-item form-item-identifier">
+ <label for="digital_object" style="display: inline;"><?php echo
__("Digital object available") ?></label>
+ <select name="hasDigitalObject" id="digital_object">
+ <option value="" selected>All</option>
+ <option value="true">Yes</option>
+ <option value="false">No</option>
+ </select>
+ </div>
+
+ </fieldset>
+
+ <div class="actions section">
+
+ <h2 class="element-invisible"><?php echo __('Actions') ?></h2>
+
+ <div class="content">
+ <ul class="clearfix links">
+
+ <input type="reset" name="Cancel" class="form-submit" value="<?php
echo __('Reset values') ?>"/>
+
+ <input type="submit" name="Submit" class="form-submit" />
+
+ </ul>
+ </div>
+
+ </div>
+
+</form>
--
You received this message because you are subscribed to the Google Groups
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/qubit-commits?hl=en.
