xoops-svn

[xoops-svn] SF.net SVN: xoops:[9409] XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/ smilies

[<ma...@us...>]

Revision: 9409
          http://xoops.svn.sourceforge.net/xoops/?rev=9409&view=rev
Author:   mageg
Date:     2012-04-29 20:09:15 +0000 (Sun, 29 Apr 2012)
Log Message:
-----------
Update smilies

Modified Paths:
--------------
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/admin/menu.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/language/english/help/help.html
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/templates/admin/smilies_smilies.html

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/admin/menu.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/admin/menu.php	2012-04-29 19:52:09 UTC (rev 9408)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/admin/menu.php	2012-04-29 20:09:15 UTC (rev 9409)
@@ -19,7 +19,7 @@
  * @author          Mage Grégory (AKA Mage)
  * @version         $Id$
  */
-$pathIcon32 = '../../media/xoops/images/icons/32/';
+$pathIcon32 = '';
 
 $adminmenu = array();
 $i = 1;

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/language/english/help/help.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/language/english/help/help.html	2012-04-29 19:52:09 UTC (rev 9408)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/language/english/help/help.html	2012-04-29 20:09:15 UTC (rev 9409)
@@ -1,15 +1,10 @@
-<div id="help-template" class="outer">
-    <h1 class="head">Help:
-        <a class="ui-corner-all tooltip" href="<{$xoops_url}>/modules/smilies/admin/index.php" title="Back to the administration of Smilies">
-        Smilies <img src="<{xoAdminIcons home.png}>" alt="Back to the administration of Smilies"/>
-        </a>
-    </h1>
-    <!-- ===== Help Content ======= -->
-    <h4 class="odd">Description</h4><br/>
-    Smiles are little graphic symbols that people can use to express themselves. They can be inserted anywhere in the text of an article, comment or post from both the user and admin sides of the system. XOOPS ships with a collection of 17 smilies built in. Some of these are displayed on the submission forms in various modules (including forums, news, downloads, links and others). Clicking on a smilie will insert it into the post. Smilies can also be inserted by typing in their unique ‘codes’ (keyboard shortcuts), for example typing ':' '-' 'D' in a post will insert this smilie: <img src="http://www.xoops.org/uploads/smil42e7a3d4c7b9f.gif" alt=""/>
-    <br/><br/>
-    The full list of smilies available on your system and their codes is accessible through the Smilies, which is where you're now. Here you can add, edit and delete smilies, and control which are displayed on submission forms (only nine of the 17 are displayed by default)
-    <br/><br/>
-    If you don’t want smilies on your system, you can either uncheck the “display in form?” box (in which case they won’t appear on submission forms, but will still be available via their codes), or use the delete link to remove them entirely. <br/><br/>
-    <!-- ===== Help Content ======= -->
-</div>
\ No newline at end of file
+<!-- ===== Help Content ======= -->
+<h4>Description</h4>
+<p>
+Smiles are little graphic symbols that people can use to express themselves. They can be inserted anywhere in the text of an article, comment or post from both the user and admin sides of the system. XOOPS ships with a collection of 17 smilies built in. Some of these are displayed on the submission forms in various modules (including forums, news, downloads, links and others). Clicking on a smilie will insert it into the post. Smilies can also be inserted by typing in their unique ‘codes’ (keyboard shortcuts), for example typing ':' '-' 'D' in a post will insert this smilie: <img src="http://www.xoops.org/uploads/smil42e7a3d4c7b9f.gif" alt=""/>
+<br/><br/>
+The full list of smilies available on your system and their codes is accessible through the Smilies, which is where you're now. Here you can add, edit and delete smilies, and control which are displayed on submission forms (only nine of the 17 are displayed by default)
+<br/><br/>
+If you don’t want smilies on your system, you can either uncheck the “display in form?” box (in which case they won’t appear on submission forms, but will still be available via their codes), or use the delete link to remove them entirely. <br/><br/>
+</p>
+<!-- ===== Help Content ======= -->
\ No newline at end of file

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/templates/admin/smilies_smilies.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/templates/admin/smilies_smilies.html	2012-04-29 19:52:09 UTC (rev 9408)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/templates/admin/smilies_smilies.html	2012-04-29 20:09:15 UTC (rev 9409)
@@ -8,32 +8,32 @@
 <{includeq file="admin:system|admin_tips.html"}>
 <{includeq file="admin:system|admin_buttons.html"}>
 <{if $smilies_count == true}>
-<table id="xo-smilies-sorter" cellspacing="1" class="outer tablesorter">
+<table id="xo-smilies-sorter" class="outer tablesorter">
     <thead>
     <tr>
         <th class="txtcenter"><{$smarty.const._AM_SMILIES_CODE}></th>
         <th class="txtcenter"><{$smarty.const._AM_SMILIES_SMILIE}></th>
-        <th class="txtcenter"><{$smarty.const._AM_SMILIES_DESCRIPTION}></th>
+        <th class="txtleft"><{$smarty.const._AM_SMILIES_DESCRIPTION}></th>
         <th class="txtcenter"><{$smarty.const._AM_SMILIES_DISPLAY}></th>
-        <th class="txtcenter width10"><{$smarty.const._AM_SMILIES_ACTION}></th>
+        <th class="txtcenter"><{$smarty.const._AM_SMILIES_ACTION}></th>
     </tr>
     </thead>
     <tbody>
     <{foreach item=smilies from=$smilies}>
     <tr class="<{cycle values='even,odd'}> alignmiddle">
         <td class="txtcenter width5"><{$smilies.code}></td>
-        <td class="txtcenter width5"><{$smilies.image}></td>
-        <td class="txtcenter width50"><{$smilies.emotion}></td>
+        <td class="txtcenter width10"><{$smilies.image}></td>
+        <td class="txtleft"><{$smilies.emotion}></td>
         <td class="xo-actions txtcenter width10">
             <img id="loading_sml<{$smilies.smilies_id}>" src="<{xoAppUrl media/xoops/images/spinner.gif}>" style="display:none;" alt="<{$smarty.const._AM_SYSTEM_LOADING}>" />
-            <img class="cursorpointer tooltip" id="sml<{$smilies.smilies_id}>" onclick="Xoops.changeStatus( 'smilies.php', { op: 'smilies_update_display', smilies_id: <{$smilies.smilies_id}> }, 'sml<{$smilies.smilies_id}>', 'smilies.php' )" src="<{if $smilies.display}><{xoAdminIcons success.png}><{else}><{xoAdminIcons cancel.png}><{/if}>" alt="<{if $smilies.display}><{$smarty.const._AM_SMILIES_OFF}><{else}><{$smarty.const._AM_SMILIES_ON}><{/if}>" title="<{if $smilies.display}><{$smarty.const._AM_SMILIES_OFF}><{else}><{$smarty.const._AM_SMILIES_ON}><{/if}>" />
+            <img class="cursorpointer" id="sml<{$smilies.smilies_id}>" onclick="Xoops.changeStatus( 'smilies.php', { op: 'smilies_update_display', smilies_id: <{$smilies.smilies_id}> }, 'sml<{$smilies.smilies_id}>', 'smilies.php' )" src="<{if $smilies.display}><{xoAdminIcons success.png}><{else}><{xoAdminIcons cancel.png}><{/if}>" alt="<{if $smilies.display}><{$smarty.const._AM_SMILIES_OFF}><{else}><{$smarty.const._AM_SMILIES_ON}><{/if}>" title="<{if $smilies.display}><{$smarty.const._AM_SMILIES_OFF}><{else}><{$smarty.const._AM_SMILIES_ON}><{/if}>" />
         </td>
-        <td class="xo-actions txtcenter width10">
-            <a class="tooltip" href="smilies.php?op=edit_smilie&amp;smilies_id=<{$smilies.smilies_id}>" title="<{$smarty.const._AM_SMILIES_EDIT}>">
-                <img src="<{xoAdminIcons edit.png}>" alt="<{$smarty.const._AM_SMILIES_EDIT}>" />
+        <td class="xo-actions txtcenter width5">
+            <a href="smilies.php?op=edit_smilie&amp;smilies_id=<{$smilies.smilies_id}>" title="<{$smarty.const._AM_SMILIES_EDIT}>">
+                <img src="<{xoAdminIcons edit.png}>" alt="<{$smarty.const._AM_SMILIES_EDIT}>">
             </a>
-            <a class="tooltip" href="smilies.php?op=smilies_delete&amp;smilies_id=<{$smilies.smilies_id}>" title="<{$smarty.const._AM_SMILIES_DELETE}>">
-                <img src="<{xoAdminIcons delete.png}>" alt="<{$smarty.const._AM_SMILIES_DELETE}>" />
+            <a href="smilies.php?op=smilies_delete&amp;smilies_id=<{$smilies.smilies_id}>" title="<{$smarty.const._AM_SMILIES_DELETE}>">
+                <img src="<{xoAdminIcons delete.png}>" alt="<{$smarty.const._AM_SMILIES_DELETE}>">
             </a>
         </td>
     </tr>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[xoops-svn] SF.net SVN: xoops:[9443] XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/ smilies

[<ma...@us...>]

Revision: 9443
          http://xoops.svn.sourceforge.net/xoops/?rev=9443&view=rev
Author:   mageg
Date:     2012-05-06 20:39:08 +0000 (Sun, 06 May 2012)
Log Message:
-----------
update smilies plugin

Modified Paths:
--------------
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/admin/menu.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/admin/smilies.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/class/form/smilies.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/language/english/admin.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/templates/admin/smilies_smilies.html

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/admin/menu.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/admin/menu.php	2012-05-06 20:37:34 UTC (rev 9442)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/admin/menu.php	2012-05-06 20:39:08 UTC (rev 9443)
@@ -19,18 +19,16 @@
  * @author          Mage Grégory (AKA Mage)
  * @version         $Id$
  */
-$pathIcon32 = '';
-
 $adminmenu = array();
 $i = 1;
 $adminmenu[$i]['title'] = _MI_SMILIES_INDEX;
 $adminmenu[$i]['link'] = "admin/index.php";
-$adminmenu[$i]['icon'] = $pathIcon32 . 'home.png';
+$adminmenu[$i]['icon'] = 'home.png';
 $i++;
 $adminmenu[$i]['title'] = _MI_SMILIES_SMILIES;
 $adminmenu[$i]['link'] = "admin/smilies.php";
-$adminmenu[$i]['icon'] = $pathIcon32 . 'smilies.png';
+$adminmenu[$i]['icon'] = 'smilies.png';
 $i++;
 $adminmenu[$i]['title'] = _MI_SMILIES_ABOUT;
 $adminmenu[$i]['link'] = 'admin/about.php';
-$adminmenu[$i]['icon'] = $pathIcon32 . 'about.png';
\ No newline at end of file
+$adminmenu[$i]['icon'] = 'about.png';
\ No newline at end of file

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/admin/smilies.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/admin/smilies.php	2012-05-06 20:37:34 UTC (rev 9442)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/admin/smilies.php	2012-05-06 20:39:08 UTC (rev 9443)
@@ -81,35 +81,35 @@
         // Display Page Navigation
         if ($smilies_count > $nb_smilies) {
             $nav = new XoopsPageNav($smilies_count, $nb_smilies, $start, 'start', 'op=list');
-            $xoops->tpl->assign('nav_menu', $nav->renderNav(4));
+            $xoops->tpl->assign('nav_menu', $nav->renderNav(2));
         }
         break;
 
     // New smilie
     case "new_smilie":
         $admin_page->addTips(sprintf(_AM_SMILIES_TIPS_FORM1, implode(', ', $mimetypes)) . sprintf(_AM_SMILIES_TIPS_FORM2, $upload_size / 1000));
-        $admin_page->addItemButton(_AM_SMILIES_LIST, 'smilies.php', 'list');
+        $admin_page->addItemButton(_AM_SMILIES_LIST, 'smilies.php', 'application-view-detail');
         $admin_page->renderTips();
         $admin_page->renderButton();
         // Create form
         $obj = $smilies_Handler->create();
         $form = $xoops->getModuleForm($obj, 'smilies');
-        // Assign form
-        $xoops->tpl->assign('form', $form->render());
+        $form->render();
+        $xoops->tpl->assign('form', true);
         break;
 
     // Edit smilie
     case "edit_smilie":
         $admin_page->addTips(sprintf(_AM_SMILIES_TIPS_FORM1, implode(', ', $mimetypes)) . sprintf(_AM_SMILIES_TIPS_FORM2, $upload_size / 1000));
         $admin_page->addItemButton(_AM_SMILIES_ADD, 'smilies.php?op=new_smilie', 'add');
-        $admin_page->addItemButton(_AM_SMILIES_LIST, 'smilies.php', 'list');
+        $admin_page->addItemButton(_AM_SMILIES_LIST, 'smilies.php', 'application-view-detail');
         $admin_page->renderTips();
         $admin_page->renderButton();
         // Create form
         $obj = $smilies_Handler->get($system->cleanVars($_REQUEST, 'smilies_id', 0, 'int'));
         $form = $xoops->getModuleForm($obj, 'smilies');
-        // Assign form
-        $xoops->tpl->assign('form', $form->render());
+        $form->render();
+        $xoops->tpl->assign('form', true);
         break;
 
     // Save smilie
@@ -148,13 +148,14 @@
         }
         $xoops->error($obj->getHtmlErrors());
         $form = $xoops->getModuleForm($obj, 'smilies');
-        $xoops->tpl->assign('form', $form->render());
+        $form->render();
+        $xoops->tpl->assign('form', true);
         break;
 
     //Del a smilie
     case "smilies_delete":
         $admin_page->addItemButton(_AM_SMILIES_ADD, 'smilies.php?op=new_smilie', 'add');
-        $admin_page->addItemButton(_AM_SMILIES_LIST, 'smilies.php', 'list');
+        $admin_page->addItemButton(_AM_SMILIES_LIST, 'smilies.php', 'application-view-detail');
         $admin_page->renderButton();
         $smilies_id = $system->cleanVars($_REQUEST, 'smilies_id', 0, 'int');
         $obj = $smilies_Handler->get($smilies_id);
@@ -168,7 +169,7 @@
                     chmod($urlfile, 0777);
                     unlink($urlfile);
                 }
-                $xoops->redirect("smilies.php", 2, _AM_SMILIES_SAVE);
+                $xoops->redirect("smilies.php", 2, _AM_SMILIES_DELETED);
             } else {
                 $xoops->error($obj->getHtmlErrors());
             }
@@ -178,7 +179,7 @@
             $smilies_img = ($obj->getVar("smile_url")) ? $obj->getVar("smile_url") : 'blank.gif';
             $xoops->confirm(array(
                                  "ok" => 1, "smilies_id" => $_REQUEST["smilies_id"], "op" => "smilies_delete"
-                            ), $_SERVER["REQUEST_URI"], sprintf(_AM_SMILIES_SUREDEL) . '<br \><img src="' . XOOPS_UPLOAD_URL . '/' . $smilies_img . '" alt="" /><br \>');
+                            ), XOOPS_URL . '/modules/smilies/admin/smilies.php', sprintf(_AM_SMILIES_SUREDEL) . '<br /><img src="' . XOOPS_UPLOAD_URL . '/' . $smilies_img . '" alt=""><br />');
         }
         break;
 

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/class/form/smilies.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/class/form/smilies.php	2012-05-06 20:37:34 UTC (rev 9442)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/class/form/smilies.php	2012-05-06 20:39:08 UTC (rev 9443)
@@ -53,7 +53,7 @@
         }
         $imageselect_img->setExtra( 'onchange="showImgSelected(\'xo-smilies-img\', \'smile_url\', \'smilies\', \'\', \'' . XOOPS_UPLOAD_URL . '\' )"' );
         $imgtray_img->addElement( $imageselect_img, false);
-        $imgtray_img->addElement( new XoopsFormLabel( '', "<br /><img src='" . XOOPS_UPLOAD_URL . "/smilies/" . $blank_img . "' name='image_img' id='xo-smilies-img' alt='' />" ) );
+        $imgtray_img->addElement( new XoopsFormLabel( '', "<br /><img src='" . XOOPS_UPLOAD_URL . "/smilies/" . $blank_img . "' name='image_img' id='xo-smilies-img' alt=''>" ) );
 
         $fileseltray_img = new XoopsFormElementTray('<br />','<br /><br />');
         $fileseltray_img->addElement(new XoopsFormFile(_AM_SMILIES_UPLOADS , 'smile_url', 500000),false);

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/language/english/admin.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/language/english/admin.php	2012-05-06 20:37:34 UTC (rev 9442)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/language/english/admin.php	2012-05-06 20:39:08 UTC (rev 9443)
@@ -23,6 +23,7 @@
 define("_AM_SMILIES_ADD", "Add a new smilie");
 define("_AM_SMILIES_CODE","Code");
 define("_AM_SMILIES_DELETE","Delete smilie");
+define("_AM_SMILIES_DELETED","Smilies deleted");
 define("_AM_SMILIES_DESCRIPTION","Description");
 define("_AM_SMILIES_DISPLAY","Display in form");
 define("_AM_SMILIES_EDIT","Edit smilie");

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/templates/admin/smilies_smilies.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/templates/admin/smilies_smilies.html	2012-05-06 20:37:34 UTC (rev 9442)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/templates/admin/smilies_smilies.html	2012-05-06 20:39:08 UTC (rev 9443)
@@ -49,5 +49,5 @@
 <{/if}>
 <!-- Display smilies form (add,edit) -->
 <{if $form}>
-<div class="spacer"><{$form}></div>
+<{includeq file="module:system|system_form.html"}>
 <{/if}>
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.