xoops-svn

[<be...@us...>]

Revision: 9706
          http://xoops.svn.sourceforge.net/xoops/?rev=9706&view=rev
Author:   beckmi
Date:     2012-06-24 20:24:10 +0000 (Sun, 24 Jun 2012)
Log Message:
-----------
Moving Docs link to Help (Shine)

Modified Paths:
--------------
    XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/category.php
    XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/indexpage.php
    XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/main.php
    XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/menu.php
    XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/votedata.php
    XoopsModules/wflink/trunk/htdocs/modules/wflinks/docs/changelog.txt
    XoopsModules/wflink/trunk/htdocs/modules/wflinks/include/functions.php
    XoopsModules/wflink/trunk/htdocs/modules/wflinks/language/english/help/help.html
    XoopsModules/wflink/trunk/htdocs/modules/wflinks/language/english/modinfo.php
    XoopsModules/wflink/trunk/htdocs/modules/wflinks/language/nederlands/help/help.html

Added Paths:
-----------
    XoopsModules/wflink/trunk/htdocs/Frameworks/moduleclasses/icons/32/brokenlink.png

Added: XoopsModules/wflink/trunk/htdocs/Frameworks/moduleclasses/icons/32/brokenlink.png
===================================================================
(Binary files differ)


Property changes on: XoopsModules/wflink/trunk/htdocs/Frameworks/moduleclasses/icons/32/brokenlink.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/category.php
===================================================================
--- XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/category.php	2012-06-24 17:32:44 UTC (rev 9705)
+++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/category.php	2012-06-24 20:24:10 UTC (rev 9706)
@@ -388,6 +388,11 @@
         default:
         xoops_cp_header();
         //wfl_adminmenu(_AM_WFL_MCATEGORY);
+        $indexAdmin = new ModuleAdmin();
+        echo $indexAdmin->addNavigation('category.php');
+        $indexAdmin->addItemButton(_MI_WFL_ADD_LINK, 'main.php?op=edit', 'add', '');
+        $indexAdmin->addItemButton(_MI_WFL_ADD_CATEGORY, 'category.php', 'add', '');
+        echo $indexAdmin->renderButton('right', '');
 
         include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
         $mytree = new XoopsTree($xoopsDB -> prefix('wflinks_cat'), "cid", "pid");

Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/indexpage.php
===================================================================
--- XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/indexpage.php	2012-06-24 17:32:44 UTC (rev 9705)
+++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/indexpage.php	2012-06-24 20:24:10 UTC (rev 9706)
@@ -48,7 +48,6 @@
         list( $indeximage, $indexheading, $indexheader, $indexfooter, $nohtml, $nosmiley, $noxcodes, $noimages, $nobreak, $indexheaderalign, $indexfooteralign, $lastlinksyn, $lastlinkstotal ) = $xoopsDB -> fetchrow( $result );
 
         xoops_cp_header();
-        //wfl_adminmenu( _AM_WFL_INDEXPAGE );
 
         echo "
 		 <fieldset><legend style='font-weight: bold; color: #0A3760;'>" . _AM_WFL_IPAGE_INFORMATION . "</legend>\n

Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/main.php
===================================================================
--- XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/main.php	2012-06-24 17:32:44 UTC (rev 9705)
+++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/main.php	2012-06-24 20:24:10 UTC (rev 9706)
@@ -60,6 +60,7 @@
     $email = $link_array['email'] ? $wfmyts -> htmlSpecialCharsStrip( $link_array['email'] ) : '';
     $vat = $link_array['vat'] ? $wfmyts -> htmlSpecialCharsStrip( $link_array['vat'] ) : '';
 
+    include 'admin_header.php';
     xoops_cp_header();
     //wfl_adminmenu( _AM_WFL_MLINKS );
 
@@ -380,6 +381,7 @@
 
         $heading = ( $op == "pingtime" ) ? _AM_WFL_PINGTIMES : _AM_WFL_LISTBROKEN;
 
+        include 'admin_header.php';
         xoops_cp_header();
 //        wfl_adminmenu( _AM_WFL_BINDEX, '', $heading );
         echo "
@@ -606,6 +608,7 @@
             } 			
             list( $lid, $title ) = $xoopsDB -> fetchrow( $result );
             $item_tag = $result['item_tag'];
+            include 'admin_header.php';
             xoops_cp_header();
             //wfl_adminmenu( _AM_WFL_BINDEX );
             xoops_confirm( array( 'op' => 'delete', 'lid' => $lid, 'confirm' => 1, 'title' => $title ), 'main.php', _AM_WFL_LINK_REALLYDELETEDTHIS . "<br /><br>" . $title, _DELETE );
@@ -666,23 +669,23 @@
 //			</small></div></fieldset><br />\n
 //		";
 
-        if ( $totalcats > 0 ) {
-            $sform = new XoopsThemeForm( _AM_WFL_CCATEGORY_MODIFY, "category", "category.php" );
-            ob_start();
-            $mytree -> makeMySelBox( "title", "title" );
-            $sform -> addElement( new XoopsFormLabel( _AM_WFL_CCATEGORY_MODIFY_TITLE, ob_get_contents() ) );
-            ob_end_clean();
-            $dup_tray = new XoopsFormElementTray( '', '' );
-            $dup_tray -> addElement( new XoopsFormHidden( 'op', 'modCat' ) );
-            $butt_dup = new XoopsFormButton( '', '', _AM_WFL_BMODIFY, 'submit' );
-            $butt_dup -> setExtra( 'onclick="this.form.elements.op.value=\'modCat\'"' );
-            $dup_tray -> addElement( $butt_dup );
-            $butt_dupct = new XoopsFormButton( '', '', _AM_WFL_BDELETE, 'submit' );
-            $butt_dupct -> setExtra( 'onclick="this.form.elements.op.value=\'del\'"' );
-            $dup_tray -> addElement( $butt_dupct );
-            $sform -> addElement( $dup_tray );
-            $sform -> display();
-        } 
+//        if ( $totalcats > 0 ) {
+//            $sform = new XoopsThemeForm( _AM_WFL_CCATEGORY_MODIFY, "category", "category.php" );
+//            ob_start();
+//            $mytree -> makeMySelBox( "title", "title" );
+//            $sform -> addElement( new XoopsFormLabel( _AM_WFL_CCATEGORY_MODIFY_TITLE, ob_get_contents() ) );
+//            ob_end_clean();
+//            $dup_tray = new XoopsFormElementTray( '', '' );
+//            $dup_tray -> addElement( new XoopsFormHidden( 'op', 'modCat' ) );
+//            $butt_dup = new XoopsFormButton( '', '', _AM_WFL_BMODIFY, 'submit' );
+//            $butt_dup -> setExtra( 'onclick="this.form.elements.op.value=\'modCat\'"' );
+//            $dup_tray -> addElement( $butt_dup );
+//            $butt_dupct = new XoopsFormButton( '', '', _AM_WFL_BDELETE, 'submit' );
+//            $butt_dupct -> setExtra( 'onclick="this.form.elements.op.value=\'del\'"' );
+//            $dup_tray -> addElement( $butt_dupct );
+//            $sform -> addElement( $dup_tray );
+//            $sform -> display();
+//        }
 
         if ( $totallinks > 0 ) {
             $sql = "SELECT * FROM " . $xoopsDB -> prefix( 'wflinks_links' ) . " WHERE published > 0  ORDER BY lid DESC" ;

Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/menu.php
===================================================================
--- XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/menu.php	2012-06-24 17:32:44 UTC (rev 9705)
+++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/menu.php	2012-06-24 20:24:10 UTC (rev 9706)
@@ -39,17 +39,18 @@
 $adminmenu[$i]["icon"]  = $pathIcon32 . '/home.png';
 $i++;
 
-$adminmenu[$i]["title"] =  _MI_WFL_BINDEX;
+$adminmenu[$i]["title"] =  _MI_WFL_MLINKS;
 $adminmenu[$i]["link"]  = "admin/main.php";
 $adminmenu[$i]["icon"]  = $pathIcon32 . '/manage.png';
 $i++;
+$adminmenu[$i]['title'] = _MI_WFL_MCATEGORY;
+$adminmenu[$i]['link']  = "admin/category.php";
+$adminmenu[$i]["icon"]  = $pathIcon32 . '/category.png';
+$i++;
 $adminmenu[$i]["title"] =  _MI_WFL_INDEXPAGE;
 $adminmenu[$i]["link"]  = "admin/indexpage.php";
 $adminmenu[$i]["icon"]  = $pathIcon32 . '/index.png';
-$i++;
-$adminmenu[$i]['title'] = _MI_WFL_MCATEGORY;
-$adminmenu[$i]['link']  = "admin/category.php";
-$adminmenu[$i]["icon"]  = $pathIcon32 . '/category.png';
+
 //$i++;
 //$adminmenu[$i]['title'] = _MI_WFL_MLINKS;
 //$adminmenu[$i]['link']="admin/main.php?op=edit";
@@ -85,10 +86,10 @@
 $adminmenu[$i]['link']  = "admin/votedata.php";
 $adminmenu[$i]["icon"]  = $pathIcon32 . '/poll.png';
 
-$i++;
-$adminmenu[$i]['title'] = _MI_WFL_DOCUMENTATION;
-$adminmenu[$i]['link']  = "docs/english/readme.html";
-$adminmenu[$i]["icon"]  = $pathIcon32 . '/help.png';
+//$i++;
+//$adminmenu[$i]['title'] = _MI_WFL_DOCUMENTATION;
+//$adminmenu[$i]['link']  = "docs/english/readme.html";
+//$adminmenu[$i]["icon"]  = $pathIcon32 . '/help.png';
 
 $i++;
 $adminmenu[$i]['title'] = _AM_MODULEADMIN_ABOUT;

Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/votedata.php
===================================================================
--- XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/votedata.php	2012-06-24 17:32:44 UTC (rev 9705)
+++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/votedata.php	2012-06-24 20:24:10 UTC (rev 9706)
@@ -48,8 +48,12 @@
 		 </tr>
 		</table>";
 
+
+
+
+
         echo "
-		<fieldset style='border: #e8e8e8 1px solid;'><legend style='display: inline; font-weight: bold; color: #0A3760;'>" . _AM_WFL_VOTE_DISPLAYVOTES . "</legend>\n
+        <fieldset><legend style='font-weight: bold; color: #0A3760;'>" . _AM_WFL_VOTE_DISPLAYVOTES . "</legend>\n
 		<div style='padding: 8px;'>$text_info</div>\n	
 		<div style='padding: 8px;'><li>" . $imagearray['deleteimg'] . " " . _AM_WFL_VOTE_DELETEDSC . "</li></div>\n
 		</fieldset>\n

Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/docs/changelog.txt
===================================================================
--- XoopsModules/wflink/trunk/htdocs/modules/wflinks/docs/changelog.txt	2012-06-24 17:32:44 UTC (rev 9705)
+++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/docs/changelog.txt	2012-06-24 20:24:10 UTC (rev 9706)
@@ -1,3 +1,12 @@
+======================================================
+24-06-2012 1.09 Beta
+============================================================
+Shine and Mamba:
+Fixed: Admin section:
+- missing image: Frameworks/moduleclasses/icons/16/folder_add.png
+- Fixed: Startpage counters don't work in other language than english.
+- Fixed: admin/index.php : Line prox 56 and Prox line 78:  was calling 2 ().php files which belong to other module (result of conversion).
+- Changed main menu: moved manual into help. Added 'Link management'
 =========================================================
 2012-04-25  1.08 Beta 1
 =========================================================
@@ -11,7 +20,6 @@
 - Changed standard directory where flags are hold. Moved them to uploads/flags. (File: xoopsversion.php)
 - Changed standard directory where images: category, screenshots are hold. Moved them to: uploads/wflinks/category and uploads/wflinks/screenshots (file: xoopsversion.php)
 
-
 (below 2 bugs popped up:
 Found a small typo in WF-Links 1.07 that causes new links not to be displayed correctly on the Index Page.
 To fix this open the file ../templates/wflinks_index.html and find this line:

Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/include/functions.php
===================================================================
--- XoopsModules/wflink/trunk/htdocs/modules/wflinks/include/functions.php	2012-06-24 17:32:44 UTC (rev 9705)
+++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/include/functions.php	2012-06-24 20:24:10 UTC (rev 9706)
@@ -159,7 +159,9 @@
 // wfl_serverstats()
 // @return
 function wfl_serverstats() {
-    echo "<fieldset style='border: #e8e8e8 1px solid;'><legend style='display: inline; font-weight: bold; color: #0A3760;'>" . _AM_WFL_LINK_IMAGEINFO . "</legend>\n
+
+    echo "
+    <fieldset><legend style='font-weight: bold; color: #0A3760;'>" . _AM_WFL_LINK_IMAGEINFO . "</legend>\n
 		<div style='padding: 8px;'>\n
 		<div>" . _AM_WFL_LINK_SPHPINI . "</div>\n";
 
@@ -759,7 +761,7 @@
 
 function wfl_linklistheader( $heading ) {
     echo "
-		<h4 style='font-weight: bold; color: #0A3760;'>" . $heading . "</h4>\n
+<!--		<h4 style='font-weight: bold; color: #0A3760;'>" . $heading . "</h4>\n -->
 		<table width='100%' cellspacing='1' class='outer' style='font-size: smaller;' summary>\n
 		<tr>\n
 		<th style='text-align: center;'>" . _AM_WFL_MINDEX_ID . "</th>\n

Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/language/english/help/help.html
===================================================================
--- XoopsModules/wflink/trunk/htdocs/modules/wflinks/language/english/help/help.html	2012-06-24 17:32:44 UTC (rev 9705)
+++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/language/english/help/help.html	2012-06-24 20:24:10 UTC (rev 9706)
@@ -40,7 +40,7 @@
 
     <h4 class="odd">Tutorial</h4><br/>
 
-    No tutorial as available at the moment<br/>
+    <a href="../wflinks/docs/english/readme.html" target="_blank">Read Manual!</a><br/>
 
     <!-- -----Help Content ---------- -->
 

Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/language/english/modinfo.php
===================================================================
--- XoopsModules/wflink/trunk/htdocs/modules/wflinks/language/english/modinfo.php	2012-06-24 17:32:44 UTC (rev 9705)
+++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/language/english/modinfo.php	2012-06-24 20:24:10 UTC (rev 9706)
@@ -31,7 +31,7 @@
 define("_MI_WFL_BINDEX", "Admin");
 define("_MI_WFL_INDEXPAGE", "Index Page");
 define("_MI_WFL_MCATEGORY", "Categories");
-define("_MI_WFL_MLINKS", "Link Management");
+define("_MI_WFL_MLINKS", "Links Admin");
 define("_MI_WFL_MUPLOADS", "Image Upload");
 define("_MI_WFL_PERMISSIONS", "Permission Settings");
 define("_MI_WFL_BLOCKADMIN", "Block Settings");

Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/language/nederlands/help/help.html
===================================================================
--- XoopsModules/wflink/trunk/htdocs/modules/wflinks/language/nederlands/help/help.html	2012-06-24 17:32:44 UTC (rev 9705)
+++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/language/nederlands/help/help.html	2012-06-24 20:24:10 UTC (rev 9706)
@@ -40,7 +40,7 @@
 
     <h4 class="odd">Tutorial</h4><br/>
 
-    No tutorial as available at the moment<br/>
+    <a href="../wflinks/docs/english/readme.html" target="_blank">Read Manual!</a><br/>
 
     <!-- -----Help Content ---------- -->
 

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