Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[9952] XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager
|
From: <luc...@us...> - 2012-07-30 21:53:58
|
Revision: 9952
http://xoops.svn.sourceforge.net/xoops/?rev=9952&view=rev
Author: luciorota
Date: 2012-07-30 21:53:52 +0000 (Mon, 30 Jul 2012)
Log Message:
-----------
fixed enhanced image manager bug
update enhanced image manager templates to xoops 2.5.5 GUI
Modified Paths:
--------------
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/imagemanager/imagemanager.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/templates/ajaxfm_imagemanager.html
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/templates/ajaxfm_imagemanager2.html
Modified: XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/imagemanager/imagemanager.php
===================================================================
--- XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/imagemanager/imagemanager.php 2012-07-30 21:05:15 UTC (rev 9951)
+++ XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/imagemanager/imagemanager.php 2012-07-30 21:53:52 UTC (rev 9952)
@@ -171,7 +171,8 @@
$xoopsTpl->assign('show_cat', $imgcat_id);
$xoopsTpl->assign('lang_imgmanager', _IMGMANAGER);
$xoopsTpl->assign('sitename', htmlspecialchars($xoopsConfig['sitename'], ENT_QUOTES));
- $xoopsTpl->assign('target', htmlspecialchars($_GET['target'], ENT_QUOTES));
+ $xoopsTpl->assign('target', $target);
+ $xoopsTpl->assign('editor', $editor);
include_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
$form = new XoopsThemeForm('', 'image_form', 'imagemanager.php', 'post', true);
$form->setExtra('enctype="multipart/form-data"');
Modified: XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/templates/ajaxfm_imagemanager.html
===================================================================
--- XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/templates/ajaxfm_imagemanager.html 2012-07-30 21:05:15 UTC (rev 9951)
+++ XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/templates/ajaxfm_imagemanager.html 2012-07-30 21:53:52 UTC (rev 9952)
@@ -26,22 +26,8 @@
}
//-->
</script>
-<style type="text/css" media="all">
-body {margin: 0;}
-img {border: 0;}
-table {width: 100%; margin: 0;}
-a:link {color: #3a76d6; font-weight: bold; background-color: transparent;}
-a:visited {color: #9eb2d6; font-weight: bold; background-color: transparent;}
-a:hover {color: #e18a00; background-color: transparent;}
-table td {background-color: white; font-size: 12px; padding: 0; border-width: 0; vertical-align: top; font-family: Verdana, Arial, Helvetica, sans-serif;}
-table#imagenav td {vertical-align: bottom; padding: 5px;}
-table#imagemain td {border-right: 1px solid silver; border-bottom: 1px solid silver; padding: 5px; vertical-align: middle;}
-table#imagemain th {border: 0; background-color: #2F5376; color:white; font-size: 12px; padding: 5px; vertical-align: top; text-align:center; font-family: Verdana, Arial, Helvetica, sans-serif;}
-table#header td {width: 100%; background-color: #2F5376; vertical-align: middle;}
-table#header td#headerbar {border-bottom: 1px solid silver; background-color: #dddddd;}
-div#pagenav {text-align:center;}
-div#footer {text-align:right; padding: 5px;}
-</style>
+<link rel="stylesheet" type="text/css" media="screen" href="<{xoAppUrl xoops.css}>" />
+<link rel="stylesheet" type="text/css" media="screen" href="<{xoAppUrl modules/system/css/imagemanager.css}>" />
<{php}>
$language = $GLOBALS['xoopsConfig']['language'];
@@ -53,61 +39,63 @@
</head>
<body onload="window.resizeTo(<{$xsize}>, <{$ysize}>);">
-
- <form action="imagemanager.php" method="get">
- <table cellspacing="0" id="imagenav">
- <tr>
- <td>
- <select name="cat_id" onchange="location='imagemanager.php?target=<{$target}>&editor=<{$editor}>&cat_id='+this.options[this.selectedIndex].value"><{$cat_options}></select> <input type="hidden" name="target" value="<{$target}>" /><input type="submit" value="<{$lang_go}>" />
- </td>
-
+ <form action="imagemanager.php" method="get">
+ <table cellspacing="0" id="imagenav">
+ <tr>
+ <td>
+ <select name="cat_id" onchange="location='imagemanager.php?target=<{$target}>&editor=<{$editor}>&cat_id='+this.options[this.selectedIndex].value"><{$cat_options}></select> <input type="hidden" name="target" value="<{$target}>" /><input type="submit" value="<{$lang_go}>" />
+ </td>
<{if $show_cat > 0}>
- <td align="right"><a href="imagemanager.php?target=<{$target}>&editor=<{$editor}>&op=upload&imgcat_id=<{$show_cat}>" title="<{$lang_addimage}>"><{$lang_addimage}></a></td>
+ <td id="addimage" class="txtright">
+ <a href="imagemanager.php?target=<{$target}>&editor=<{$editor}>&op=upload&imgcat_id=<{$show_cat}>" title="<{$lang_addimage}>"><{$lang_addimage}></a>
+ </td>
<{/if}>
+ </tr>
+ </table>
+ </form>
+ <div id="pagenav"><{$pagenav}></div>
- </tr>
+<{if $image_total > 0}>
+
+ <table cellspacing="0" id="imagemain">
+ <tr>
+ <th><{$lang_imagename}></th>
+ <th><{$lang_image}></th>
+ <th><{$lang_imagemime}></th>
+ <th><{$lang_align}></th>
+ </tr>
+
+<{section name=i loop=$images}>
+ <tr class="txtcenter">
+ <td><input type="hidden" name="image_id[]" value="<{$images[i].id}>" /><{$images[i].nicename}></td>
+ <td><img style="max-width:200px;" src="<{$images[i].src}>" alt="" /></td>
+ <td><{$images[i].mimetype}></td>
+ <td>
+ <{if ($editor == 'bbcode')}>
+ <a href="#" title="" onclick="javascript:appendCode('<{$images[i].lxcode}>', true);"><img src="<{$xoops_url}>/images/alignleft.gif" alt="Left" /></a>
+
+ <a href="#" title="" onclick="javascript:appendCode('<{$images[i].xcode}>', true);"><img src="<{$xoops_url}>/images/aligncenter.gif" alt="Center" /></a>
+
+ <a href="#" title="" onclick="javascript:appendCode('<{$images[i].rxcode}>', true);"><img src="<{$xoops_url}>/images/alignright.gif" alt="Right" /></a>
+ <{/if}>
+ <{if ($editor == 'src')}>
+ <a href="#" title="" onclick="javascript:appendCode('<{$images[i].src}>', false);"><img src="<{$xoops_url}>/images/aligncenter.gif" alt="Center" /></a>
+ <{/if}>
+ </td>
+ </tr>
+<{/section}>
</table>
- </form>
- <{if $image_total > 0}>
+<{else}>
- <table cellspacing="0" id="imagemain">
- <tr>
- <th><{$lang_imagename}></th>
- <th><{$lang_image}></th>
- <th><{$lang_imagemime}></th>
- <th><{$lang_align}></th>
- </tr>
+ <div id="welcomenot"></div>
- <{section name=i loop=$images}>
- <tr align="center">
- <td><input type="hidden" name="image_id[]" value="<{$images[i].id}>" /><{$images[i].nicename}></td>
- <td><img src="<{$images[i].src}>" alt="" /></td>
- <td><{$images[i].mimetype}></td>
- <td>
- <{if ($editor == 'bbcode')}>
- <a href="#" title="" onclick="javascript:appendCode('<{$images[i].lxcode}>', true);"><img src="<{$xoops_url}>/images/alignleft.gif" alt="Left" /></a>
-
- <a href="#" title="" onclick="javascript:appendCode('<{$images[i].xcode}>', true);"><img src="<{$xoops_url}>/images/aligncenter.gif" alt="Center" /></a>
-
- <a href="#" title="" onclick="javascript:appendCode('<{$images[i].rxcode}>', true);"><img src="<{$xoops_url}>/images/alignright.gif" alt="Right" /></a>
- <{/if}>
- <{if ($editor == 'src')}>
- <a href="#" title="" onclick="javascript:appendCode('<{$images[i].src}>', false);"><img src="<{$xoops_url}>/images/aligncenter.gif" alt="Center" /></a>
- <{/if}>
- </td>
+<{/if}>
- </tr>
- <{/section}>
- </table>
+ <div id="pagenav"><{$pagenav}></div>
- <{/if}>
-
- <div id="pagenav"><{$pagenav}></div>
-
- <div id="footer">
- <input value="<{$lang_close}>" type="button" onclick="javascript:window.close();" />
- </div>
-
- </body>
+ <div id="footer">
+ <input value="<{$lang_close}>" type="button" onclick="javascript:window.close();" />
+ </div>
+</body>
</html>
\ No newline at end of file
Modified: XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/templates/ajaxfm_imagemanager2.html
===================================================================
--- XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/templates/ajaxfm_imagemanager2.html 2012-07-30 21:05:15 UTC (rev 9951)
+++ XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/templates/ajaxfm_imagemanager2.html 2012-07-30 21:53:52 UTC (rev 9952)
@@ -5,22 +5,8 @@
<meta http-equiv="content-language" content="<{$xoops_langcode}>" />
<title><{$xoops_sitename}> <{$lang_imgmanager}></title>
<{$image_form.javascript}>
-<style type="text/css" media="all">
-body {margin: 0;}
-img {border: 0;}
-table {width: 100%; margin: 0;}
-a:link {color: #3a76d6; font-weight: bold; background-color: transparent;}
-a:visited {color: #9eb2d6; font-weight: bold; background-color: transparent;}
-a:hover {color: #e18a00; background-color: transparent;}
-table td {background-color: white; font-size: 12px; padding: 0; border-width: 0; vertical-align: top; font-family: Verdana, Arial, Helvetica, sans-serif;}
-table#imagenav td {vertical-align: bottom; padding: 5px;}
-td.body {padding: 5px; vertical-align: middle;}
-td.caption {border: 0; background-color: #2F5376; color:white; font-size: 12px; padding: 5px; vertical-align: top; text-align:left; font-family: Verdana, Arial, Helvetica, sans-serif;}
-table#imageform {border: 1px solid silver;}
-table#header td {width: 100%; background-color: #2F5376; vertical-align: middle;}
-table#header td#headerbar {border-bottom: 1px solid silver; background-color: #dddddd;}
-div#footer {text-align:right; padding: 5px;}
-</style>
+<link rel="stylesheet" type="text/css" media="screen" href="<{xoAppUrl xoops.css}>" />
+<link rel="stylesheet" type="text/css" media="screen" href="<{xoAppUrl modules/system/css/imagemanager.css}>" />
<{php}>
$language = $GLOBALS['xoopsConfig']['language'];
@@ -33,33 +19,35 @@
<body onload="window.resizeTo(<{$xsize}>, <{$ysize}>);">
- <table cellspacing="0" id="imagenav">
+ <table cellspacing="0" id="imagenav">
<tr>
- <td align="left"><a href="imagemanager.php?target=<{$target}>&editor=<{$editor}>&cat_id=<{$show_cat}>" title="<{$lang_imgmanager}>"><{$lang_imgmanager}></a></td>
+ <td id="addimage" class="txtleft">
+ <a href="imagemanager.php?target=<{$target}>&editor=<{$editor}>&cat_id=<{$show_cat}>" title="<{$lang_imgmanager}>">
+ <{$lang_imgmanager}></a></td>
</tr>
- </table>
-
- <form name="<{$image_form.name}>" id="<{$image_form.name}>" action="<{$image_form.action}>" method="<{$image_form.method}>" <{$image_form.extra}>>
- <table id="imageform" cellspacing="0">
- <!-- start of form elements loop -->
+ </table>
+
+ <form name="<{$image_form.name}>" id="<{$image_form.name}>" action="<{$image_form.action}>" method="<{$image_form.method}>" <{$image_form.extra}>>
+ <table id="imageform" cellspacing="">
+ <!-- start of form elements loop -->
<{foreach item=element from=$image_form.elements}>
- <{if $element.hidden != true}>
- <tr valign="top">
- <td class="caption"><{$element.caption}></td>
- <td class="body"><{$element.body}></td>
- </tr>
- <{else}>
- <{$element.body}>
- <{/if}>
+ <{if $element.hidden != true}>
+ <tr valign="top">
+ <td class="caption"><{$element.caption}></td>
+ <td class="body"><{$element.body}></td>
+ </tr>
+ <{else}>
+ <{$element.body}>
+ <{/if}>
<{/foreach}>
- <!-- end of form elements loop -->
- </table>
- </form>
+ <!-- end of form elements loop -->
+ </table>
+ </form>
- <div id="footer">
- <input value="<{$lang_close}>" type="button" onclick="javascript:window.close();" />
- </div>
+ <div id="footer">
+ <input value="<{$lang_close}>" type="button" onclick="javascript:window.close();" />
+ </div>
- </body>
+</body>
</html>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
