Interface fix: add an hyperlink from bookmark edition page to collaborative edition...

git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@175 b3834d28-1941-0410-a4f8-b48e95affb8f

diff --git a/bookmarkcommondescriptionedit.php b/bookmarkcommondescriptionedit.php
index 1ac316e826a77cc88bf993fdcb2716cd787219e6..ec7aee21ce83d608976de7939771f4bf85f1a543 100644 (file)
--- a/bookmarkcommondescriptionedit.php
+++ b/bookmarkcommondescriptionedit.php
@@ -33,8 +33,15 @@ isset($_POST['cancel']) ? define('POST_CANCEL', $_POST['cancel']): define('POST_
 isset($_POST['hash']) ? define('POST_HASH', $_POST['hash']): define('POST_HASH', '');
 isset($_POST['title']) ? define('POST_TITLE', $_POST['title']): define('POST_TITLE', '');
 isset($_POST['description']) ? define('POST_DESCRIPTION', $_POST['description']): define('POST_DESCRIPTION', '');
-isset($_POST['referrer']) ? define('POST_REFERRER', $_POST['referrer']): define('POST_REFERRER', '');
 
+// prevent cycle between personal and common edit page
+if(!isset($_POST['referrer'])) {
+       define('POST_REFERRER', '');
+} elseif(strpos($_POST['referrer'], ROOT.'edit.php') == 0) {
+       define('POST_REFERRER', createUrl('history', POST_HASH));
+} else {
+       define('POST_REFERRER', $_POST['referrer']);
+}
 
 
 list ($url, $hash) = explode('/', $_SERVER['PATH_INFO']);

diff --git a/services/bookmarkservice.php b/services/bookmarkservice.php
index 73cdf84fcf5acab36f13e2c8a22cfab52084c4b9..4c3cbca01a6ed300fc9de41ded728b6856290360 100644 (file)
--- a/services/bookmarkservice.php
+++ b/services/bookmarkservice.php
@@ -66,6 +66,10 @@ class BookmarkService {
        function getBookmarkByHash($hash) {
                return $this->_getbookmark('bHash', $hash, true);
        }
+       
+       function countBookmarks($uId) {
+               
+       }
 
        function editAllowed($bookmark) {
                if (!is_numeric($bookmark) && (!is_array($bookmark) || !is_numeric($bookmark['bId'])))

diff --git a/templates/bookmarkcommondescriptionedit.tpl.php b/templates/bookmarkcommondescriptionedit.tpl.php
index 053ee30e4180c9d40ea4e82196368ea9f16e7675..ac3f5407f8a62e3b0d70a0c41afeb6954d313887 100644 (file)
--- a/templates/bookmarkcommondescriptionedit.tpl.php
+++ b/templates/bookmarkcommondescriptionedit.tpl.php
@@ -15,7 +15,7 @@ window.onload = function() {
 </script>
 
 <form action="<?php echo $formaction; ?>" method="post">
-<table>
+<table title="<?php echo T_('Collaborative description: these fields can be viewed and modified by every users') ?>">
 <tr>
     <th align="left"><?php echo T_('Title'); ?></th>
     <td><input type="text" id="title" name="title" size="75" maxlength="255" value="<?php echo $description['cdTitle']; ?>" onkeypress="this.style.backgroundImage = 'none';" /></td>

diff --git a/templates/bookmarks.tpl.php b/templates/bookmarks.tpl.php
index ce34634a040eba9fac7ebdce2f4121d14e5109a8..7ab54ab6ee991eeaa96fcb5f8470f8e06f3dfa09 100644 (file)
--- a/templates/bookmarks.tpl.php
+++ b/templates/bookmarks.tpl.php
@@ -6,10 +6,6 @@ $bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService');
 $tagservice =& ServiceFactory::getServiceInstance('TagService');
 $cdservice =& ServiceFactory::getServiceInstance('CommonDescriptionService');
 
-//$logged_on_userid = $userservice->getCurrentUserId();
-//$currentUser = $userservice->getCurrentUser();
-//$currentUsername = $currentUser[$userservice->getFieldName('username')];
-
 // Momentary useful to go to object code
 $currentObjectUser = $userservice->getCurrentObjectUser();
 

diff --git a/templates/editbookmark.tpl.php b/templates/editbookmark.tpl.php
index b1124553793c428c28aab99ae4a42ce918aa950f..4f97dac17aa222ca1d2d59d94f3fe668d303ac5c 100644 (file)
--- a/templates/editbookmark.tpl.php
+++ b/templates/editbookmark.tpl.php
@@ -76,6 +76,11 @@ switch ($row['bStatus']) {
         <input type="submit" name="delete" value="<?php echo T_('Delete Bookmark'); ?>" />
         <?php
         }
+        if (isset($showdelete) && $showdelete) {
+                       echo ' (<a href="'.createURL('bookmarkcommondescriptionedit', $row['bHash']).'">';
+                       echo T_('edit common description').'</a>)';
+        }
+        
         if ($popup) {
         ?>
         <input type="hidden" name="popup" value="1" />