Author: jablko
Date: Mon Oct 25 15:18:04 2010
New Revision: 8487
Log:
Update autocomplete links
Modified:
trunk/apps/qubit/modules/informationobject/templates/_event.php
trunk/apps/qubit/modules/term/actions/autocompleteAction.class.php
trunk/apps/qubit/modules/term/templates/indexSuccess.php
trunk/js/dialog.js
trunk/plugins/sfDcPlugin/modules/sfDcPlugin/templates/editSuccess.php
trunk/plugins/sfIsadPlugin/modules/sfIsadPlugin/templates/editSuccess.php
trunk/plugins/sfModsPlugin/modules/sfModsPlugin/templates/editSuccess.php
trunk/plugins/sfRadPlugin/modules/sfRadPlugin/templates/editSuccess.php
Modified: trunk/apps/qubit/modules/informationobject/templates/_event.php
==============================================================================
--- trunk/apps/qubit/modules/informationobject/templates/_event.php Mon Oct
25 14:29:06 2010 (r8486)
+++ trunk/apps/qubit/modules/informationobject/templates/_event.php Mon Oct
25 15:18:04 2010 (r8487)
@@ -132,10 +132,10 @@
<?php echo $form->place->render(array('class' => 'form-autocomplete'))
?>
<?php if
(QubitAcl::check(QubitTaxonomy::getById(QubitTaxonomy::PLACE_ID),
'createTerm')): ?>
- <input class="add" type="hidden" value="<?php echo
url_for(array('module' => 'term', 'action' => 'create', 'taxonomyId' =>
QubitTaxonomy::PLACE_ID)) ?> #name"/>
+ <input class="add" type="hidden" value="<?php echo
url_for(array('module' => 'term', 'action' => 'create', 'taxonomy' =>
url_for(array('module' => 'taxonomy', 'id' => QubitTaxonomy::PLACE_ID)))) ?>
#name"/>
<?php endif; ?>
- <input class="list" type="hidden" value="<?php echo
url_for(array('module' => 'term', 'action' => 'autocomplete', 'taxonomyId' =>
QubitTaxonomy::PLACE_ID)) ?>"/>
+ <input class="list" type="hidden" value="<?php echo
url_for(array('module' => 'term', 'action' => 'autocomplete', 'taxonomy' =>
url_for(array('module' => 'taxonomy', 'id' => QubitTaxonomy::PLACE_ID)))) ?>"/>
<?php echo $form->place->renderHelp() ?>
</td>
Modified: trunk/apps/qubit/modules/term/actions/autocompleteAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/term/actions/autocompleteAction.class.php Mon Oct
25 14:29:06 2010 (r8486)
+++ trunk/apps/qubit/modules/term/actions/autocompleteAction.class.php Mon Oct
25 15:18:04 2010 (r8487)
@@ -91,8 +91,8 @@
$s2 .= ' AND qoni.name LIKE :p3';
}
- $connnection = Propel::getConnection();
- $statement = $conn->prepare("($s1) UNION ALL ($s2) ORDER BY name LIMIT
10");
+ $connection = Propel::getConnection();
+ $statement = $connection->prepare("($s1) UNION ALL ($s2) ORDER BY name
LIMIT 10");
$params =
$this->context->routing->parse(Qubit::pathInfo($request->taxonomy));
$statement->bindValue(':p1', $params['id']);
Modified: trunk/apps/qubit/modules/term/templates/indexSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/term/templates/indexSuccess.php Mon Oct 25
14:29:06 2010 (r8486)
+++ trunk/apps/qubit/modules/term/templates/indexSuccess.php Mon Oct 25
15:18:04 2010 (r8487)
@@ -123,7 +123,7 @@
<?php endif; ?>
<?php if (QubitAcl::check($resource->taxonomy, 'createTerm')): ?>
- <li><?php echo link_to(__('Add new'), array('module' => 'term',
'action' => 'create', 'parent' => url_for(array($resource, 'module' =>
'term')), 'taxonomyId' => $resource->taxonomy->id)) ?></li>
+ <li><?php echo link_to(__('Add new'), array('module' => 'term',
'action' => 'create', 'parent' => url_for(array($resource, 'module' =>
'term')), 'taxonomy' => url_for(array($resource->taxonomy, 'module' =>
'taxonomy')))) ?></li>
<?php endif; ?>
</ul>
Modified: trunk/js/dialog.js
==============================================================================
--- trunk/js/dialog.js Mon Oct 25 14:29:06 2010 (r8486)
+++ trunk/js/dialog.js Mon Oct 25 15:18:04 2010 (r8487)
@@ -444,7 +444,7 @@
.find('> div')
.hide('fast', function ()
{
- $(this).remove();
+ $tr.remove();
});
// If this is an existing relationship, then store id for deletion
Modified: trunk/plugins/sfDcPlugin/modules/sfDcPlugin/templates/editSuccess.php
==============================================================================
--- trunk/plugins/sfDcPlugin/modules/sfDcPlugin/templates/editSuccess.php
Mon Oct 25 14:29:06 2010 (r8486)
+++ trunk/plugins/sfDcPlugin/modules/sfDcPlugin/templates/editSuccess.php
Mon Oct 25 15:18:04 2010 (r8487)
@@ -43,9 +43,9 @@
->renderLabel() ?>
<?php echo $form->subjectAccessPoints->render(array('class' =>
'form-autocomplete')) ?>
<?php if
(QubitAcl::check(QubitTaxonomy::getById(QubitTaxonomy::SUBJECT_ID),
'createTerm')): ?>
- <input class="add" type="hidden" value="<?php echo
url_for(array('module' => 'term', 'action' => 'create', 'taxonomyId' =>
QubitTaxonomy::SUBJECT_ID)) ?> #name"/>
+ <input class="add" type="hidden" value="<?php echo
url_for(array('module' => 'term', 'action' => 'create', 'taxonomy' =>
url_for(array('module' => 'taxonomy', 'id' => QubitTaxonomy::SUBJECT_ID)))) ?>
#name"/>
<?php endif; ?>
- <input class="list" type="hidden" value="<?php echo url_for(array('module'
=> 'term', 'action' => 'autocomplete', 'taxonomyId' =>
QubitTaxonomy::SUBJECT_ID)) ?>"/>
+ <input class="list" type="hidden" value="<?php echo url_for(array('module'
=> 'term', 'action' => 'autocomplete', 'taxonomy' => url_for(array('module' =>
'taxonomy', 'id' => QubitTaxonomy::SUBJECT_ID)))) ?>"/>
<?php echo $form->subjectAccessPoints
->help(__('The topic of the resource. Search for an existing term in the
Subject taxonomy by typing the first few characters of the term name.
Alternatively, type a new name to create and link to a new subject term.'))
->renderHelp() ?>
@@ -119,9 +119,9 @@
->renderLabel() ?>
<?php echo $form->placeAccessPoints->render(array('class' =>
'form-autocomplete')) ?>
<?php if (QubitAcl::check(QubitTaxonomy::getById(QubitTaxonomy::PLACE_ID),
'createTerm')): ?>
- <input class="add" type="hidden" value="<?php echo
url_for(array('module' => 'term', 'action' => 'create', 'taxonomyId' =>
QubitTaxonomy::PLACE_ID)) ?> #name"/>
+ <input class="add" type="hidden" value="<?php echo
url_for(array('module' => 'term', 'action' => 'create', 'taxonomy' =>
url_for(array('module' => 'taxonomy', 'id' => QubitTaxonomy::PLACE_ID)))) ?>
#name"/>
<?php endif; ?>
- <input class="list" type="hidden" value="<?php echo url_for(array('module'
=> 'term', 'action' => 'autocomplete', 'taxonomyId' =>
QubitTaxonomy::PLACE_ID)) ?>"/>
+ <input class="list" type="hidden" value="<?php echo url_for(array('module'
=> 'term', 'action' => 'autocomplete', 'taxonomy' => url_for(array('module' =>
'taxonomy', 'id' => QubitTaxonomy::PLACE_ID)))) ?>"/>
<?php echo $form->placeAccessPoints
->help(__('<p>The name of a place or geographic area which is a topic of
the resource or relevant to its jurisdiction.</p><p>Search for an existing term
in the Place taxonomy by typing the first few characters of the place name.
Alternatively, type a new name to create and link to a new place.</p><p>Please
note: if you entered a place of creation, publication or contribution that will
be output automatically, so don’t repeat that place name here.</p>'))
->renderHelp() ?>
Modified:
trunk/plugins/sfIsadPlugin/modules/sfIsadPlugin/templates/editSuccess.php
==============================================================================
--- trunk/plugins/sfIsadPlugin/modules/sfIsadPlugin/templates/editSuccess.php
Mon Oct 25 14:29:06 2010 (r8486)
+++ trunk/plugins/sfIsadPlugin/modules/sfIsadPlugin/templates/editSuccess.php
Mon Oct 25 15:18:04 2010 (r8487)
@@ -254,9 +254,9 @@
->renderLabel() ?>
<?php echo $form->subjectAccessPoints->render(array('class' =>
'form-autocomplete')) ?>
<?php if
(QubitAcl::check(QubitTaxonomy::getById(QubitTaxonomy::SUBJECT_ID),
'createTerm')): ?>
- <input class="add" type="hidden" value="<?php echo
url_for(array('module' => 'term', 'action' => 'create', 'taxonomyId' =>
QubitTaxonomy::SUBJECT_ID)) ?> #name"/>
+ <input class="add" type="hidden" value="<?php echo
url_for(array('module' => 'term', 'action' => 'create', 'taxonomy' =>
url_for(array('module' => 'taxonomy', 'id' => QubitTaxonomy::SUBJECT_ID)))) ?>
#name"/>
<?php endif; ?>
- <input class="list" type="hidden" value="<?php echo
url_for(array('module' => 'term', 'action' => 'autocomplete', 'taxonomyId' =>
QubitTaxonomy::SUBJECT_ID)) ?>"/>
+ <input class="list" type="hidden" value="<?php echo
url_for(array('module' => 'term', 'action' => 'autocomplete', 'taxonomy' =>
url_for(array('module' => 'taxonomy', 'id' => QubitTaxonomy::SUBJECT_ID))))
?>"/>
</div>
<div class="form-item">
@@ -265,9 +265,9 @@
->renderLabel() ?>
<?php echo $form->placeAccessPoints->render(array('class' =>
'form-autocomplete')) ?>
<?php if
(QubitAcl::check(QubitTaxonomy::getById(QubitTaxonomy::PLACE_ID),
'createTerm')): ?>
- <input class="add" type="hidden" value="<?php echo
url_for(array('module' => 'term', 'action' => 'create', 'taxonomyId' =>
QubitTaxonomy::PLACE_ID)) ?> #name"/>
+ <input class="add" type="hidden" value="<?php echo
url_for(array('module' => 'term', 'action' => 'create', 'taxonomy' =>
url_for(array('module' => 'taxonomy', 'id' => QubitTaxonomy::PLACE_ID)))) ?>
#name"/>
<?php endif; ?>
- <input class="list" type="hidden" value="<?php echo
url_for(array('module' => 'term', 'action' => 'autocomplete', 'taxonomyId' =>
QubitTaxonomy::PLACE_ID)) ?>"/>
+ <input class="list" type="hidden" value="<?php echo
url_for(array('module' => 'term', 'action' => 'autocomplete', 'taxonomy' =>
url_for(array('module' => 'taxonomy', 'id' => QubitTaxonomy::PLACE_ID)))) ?>"/>
</div>
<div class="form-item">
Modified:
trunk/plugins/sfModsPlugin/modules/sfModsPlugin/templates/editSuccess.php
==============================================================================
--- trunk/plugins/sfModsPlugin/modules/sfModsPlugin/templates/editSuccess.php
Mon Oct 25 14:29:06 2010 (r8486)
+++ trunk/plugins/sfModsPlugin/modules/sfModsPlugin/templates/editSuccess.php
Mon Oct 25 15:18:04 2010 (r8487)
@@ -89,9 +89,9 @@
->help(__('A term or phrase representing the primary topic(s) on which a
work is focused. Search for an existing term in the Subjects taxonomy by typing
the first few characters of the term name. Alternatively, type a new name to
create and link to a new subject term.'))
->renderHelp() ?>
<?php if
(QubitAcl::check(QubitTaxonomy::getById(QubitTaxonomy::SUBJECT_ID),
'createTerm')): ?>
- <input class="add" type="hidden" value="<?php echo
url_for(array('module' => 'term', 'action' => 'create', 'taxonomyId' =>
QubitTaxonomy::SUBJECT_ID)) ?> #name"/>
+ <input class="add" type="hidden" value="<?php echo
url_for(array('module' => 'term', 'action' => 'create', 'taxonomy' =>
url_for(array('module' => 'taxonomy', 'id' => QubitTaxonomy::SUBJECT_ID)))) ?>
#name"/>
<?php endif; ?>
- <input class="list" type="hidden" value="<?php echo url_for(array('module'
=> 'term', 'action' => 'autocomplete', 'taxonomyId' =>
QubitTaxonomy::SUBJECT_ID)) ?>"/>
+ <input class="list" type="hidden" value="<?php echo url_for(array('module'
=> 'term', 'action' => 'autocomplete', 'taxonomy' => url_for(array('module' =>
'taxonomy', 'id' => QubitTaxonomy::SUBJECT_ID)))) ?>"/>
</div>
<?php echo render_field($form->accessConditions
Modified:
trunk/plugins/sfRadPlugin/modules/sfRadPlugin/templates/editSuccess.php
==============================================================================
--- trunk/plugins/sfRadPlugin/modules/sfRadPlugin/templates/editSuccess.php
Mon Oct 25 14:29:06 2010 (r8486)
+++ trunk/plugins/sfRadPlugin/modules/sfRadPlugin/templates/editSuccess.php
Mon Oct 25 15:18:04 2010 (r8487)
@@ -363,9 +363,9 @@
->renderLabel() ?>
<?php echo $form->subjectAccessPoints->render(array('class' =>
'form-autocomplete')) ?>
<?php if
(QubitAcl::check(QubitTaxonomy::getById(QubitTaxonomy::SUBJECT_ID),
'createTerm')): ?>
- <input class="add" type="hidden" value="<?php echo
url_for(array('module' => 'term', 'action' => 'create', 'taxonomyId' =>
QubitTaxonomy::SUBJECT_ID)) ?> #name"/>
+ <input class="add" type="hidden" value="<?php echo
url_for(array('module' => 'term', 'action' => 'create', 'taxonomy' =>
url_for(array('module' => 'taxonomy', 'id' => QubitTaxonomy::SUBJECT_ID)))) ?>
#name"/>
<?php endif; ?>
- <input class="list" type="hidden" value="<?php echo
url_for(array('module' => 'term', 'action' => 'autocomplete', 'taxonomyId' =>
QubitTaxonomy::SUBJECT_ID)) ?>"/>
+ <input class="list" type="hidden" value="<?php echo
url_for(array('module' => 'term', 'action' => 'autocomplete', 'taxonomy' =>
url_for(array('module' => 'taxonomy', 'id' => QubitTaxonomy::SUBJECT_ID))))
?>"/>
<?php echo $form->subjectAccessPoints
->help(__('Search for an existing term in the Subjects taxonomy by
typing the first few characters of the term. Alternatively, type a new term to
create and link to a new subject term.'))
->renderHelp() ?>
@@ -377,9 +377,9 @@
->renderLabel() ?>
<?php echo $form->placeAccessPoints->render(array('class' =>
'form-autocomplete')) ?>
<?php if
(QubitAcl::check(QubitTaxonomy::getById(QubitTaxonomy::PLACE_ID),
'createTerm')): ?>
- <input class="add" type="hidden" value="<?php echo
url_for(array('module' => 'term', 'action' => 'create', 'taxonomyId' =>
QubitTaxonomy::PLACE_ID)) ?> #name"/>
+ <input class="add" type="hidden" value="<?php echo
url_for(array('module' => 'term', 'action' => 'create', 'taxonomy' =>
url_for(array('module' => 'taxonomy', 'id' => QubitTaxonomy::PLACE_ID)))) ?>
#name"/>
<?php endif; ?>
- <input class="list" type="hidden" value="<?php echo
url_for(array('module' => 'term', 'action' => 'autocomplete', 'taxonomyId' =>
QubitTaxonomy::PLACE_ID)) ?>"/>
+ <input class="list" type="hidden" value="<?php echo
url_for(array('module' => 'term', 'action' => 'autocomplete', 'taxonomy' =>
url_for(array('module' => 'taxonomy', 'id' => QubitTaxonomy::PLACE_ID)))) ?>"/>
<?php echo $form->placeAccessPoints
->help(__('Search for an existing term in the Places taxonomy by
typing the first few characters of the term name. Alternatively, type a new
term to create and link to a new place term.'))
->renderHelp() ?>
--
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.
