Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[9896] XoopsModules/TDMPicture/trunk/TDMPicture
|
From: <lor...@us...> - 2012-07-17 08:07:21
|
Revision: 9896
http://xoops.svn.sourceforge.net/xoops/?rev=9896&view=rev
Author: lord_venom
Date: 2012-07-17 08:07:10 +0000 (Tue, 17 Jul 2012)
Log Message:
-----------
bug IE
Modified Paths:
--------------
XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php
XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css
XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_tpfile.html
XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php 2012-07-16 20:46:31 UTC (rev 9895)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php 2012-07-17 08:07:10 UTC (rev 9896)
@@ -50,7 +50,7 @@
return $ret;
}
- function _makeCatBoxOptions( $item_handler, $fieldName, $selected, $key, &$ret, &$select, $prefix_orig, $prefix_curr = '', $chcount) {
+ function _makeCatBoxOptions( $item_handler, $fieldName, $selected, $key, &$ret, &$ret2, $prefix_orig, $prefix_curr = '', $chcount) {
Global $xoopsModule, $xoopsModuleConfig, $cat_display, $cat_cel, $groups, $start, $limit, $tris ;
@@ -95,7 +95,7 @@
$GLOBALS['cat_title'] = $this->_tree[$key]['obj']->getVar('cat_title');
$select = $this->makeSelBox('cat_pid', 'cat_title','-', $selected, '', $this->_tree[$key]['obj']->getVar('cat_id'), "OnChange='window.document.location=this.options[this.selectedIndex].value;'", 'tdmpicture_catview');
- $ret .= '<li class="'.$GLOBALS['class'].'"><div><div id="img">'.$picture. '<br/><span id="tree_num"> ('.$count.')</span></div><div id="tree_detail"><h2><a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'">'. $this->_tree[$key]['obj']->getVar( $fieldName ). '</h2></a><span id="tree_text">'. $this->_tree[$key]['obj']->getVar('cat_text'). '</span></div><br style="clear: both;" /><div id="tree_form">'.$GLOBALS['navbar'].$select.' | '._MD_TDMPICTURE_TRIBY.' > '.$navtrie.'</div></div></div></li>';
+ $ret2 = '<li class="'.$GLOBALS['class'].'"><div><div id="img">'.$picture. '<br/><span id="tree_num"> ('.$count.')</span></div><div id="tree_detail"><h2><a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'">'. $this->_tree[$key]['obj']->getVar( $fieldName ). '</h2></a><span id="tree_text">'. $this->_tree[$key]['obj']->getVar('cat_text'). '</span></div><br style="clear: both;" /><div id="tree_form">'.$GLOBALS['navbar'].$select.' | '._MD_TDMPICTURE_TRIBY.' > '.$navtrie.'</div></div></div></li>';
}
@@ -112,14 +112,13 @@
$cat_text = (strlen($this->_tree[$key]['obj']->getVar('cat_text')) > 120 ? substr($this->_tree[$key]['obj']->getVar('cat_text'),0,(120))."..." : $this->_tree[$key]['obj']->getVar('cat_text'));
- $ret .= '<li style="width:47%;" class="'.$GLOBALS['class'].'"><div><div id="img">'.$picture. '<br/><span id="tree_num"> ('.$count.')</span></div><div id="tree_detail"><h2><a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'">'. $cat_title. '</h2></a><span id="tree_text">'. $cat_text. '</span></div><br style="clear: both;" /><div id="tree_form">'.$select.'</div></div></div></li>';
+ $ret .= '<li style="width:46%;" class="'.$GLOBALS['class'].'"><div><div id="img">'.$picture. '<br/><span id="tree_num"> ('.$count.')</span></div><div id="tree_detail"><h2><a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'">'. $cat_title. '</h2></a><span id="tree_text">'. $cat_text. '</span></div><br style="clear: both;" /><div id="tree_form">'.$select.'</div></div></div></li>';
}
//}
$prefix_curr .= $prefix_orig;
-
//}
@@ -127,7 +126,7 @@
if ( isset( $this->_tree[$key]['child'] ) && !empty( $this->_tree[$key]['child'] ) ) {
foreach ( $this->_tree[$key]['child'] as $childkey ) {
$GLOBALS['class'] = ($GLOBALS['class'] == "even") ? "odd" : "even";
- $this->_makeCatBoxOptions( $item_handler, $fieldName, $selected, $childkey, $ret, $select, $prefix_orig, $prefix_curr , $chcount);
+ $this->_makeCatBoxOptions( $item_handler, $fieldName, $selected, $childkey, $ret, $ret2, $prefix_orig, $prefix_curr , $chcount);
}
}
@@ -234,10 +233,12 @@
Global $cat_display;
$ret = '<div style="text-align:right"><a href="javascript:;" onclick="javascript:masque(\'1\')" >+-</a></div>';
- $ret .= '<table cellpadding="0" id="masque_1" cellspacing="0" style="margin:5px;"><tr><td><ul id="tree_menu">';
+ $ret .= '<table cellpadding="0" id="masque_1" cellspacing="0" style="border-collapse: separate; margin:5px;"><tr><td><ul id="tree_menu">';
+
$chcount = 1;
$GLOBALS['class'] = "odd";
- $this->_makeCatBoxOptions( $item_handler, $fieldName, $selected, $key, $ret, $select, $prefix, '', $chcount );
+ $this->_makeCatBoxOptions( $item_handler, $fieldName, $selected, $key, $ret, $ret2, $prefix, '', $chcount );
+ $ret .= $ret2;
$ret .= '<br style="clear: both;" /></ul></td></tr></table><br />';
return $ret;
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css 2012-07-16 20:46:31 UTC (rev 9895)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css 2012-07-17 08:07:10 UTC (rev 9896)
@@ -17,8 +17,6 @@
*/
ul#tree_menu {
- margin: 0 auto;
- padding:0 auto;
text-align: center;
width:100%;
@@ -29,15 +27,23 @@
float:left;
width:97%;
min-height:130px;
- /*height: 130px;*/
- margin: 10px; padding: 0px;
+ /*height: 130px;*/
+ border: 2px solid white;
+ margin: 10px;
+ padding: 5px;
+
-webkit-border-radius: 4px;
border-radius: 4px;
- border: 2px solid white;
- /* background: whiteSmoke url(../images/decos/downloads-bg.gif) repeat-x left top; */
+ -moz-border-radius: 4px;
+
-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
- overflow: auto;
+ -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
+ box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
+
+
}
+
+
ul#tree_menu #img {
float:left;
padding-left:20px;
@@ -67,7 +73,6 @@
font-size: 13px;
font-weight: normal;
color: #728DA9;
-text-shadow: 0 1px 0 white;
line-height: 20px;
word-wrap: break-word;
overflow:hidden;
@@ -262,10 +267,8 @@
+ ----------------------------------------------------- */
-.tdmp_table {
-background-color: #e9e9e9;
-border: 1px solid #cccccc;
-width: 100%;
+.tdmpicture_table {
+border-collapse: separate;
}
ul.display {
@@ -307,7 +310,10 @@
text-align:center;
border: 1px solid #FFF;
-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
- box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
+ -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
+ box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
+
+
}
@@ -446,15 +452,20 @@
DETAIL
+ ----------------------------------------------------- */
-.detail_img{
+.detail_img img{
padding: 2px;
background: #fff;
- margin: 0 15px 0 0;
text-align:center;
- border: 1px solid #FFF;
+ border: 1px solid #FFF;
-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
- box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
+ -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
+ box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
+
+
}
+
+
+}
.detail_info {
width: 150px;
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_tpfile.html
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_tpfile.html 2012-07-16 20:46:31 UTC (rev 9895)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_tpfile.html 2012-07-17 08:07:10 UTC (rev 9896)
@@ -1,5 +1,5 @@
-<table class="outer"><tr>
+<table class="outer tdmpicture_table"><tr>
<td class="even">
<{if $numfile != 0}>
<ul id="display" class="<{$display}>">
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html 2012-07-16 20:46:31 UTC (rev 9895)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html 2012-07-17 08:07:10 UTC (rev 9896)
@@ -34,11 +34,11 @@
<br class="clear"/>
-<table><tr>
+<table class="tdmpicture_table"><tr>
<th align="center"><span class="switch_title"><h2><{$file.title}></h2></span></th></tr>
<tr><td class="even" align="center">
-<div class="boxgrid">
+<div class="detail_img">
<a href="javascript:;" slide="<{$file.img_popup}>" class="group1" title="<{$file.title}>" alt="<{$file.title}>" >
<img style="max-width:<{$smarty.const.TDMPICTURE_WIDTH}>px; max-height:<{$smarty.const.TDMPICTURE_HEIGHT}>px;" src="<{$file.img}>" slide="<{$file.img_popup}>" rel="group1" title="<{$file.title}>" alt="<{$file.title}>" />
</a></div>
@@ -130,8 +130,8 @@
<br /><br />
<!-- Display navigation -->
-<div style="float:left;"><{$prev_page}></div>
-<div style="float:right;"><{$next_page}></div>
+<div style="float:left;border-collapse: separate;" class="detail_img"><{$prev_page}></div>
+<div style="float:right;border-collapse: separate;" class="detail_img"><{$next_page}></div>
<br class="clear"/> <br /><br />
<!-- AddThis Button BEGIN -->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
