Changeset 9766 for extensions/Comments_on_Albums

Timestamp:

Mar 19, 2011, 10:39:36 AM (13 years ago)

Author:

mistic100

Message:

[plugins] Comments on Albums

• compatible with BBCode Bar and/or Smilies Support
• better css integration

Location:

extensions/Comments_on_Albums

Files:

• admin/config.php (modified) (2 diffs)
• admin/template/config.tpl (modified) (4 diffs)
• changelog.txt (modified) (1 diff)
• include/coa_admin_comments.php (modified) (2 diffs)
• include/coa_albums.php (modified) (1 diff)
• include/coa_comments_page.php (modified) (4 diffs)
• include/index.php (added)
• language/en_UK/plugin.lang.php (modified) (1 diff)
• language/fr_FR/plugin.lang.php (modified) (1 diff)
• language/hu_HU/plugin.lang.php (modified) (1 diff)
• main.inc.php (modified) (3 diffs)
• maintain.inc.php (modified) (1 diff)
• template/coa_albums.tpl (modified) (1 diff)
• template/coa_comments_page.tpl (modified) (1 diff)
• template/index.php (added)
• template/s26/index.php (added)
• template/style_albums.css (modified) (1 diff)
• template/style_albums_sylvia.css (added)
• template/style_comments.css (modified) (1 diff)

extensions/Comments_on_Albums/admin/config.php

@@ -6 +6 @@
 // +-----------------------------------------------------------------------+
 if (isset($_POST['config_submit'])) {
-        $user_config = array(
+        $conf['comments_on_albums'] = array(
                 'icon_color' => $_POST['icon_color'],
                 'icon_color_over' => $_POST['icon_color_over'],
         );
         
-        pwg_query("UPDATE " . CONFIG_TABLE . " SET `value` = '" . serialize($user_config) . "' WHERE `param` = 'comments_on_albums';");
-        redirect(COA_ADMIN . '-config&msg=saved');
+        pwg_query("UPDATE " . CONFIG_TABLE . " SET `value` = '" . serialize($conf['comments_on_albums']) . "' WHERE `param` = 'comments_on_albums';");
+        array_push($page['infos'], l10n('Information data registered in database'));
 }       
+
 
 // +-----------------------------------------------------------------------+
 //                              Template
 // +-----------------------------------------------------------------------+
-if (isset($_GET['msg']) AND $_GET['msg'] == 'saved') {
-        array_push($page['infos'], l10n('Information data registered in database'));
-}
 
 // available icons
 $dh = opendir(COA_PATH . 'template/s26');
 while (($file = readdir($dh)) !== false ) {
-        if ($file !== '.' && $file !== '..') {
-                $color = preg_replace('#^outline\_([a-f0-9]{6})\.png$#', '$1', $file);
-                $template->append('COLORS', $color);
+        if ($file !== '.' AND $file !== '..' 
+        AND in_array(strtolower(end(explode('.', $file))), array('jpg', 'png', 'gif'))) {
+                $template->append('COLORS', $file);
         }
 }
 closedir($dh);
         
-
 $template->assign(array(
         'ICON_COLOR' => $conf['comments_on_albums']['icon_color'],
@@ -38 +35 @@
 ));
 
-
 $template->set_filenames(array('plugin_admin_content' => dirname(__FILE__).'/template/config.tpl'));
 $template->assign_var_from_handle('ADMIN_CONTENT', 'plugin_admin_content');
+
 ?>

extensions/Comments_on_Albums/admin/template/config.tpl

@@ -1 @@
-{combine_script id='jquery' path='themes/default/js/jquery.min.js'}
-{combine_script id='jquery.cluetip' path='themes/default/js/plugins/jquery.cluetip.js'}
+{combine_script id='jquery.cluetip' require='jquery' path='themes/default/js/plugins/jquery.cluetip.js'}
 {combine_css path=$COA_PATH|@cat:'admin/template/style.css'}
 
-{footer_script}
+{footer_script require='jquery'}
 {literal}
         jQuery().ready(function(){
@@ -13 +12 @@
 {/literal}              
                 jQuery('select').change(function() {ldelim}
-                        jQuery('#' + jQuery(this).attr('name') + '_live').attr('src', '{$COA_PATH}template/s26/outline_' + jQuery(this).val() + '.png');
+                        jQuery('#' + jQuery(this).attr('name') + '_live').attr('src', '{$COA_PATH}template/s26/' + jQuery(this).val());
                 });
         });
-
 {/footer_script}
 
@@ -42 +40 @@
                                         <select name="icon_color">
                                         {foreach from=$COLORS item=COLOR}
-                                                <option value="{$COLOR}" style="color:#{$COLOR};" {if $COLOR == $ICON_COLOR}selected="selected"{/if}>{$COLOR}</option>
+                                                <option value="{$COLOR}" {if $COLOR == $ICON_COLOR}selected="selected"{/if}>{$COLOR}</option>
                                         {/foreach}
                                         </select>
                                         
-                                        <img id="icon_color_live" class="pwg-icon" src="{$COA_PATH}template/s26/outline_{$ICON_COLOR}.png"/>
+                                        <img id="icon_color_live" class="pwg-icon" src="{$COA_PATH}template/s26/{$ICON_COLOR}"/>
                                 </td>
                         </tr>
@@ -58 +56 @@
                                         </select>
                                         
-                                        <img id="icon_color_over_live" class="pwg-icon" src="{$COA_PATH}template/s26/outline_{$ICON_COLOR_OVER}.png"/>
+                                        <img id="icon_color_over_live" class="pwg-icon" src="{$COA_PATH}template/s26/{$ICON_COLOR_OVER}"/>
                                 </td>
                         </tr>

extensions/Comments_on_Albums/changelog.txt

@@ +1 @@
+1.0
+- first public version
+- compatible with BBCode Bar and/or Smilies Support
+- better css integration
+
 0.3
 - stable version

extensions/Comments_on_Albums/include/coa_admin_comments.php

@@ -92 +92 @@
 
         $query = 'SELECT 
-                        c.id, 
-                        c.category_id, 
-                        c.date, 
-                        c.author,
+                        com.id, 
+                        com.category_id, 
+                        com.date, 
+                        com.author,
                         '.$conf['user_fields']['username'].' AS username, 
-                        c.content, 
-                        i.name
-                FROM '.COA_TABLE.' AS c
-                INNER JOIN '.CATEGORIES_TABLE.' AS i
-                ON i.id = c.category_id
+                        com.content, 
+                        cat.name
+                FROM '.COA_TABLE.' AS com
+                INNER JOIN '.CATEGORIES_TABLE.' AS cat
+                ON cat.id = com.category_id
                 LEFT JOIN '.USERS_TABLE.' AS u
-                ON u.'.$conf['user_fields']['id'].' = c.author_id
+                ON u.'.$conf['user_fields']['id'].' = com.author_id
                 WHERE validated = \'false\'
-                ORDER BY c.date DESC
+                ORDER BY com.date DESC
         ;';
         $result = pwg_query($query);
 
         while ($row = pwg_db_fetch_assoc($result)) {
+                // author
                 if (empty($row['author_id'])) {
                         $author_name = $row['author'];
@@ -116 +117 @@
                 }
                 
+                // comment content
                 $template->append('comments', array(
                         'CAT_URL' => PHPWG_ROOT_PATH.'admin.php?page=cat_modify&cat_id='.$row['category_id'],

extensions/Comments_on_Albums/include/coa_albums.php

@@ -154 +154 @@
                 $query = 'SELECT
                                 com.id,
-                                author,
-                                author_id,
+                                com.author,
+                                com.author_id,
                                 '.$conf['user_fields']['username'].' AS username,
-                                date,
-                                category_id,
-                                content,
-                                validated
+                                com.date,
+                                com.category_id,
+                                com.content,
+                                com.validated
                         FROM '.COA_TABLE.' AS com
                         LEFT JOIN '.USERS_TABLE.' AS u

extensions/Comments_on_Albums/include/coa_comments_page.php

@@ -27 +27 @@
         <style type="text/css">
                 .pwg-icon-comments-albums {ldelim}
-                        background-image: url({$COA_PATH}template/s26/outline_{$ICON_COLOR}.png);
+                        background-image: url({$COA_PATH}template/s26/{$ICON_COLOR});
                         background-position: -26px 0;
                 }
                 a:hover .pwg-icon-comments-albums {ldelim}
-                        background-image: url({$COA_PATH}template/s26/outline_{$ICON_COLOR_OVER}.png);
+                        background-image: url({$COA_PATH}template/s26/{$ICON_COLOR_OVER});
                         background-position: -26px 0;
                 }
@@ -148 +148 @@
                         com.author,
                         com.author_id,
+                        '.$conf['user_fields']['username'].' AS username,
                         com.date,
                         com.content,
@@ -198 +199 @@
 
                 foreach ($comments as $comment) {
-                        // comment content
+                        // category
                         $name = $categories[$comment['comment_id']]['name'];
                         $url = duplicate_index_url(array(
@@ -207 +208 @@
                                 ),array('start')
                         ));
+                        
+                        // comment content
                         $tpl_comment = array(
                                 'CAT_URL' => $url,

extensions/Comments_on_Albums/language/en_UK/plugin.lang.php

@@ -10 +10 @@
 $lang['COA_icon_over'] = 'Over state';
 
-$lang['COA_help_icon_pack'] = "Select which icons must be used on the main Comments page.";/*<br>
+$lang['COA_help_icon_pack'] = "Select which icons must be used on the main Comments page.<br>
         <br>
-        You can add your owns in the folder <i>plugins/comments_on_pictures/template/s26</i>.<br>
-        Please respect the name scheme !";*/
+        You can add your owns in the folder <i>plugins/comments_on_pictures/template/s26</i>.";
         
 ?>

extensions/Comments_on_Albums/language/fr_FR/plugin.lang.php

@@ -10 +10 @@
 $lang['COA_icon_over'] = 'Etat haut';
 
-$lang['COA_help_icon_pack'] = "Selectionnez les icônes à utiliser sur la page principale des commentaires";/*<br>
+$lang['COA_help_icon_pack'] = "Selectionnez les icônes à utiliser sur la page principale des commentaires<br>
         <br>
-        Vous pouvez ajouter les votres dans le dossier <i>plugins/comments_on_pictures/template/s26</i>.<br>
-        Attention à respecter le même nommage !";*/
+        Vous pouvez ajouter les votres dans le dossier <i>plugins/comments_on_pictures/template/s26</i>.";
         
 ?>

extensions/Comments_on_Albums/language/hu_HU/plugin.lang.php

@@ -10 +10 @@
 $lang['COA_icon_over'] = 'Bővített állapot';
 
-$lang['COA_help_icon_pack'] = "Ki kell választani a Hozzászólások fő oldalon megjelenítendő ikonokat.";/*<br>
+$lang['COA_help_icon_pack'] = "Ki kell választani a Hozzászólások fő oldalon megjelenítendő ikonokat.<br>
         <br>
-        Hozzáadhatsz saját mappát a  <i>plugins/comments_on_pictures/template/s26</i> könyvtárhoz.<br>
-        Légy tekintettel az azonos név sémára !";*/
+        Hozzáadhatsz saját mappát a  <i>plugins/comments_on_pictures/template/s26</i> könyvtárhoz.";
         
 ?>

extensions/Comments_on_Albums/main.inc.php

@@ -2 +2 @@
 /*
 Plugin Name: Comments on Albums
-Version: 0.3
+Version: 1.0
 Description: Activate comments on albums pages
 Plugin URI: http://piwigo.org/ext/extension_view.php?eid=512
@@ -17 +17 @@
 // +-----------------------------------------------------------------------+
 define('COA_NAME' , 'Comments on Albums');
-define('COA_VERSION', '0.3');
+define('COA_VERSION', '1.0');
 define('COA_DIR' , basename(dirname(__FILE__)));
 define('COA_PATH' , PHPWG_PLUGINS_PATH . COA_DIR . '/');
@@ -38 +38 @@
 
 function COA_index() {
-        global $template, $page, $conf;
+        global $template, $page, $conf, $pwg_loaded_plugins;
         
         if ($page['section'] == 'categories' AND isset($page['category'])) {    
+                if (isset($pwg_loaded_plugins['bbcode_bar'])) set_bbcode_bar();
+                else if (isset($pwg_loaded_plugins['SmiliesSupport']))set_smiliessupport_page();
+                
                 include(COA_PATH . 'include/coa_albums.php');
         }

extensions/Comments_on_Albums/maintain.inc.php

@@ -4 +4 @@
 // Default configuration
 define('default_config', serialize(array(
-        'icon_color' => 'ff3363',
-        'icon_color_over' => 'ff7700',
+        'icon_color' => 'outline_ff3363.png',
+        'icon_color_over' => 'outline_ff7700.png',
 )));
 

extensions/Comments_on_Albums/template/coa_albums.tpl

@@ -3 +3 @@
 {combine_script id="jquery"}
 {combine_css path=$COA_PATH|@cat:'template/style_albums.css'}
-
-{footer_script require="jquery"}{literal}
-        // cancel all color changements and set default color to comments
-        jQuery('.thumbnailCategory').css('color', jQuery('body').css('color'));
-{/literal}{/footer_script}
+{if $themeconf.name == 'Sylvia'}{combine_css path=$COA_PATH|@cat:'template/style_albums_sylvia.css'}{/if}
 
 <a name="comments"></a>

extensions/Comments_on_Albums/template/coa_comments_page.tpl

@@ -6 +6 @@
         <style type="text/css">
                 .pwg-icon-comments-images {ldelim}
-                        background-image: url({$COA_PATH}template/s26/outline_{$ICON_COLOR}.png);
+                        background-image: url({$COA_PATH}template/s26/{$ICON_COLOR});
                         background-position: 0 0;
                 }
                 a:hover .pwg-icon-comments-images {ldelim}
-                        background-image: url({$COA_PATH}template/s26/outline_{$ICON_COLOR_OVER}.png);
+                        background-image: url({$COA_PATH}template/s26/{$ICON_COLOR_OVER});
                         background-position: 0 0;
                 }

extensions/Comments_on_Albums/template/style_albums.css

@@ -7 +7 @@
 }
 
-#comments .thumbnailCategory {
-        padding:0px 2px 0px 12px !important; 
-        border:1px solid grey;
-}
 #comments .thumbnailCategories {
         margin-left:5px;
 }
+#comments  .thumbnailCategory {
+        margin:2px 0;
+}
 
-#comments .thumbnailCategories li:hover,
-#comments .thumbnailCategory:hover,
-#comments .thumbnailCategory:hover A { 
-        background:none; 
-}
-        
 #comments .thumbnailCategory  .date, #comments .thumbnailCategory  .author {
         font-weight:bold;

extensions/Comments_on_Albums/template/style_comments.css

@@ -1 +1 @@
 .thumbnailCategory .category-title {
-        position:absolute;
-        margin-top:-5px;
-        font-size:1.2em;
+        font-size:1.1em;
         font-weight:bold;
 }