Browse Source

[search] Removed edit link from collection manager page

Enrico Berti 12 years ago
parent
commit
4309dcd253

+ 4 - 5
apps/search/src/search/templates/admin_collections.mako

@@ -28,7 +28,7 @@ ${ commonheader(_('Search'), "search", user, "40px") | n,unicode }
 
 
 <div class="search-bar" style="height: 30px">
 <div class="search-bar" style="height: 30px">
     <div class="pull-right" style="margin-top: 4px; margin-right: 20px">
     <div class="pull-right" style="margin-top: 4px; margin-right: 20px">
-      <a href="${ url('search:index') }"><i class="icon-share-alt"></i> ${ _('Query UI') }</a>
+      <a href="${ url('search:index') }"><i class="icon-share-alt"></i> ${ _('Search page') }</a>
     </div>
     </div>
   <h4>${_('Collection Manager')}</h4>
   <h4>${_('Collection Manager')}</h4>
 </div>
 </div>
@@ -65,11 +65,10 @@ ${ commonheader(_('Search'), "search", user, "40px") | n,unicode }
   </div>
   </div>
 
 
   <script id="collectionTemplate" type="text/html">
   <script id="collectionTemplate" type="text/html">
-    <li style="cursor: move">
+    <li style="cursor: pointer" data-bind="click: $root.editCollection">
       <div class="pull-right" style="margin-top: 10px;margin-right: 10px; cursor: pointer">
       <div class="pull-right" style="margin-top: 10px;margin-right: 10px; cursor: pointer">
-        <a data-bind="attr: {'href': absoluteUrl}"><i class="icon-edit"></i> ${_('Edit')}</a> &nbsp;
-        <a data-bind="click: $root.copyCollection"><i class="icon-copy"></i> ${_('Copy')}</a> &nbsp;
-        <a data-bind="click: $root.markForDeletion"><i class="icon-remove"></i> ${_('Delete')}</a>
+        <a data-bind="click: $root.copyCollection, clickBubble: false"><i class="icon-copy"></i> ${_('Copy')}</a> &nbsp;
+        <a data-bind="click: $root.markForDeletion, clickBubble: false"><i class="icon-remove"></i> ${_('Delete')}</a>
       </div>
       </div>
       <h4><i class="icon-list"></i> <span data-bind="text: label"></span></h4>
       <h4><i class="icon-list"></i> <span data-bind="text: label"></span></h4>
     </li>
     </li>

+ 1 - 1
apps/search/src/search/templates/layout.mako

@@ -30,7 +30,7 @@
   <div class="search-bar" style="height: 30px">
   <div class="search-bar" style="height: 30px">
       <div class="pull-right" style="margin-top: 4px; margin-right: 20px">
       <div class="pull-right" style="margin-top: 4px; margin-right: 20px">
         <a href="${ url('search:index') }"><i class="icon-share-alt"></i> ${ _('Search page') }</a> &nbsp; &nbsp;
         <a href="${ url('search:index') }"><i class="icon-share-alt"></i> ${ _('Search page') }</a> &nbsp; &nbsp;
-        <a href="${ url('search:admin_collections') }"><i class="icon-edit"></i> ${ _('Collection manager') }</a>
+        <a href="${ url('search:admin_collections') }"><i class="icon-sitemap"></i> ${ _('Collection manager') }</a>
       </div>
       </div>
     %if hasattr(caller, "title"):
     %if hasattr(caller, "title"):
       ${caller.title()}
       ${caller.title()}

+ 7 - 0
apps/search/static/js/search.ko.js

@@ -98,6 +98,13 @@ var SearchCollectionsModel = function (props) {
     }));
     }));
   };
   };
 
 
+  self.editCollection = function (collection) {
+    self.isLoading(true);
+    self.collections.removeAll();
+    self.filteredCollections.removeAll();
+    location.href = collection.absoluteUrl();
+  };
+
   self.markForDeletion = function (collection) {
   self.markForDeletion = function (collection) {
     self.collectionToDelete = collection;
     self.collectionToDelete = collection;
     $(document).trigger("confirmDelete");
     $(document).trigger("confirmDelete");