Minor Fix: improve common description of tags and add variable into config file to...

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

diff --git a/config.inc.php.example b/config.inc.php.example
index e8fc9b243a3470e60b254791cf3887225aacc3d2..02ec288ac4782b6863b99a116c0edb7f1c805fff 100644 (file)
--- a/config.inc.php.example
+++ b/config.inc.php.example
@@ -15,7 +15,7 @@ $usecache           = false; # use cache ? {true,false}
 $dir_cache          = dirname(__FILE__) .'/cache/'; # directory where cache files will be stored
 $cleanurls          = false; # Use mod_rewrite to hide PHP extensions {true,false[default]}
                             # be cautious, doesn't work for all hosts, you may need to modify the .htaccess file
-$debugMode         = false; # if true, show debug messages                          
+$debugMode          = false; # if true, show debug messages                         
 
 #### Database ####
 $dbtype = 'mysql4'; # Database driver {mysql, mysqli, mysql4, oracle, postgres, sqlite, db2, firebird, mssql, mssq-odbc}
@@ -78,6 +78,7 @@ $thumbnailsKey = '';   #then artviper.net send you a UserId and a secretKey
 
 ### Tags ###
 $enableCommonTagDescription = true; # enableCommonTagDescription {true, false}
+$enableCommonTagDescriptionEditedByAll = true; #true mean everybody can edit common description. Else just the admins can do it.
 $menuTag = 'menu'; # name of the tag whose subtags will appear into the menu box
 $maxSizeMenuBlock = 7; # maximum number of items (tags) appearing into menu box
 $menu2Tags = array('example', 'of', 'menu', 'tags'); # list of tags used by menu2 sidebar box (void list = hidden menu2 box)

diff --git a/scuttle.css b/scuttle.css
index 28377e0172974fa79f27ba960027a1617c1242d0..17fe23a1e04284819905d6b25f73240497130697 100644 (file)
--- a/scuttle.css
+++ b/scuttle.css
@@ -302,6 +302,7 @@ p.commondescription {
     padding-left:5px;
     color: #555;
     font-weight: bold;
+    font-size: medium;
     border-left: 1px solid #CC8;
     width: 70%;
 }

diff --git a/tagcommondescriptionedit.php b/tagcommondescriptionedit.php
index 3d13d66e30f7c2289ef2d45d54fc7a9fa2649a01..aba7c433f34db91974143da04f33a6f52c1108ad 100644 (file)
--- a/tagcommondescriptionedit.php
+++ b/tagcommondescriptionedit.php
@@ -39,7 +39,7 @@ $currentUser = $userservice->getCurrentObjectUser();
 list ($url, $tag) = explode('/', $_SERVER['PATH_INFO']);
 
 //permissions
-if(!$userservice->isLoggedOn()) {
+if(!$userservice->isLoggedOn() || (!$GLOBALS['enableCommonTagDescriptionEditedByAll'] && !$currentUser->isAdmin())) {
        $tplVars['error'] = T_('Permission denied.');
        $templateservice->loadTemplate('error.500.tpl', $tplVars);
        exit();

diff --git a/templates/bookmarks.tpl.php b/templates/bookmarks.tpl.php
index adb6b24cdf29df6e2c3ffbcf5df1572aa13218cb..b0ed3e80f0a96fccea722f672ee9c8880c24b9ec 100644 (file)
--- a/templates/bookmarks.tpl.php
+++ b/templates/bookmarks.tpl.php
@@ -35,23 +35,25 @@ if(($currenttag!= '' && $GLOBALS['enableCommonTagDescription'])
 
 
 <p class="commondescription"><?php
+$cDescription = '';
 if($currenttag!= '' && $cdservice->getLastTagDescription($currenttag)) {
-       $description = $cdservice->getLastTagDescription($currenttag);
-       echo nl2br(filter($description['cdDescription']));
+       $cDescription = $cdservice->getLastTagDescription($currenttag);
+       echo nl2br(filter($cDescription['cdDescription']));
 } elseif(isset($hash) && $cdservice->getLastBookmarkDescription($hash)) {
-       $description = $cdservice->getLastBookmarkDescription($hash);
-       echo nl2br(filter($description['cdTitle'])). "<br/>";
-       echo nl2br(filter($description['cdDescription'])). "<br/>";
+       $cDescription = $cdservice->getLastBookmarkDescription($hash);
+       echo nl2br(filter($cDescription['cdTitle'])). "<br/>";
+       echo nl2br(filter($cDescription['cdDescription'])). "<br/>";
 }
 
 //common tag description edit
 if($userservice->isLoggedOn()) {
-       if($currenttag!= '') {
-               echo ' <a href="'. createURL('tagcommondescriptionedit', $currenttag).'">';
-               echo T_('common description').' <img src="'.ROOT.'images/b_edit.png" /></a>';
+       if($currenttag!= '' && ($GLOBALS['enableCommonTagDescriptionEditedByAll'] || $currentUser->isAdmin())) {
+               echo ' <a href="'. createURL('tagcommondescriptionedit', $currenttag).'" title="'.T_('Edit the common description of this tag').'">';
+               echo !is_array($cDescription) || strlen($cDescription['cdDescription'])==0?T_('Edit the common description of this tag'):'';
+               echo ' <img src="'.ROOT.'images/b_edit.png" /></a>';
        } elseif(isset($hash)) {
-               echo ' (<a href="'.createURL('bookmarkcommondescriptionedit', $hash).'">';
-               echo T_('edit common description').'</a>)';
+               echo ' (<a href="'.createURL('bookmarkcommondescriptionedit', $hash).'" title="'.T_('Edit the common description of this bookmark').'">';
+               echo T_('Edit the common description of this bookmark').'</a>)';
        }
 }
 ?></p>
@@ -65,14 +67,15 @@ if($currenttag!= '' && $user!='') {
        if($tagservice->getDescription($currenttag, $userObject['uId'])) { ?>
 
 <p class="commondescription"><?php
-$description = $tagservice->getDescription($currenttag, $userObject['uId']);
-echo nl2br(filter($description['tDescription']));
+$pDescription = $tagservice->getDescription($currenttag, $userObject['uId']);
+echo nl2br(filter($pDescription['tDescription']));
 
 //personal tag description edit
 if($userservice->isLoggedOn()) {
        if($currenttag!= '') {
-               echo ' <a href="'. createURL('tagedit', $currenttag).'">';
-               echo T_('personal description').' <img src="'.ROOT.'images/b_edit.png" /></a>';
+               echo ' <a href="'. createURL('tagedit', $currenttag).'" title="'.T_('Edit your personal description of this tag').'" >';
+               echo strlen($pDescription['tDescription'])==0?T_('Edit your personal description of this tag'):'';
+               echo ' <img src="'.ROOT.'images/b_edit.png" /></a>';
        }
 }
 ?></p>

diff --git a/templates/sidebar.block.tagactions.php b/templates/sidebar.block.tagactions.php
index 37bf5c6cd8c29cf1b26370fe3622306b56167336..3351866a36b3c04597f4e6723af9930ddb280ab1 100644 (file)
--- a/templates/sidebar.block.tagactions.php
+++ b/templates/sidebar.block.tagactions.php
@@ -22,7 +22,7 @@ if ($userservice->isLoggedOn()) {
         <li><a href="<?php echo $deletelink; ?>"><?php echo T_('Delete Tag') ?></a></li>
         <?php endif; ?>
         <li><a href="<?php echo $tagdesclink; ?>"><?php echo T_('Edit Tag Description') ?></a></li>
-        <?php if ($GLOBALS['enableCommonTagDescription']): ?>
+        <?php if ($GLOBALS['enableCommonTagDescription'] && ($GLOBALS['enableCommonTagDescriptionEditedByAll'] || $currentUser->isAdmin() )): ?>
         <li><a href="<?php echo $commondesclink; ?>"><?php echo T_('Edit Tag Common Description') ?></a></li>
        <?php endif; ?>
         <li><a href="<?php echo $addtag2taglinklink; ?>"><?php echo T_('Create a link to another tag') ?></a></li>

diff --git a/upgrade.txt b/upgrade.txt
index 023b93f3b235de990ef095c90fca25b9be6ff120..485e3e000c7e11f29ce6ae2cda4fdd98eb13d310 100644 (file)
--- a/upgrade.txt
+++ b/upgrade.txt
@@ -95,6 +95,7 @@ ALTER TABLE `sc_searchhistory` CHARACTER SET utf8 COLLATE utf8_general_ci;
 
 - Upgrade your current configuration file (config.inc.php) with respect to config.inc.php.example
 * Add variable : $descriptionAnchors = array("author", "isbn", "address"=>"[address][street][/street][city][/city][/address]"); #add a possible anchor (structured content) for bookmarks' description field
+* Add variable : $enableCommonTagDescriptionEditedByAll = true; #true mean everybody can edit common description. Else just the admins can do it.
 
 === From version 0.90 to 0.91 ===
 - Backup you database