[Linpha-cvs] SF.net SVN: linpha: [4470] trunk/linpha2
Status: Inactive
Brought to you by:
bzrudi
Menu
▾
▴
[Linpha-cvs] SF.net SVN: linpha: [4470] trunk/linpha2
|
From: <fan...@us...> - 2006-04-01 16:15:35
|
Revision: 4470 Author: fangehrn Date: 2006-04-01 08:15:21 -0800 (Sat, 01 Apr 2006) ViewCVS: http://svn.sourceforge.net/linpha/?rev=4470&view=rev Log Message: ----------- * improving template Modified Paths: -------------- trunk/linpha2/ChangeLog trunk/linpha2/lib/classes/linpha.imgview.class.php trunk/linpha2/lib/classes/linpha.template.class.php trunk/linpha2/templates/default/css/global.css trunk/linpha2/templates/default/css/view_img.css trunk/linpha2/templates/default/global.html.php trunk/linpha2/templates/default/view_img.html.php Modified: trunk/linpha2/ChangeLog =================================================================== --- trunk/linpha2/ChangeLog 2006-04-01 12:19:15 UTC (rev 4469) +++ trunk/linpha2/ChangeLog 2006-04-01 16:15:21 UTC (rev 4470) @@ -19,6 +19,8 @@ * moved path of lang.temp.txt from ./var/tmp to ./var as tmp doesnt exists all the time (during install) and ./var is always writable + * improving template + 2006-03-31 bzrudi <linpha2_AT_tuxpower_DOT_de> * Installer: + at least mysql installation should work now Modified: trunk/linpha2/lib/classes/linpha.imgview.class.php =================================================================== --- trunk/linpha2/lib/classes/linpha.imgview.class.php 2006-04-01 12:19:15 UTC (rev 4469) +++ trunk/linpha2/lib/classes/linpha.imgview.class.php 2006-04-01 16:15:21 UTC (rev 4470) @@ -865,7 +865,7 @@ $id = $this->photos_filtered[$key]['id']; $name = $this->photos_filtered[$key]['name']; - $str = '<div class="div_'.$class.'thumb">' + $str = '<div class="thumbnavi_'.$class.'thumb">' . '<a href="'.$GLOBALS['linpha']->template->URL_base.'&id='.$id.'">' . '<img class="img_'.$class.'thumb" src="'.LINPHA_DIR.'/get_thumb.php?id='.$id.'" /></a>' . '<br />'.$name.'</div>'."\n"; @@ -969,7 +969,7 @@ /** * set current thumb and image */ - $GLOBALS['linpha']->template->output['image'] = '<img class="mainimage" src="'.LINPHA_DIR.'/get_thumb.php?id=' + $GLOBALS['linpha']->template->output['image'] = '<img id="mainimage" src="'.LINPHA_DIR.'/get_thumb.php?id=' . $this->photos_filtered[$this->current_key]['id'] . '" />' . '<br />'.$this->photos_filtered[$this->current_key]['name']; Modified: trunk/linpha2/lib/classes/linpha.template.class.php =================================================================== --- trunk/linpha2/lib/classes/linpha.template.class.php 2006-04-01 12:19:15 UTC (rev 4469) +++ trunk/linpha2/lib/classes/linpha.template.class.php 2006-04-01 16:15:21 UTC (rev 4470) @@ -97,7 +97,7 @@ function printMenu($index) { echo "\n".'<ul>'."\n"; - echo "\t".'<li><span>'.i18n("More").' v</span>'."\n"; + echo "\t".'<li><span>'.i18n("More").' </span>'."\n"; echo "\n".'<ul>'."\n"; foreach($GLOBALS['linpha']->template->output['menu_'.$index] AS $key=>$value) @@ -108,7 +108,7 @@ } else { - echo "\t".'<li><span>'.$value['name'].' ></span>'."\n"; + echo "\t".'<li><span>'.$value['name'].' </span>'."\n"; echo "\t".'<ul>'."\n"; @@ -120,7 +120,7 @@ } else { - echo "\t\t".'<li><span>'.$sub_value['name'].' ></span>'."\n"; + echo "\t\t".'<li><span>'.$sub_value['name'].' </span>'."\n"; echo "\t\t".'<ul>'."\n"; Modified: trunk/linpha2/templates/default/css/global.css =================================================================== --- trunk/linpha2/templates/default/css/global.css 2006-04-01 12:19:15 UTC (rev 4469) +++ trunk/linpha2/templates/default/css/global.css 2006-04-01 16:15:21 UTC (rev 4470) @@ -21,6 +21,15 @@ } /** + * background color + * #divthumbnavi used in view_img.html.php + */ +#divleft, #divmain, #divright, #divthumbnavi { + background-color: #f90; +} + + +/** * title */ #title @@ -44,14 +53,15 @@ /** * left */ - #left + #divleft { position: absolute; - top: 160px; + top: 120px; left: 10px; - + } + #left + { width: 205px; - min-height: 400px; padding: 5px; margin: 0px; @@ -70,14 +80,28 @@ * main */ #divmain { - margin: 0px 10px 10px 10px; + margin: 0px 10px 10px 10px; } #main { - /*background-color: #d5eeff;*/ - /*border: 1px solid #09f;*/ padding: 5px; } +/** + * right + */ + #divright + { + position: absolute; + top: 280px; + right: 10px; + } + #right + { + width: 205px; + + padding: 5px; + margin: 0px; + } /** * menu @@ -156,7 +180,7 @@ margin: 0; padding: 0; } - #menu ul ul a, #menu ul ul span { + #menu ul ul a, #menu ul ul span, #menu ul ul div { display: block; margin: 0; @@ -173,6 +197,12 @@ background: #eeeeee; } + #menu ul span { + background: #ffffff url(../images/expand.gif) no-repeat 100% 100%; + } + #menu ul ul span { + background: #eeeeee url(../images/expand.gif) no-repeat 100% 100%; + } /** * the most important thing @@ -211,10 +241,6 @@ /** * rounded corner stuff */ - #divmain { - background-color: #f90; - } - .roundtop { background: url(../images/tr.gif) no-repeat top right; } Modified: trunk/linpha2/templates/default/css/view_img.css =================================================================== --- trunk/linpha2/templates/default/css/view_img.css 2006-04-01 12:19:15 UTC (rev 4469) +++ trunk/linpha2/templates/default/css/view_img.css 2006-04-01 16:15:21 UTC (rev 4470) @@ -1,65 +1,46 @@ #navigation { - margin: 10px 10px 10px 237px; + margin: 10px 237px 10px 10px; } +#divmain { + margin: 10px 237px 10px 10px; +} #main { text-align: center; } -.mainimage { +#mainimage { width: 350px; height: auto; } /** - * comment stuff + * thumb navigation stuff */ - .add_comment { - color: #036; - width: 600px; - text-align: left; - margin-left: 100px; + #divthumbnavi { + margin: 10px 10px 10px 10px; } - .add_comment input, .add_comment textarea { - background-color: #d5eeff; - } - - .comments { - border: 1px solid #09f; - width: 200px; - margin: 5px; - margin-left: 150px; - } - -/** - * navigation stuff - */ - .div_all_main { + #thumbnavi { position: relative; - - background-color: #d5fcf4; - border: 1px solid #0c9; - margin: 10px 10px 10px 237px; height: 120px; - + font-size: 0.5em; text-align: center; - font-size: 0.5em; } - .div_all_prevthumb { + .thumbnavi_prevthumb { position: absolute; right: 50%; margin-right: 50px; } - .div_all_nextthumb { + .thumbnavi_nextthumb { position: absolute; left: 50%; margin-left: 50px; } - .div_prevnextthumb { + .thumbnavi_prevnextthumb { /*border: 1px solid #000000;*/ float: left; width: 90px; @@ -67,7 +48,7 @@ margin: 2px; } - .div_currentthumb { + .thumbnavi_currentthumb { /*border: 1px solid #000000;*/ position: absolute; left: 50%; @@ -87,4 +68,24 @@ width: 50px; height: auto; border: 0px; + } + +/** + * comment stuff + */ + .add_comment { + color: #036; + width: 600px; + text-align: left; + margin-left: 100px; + } + .add_comment input, .add_comment textarea { + background-color: #d5eeff; + } + + .comments { + border: 1px solid #09f; + width: 200px; + margin: 5px; + margin-left: 150px; } \ No newline at end of file Modified: trunk/linpha2/templates/default/global.html.php =================================================================== --- trunk/linpha2/templates/default/global.html.php 2006-04-01 12:19:15 UTC (rev 4469) +++ trunk/linpha2/templates/default/global.html.php 2006-04-01 16:15:21 UTC (rev 4470) @@ -75,7 +75,7 @@ <li><a href="./"><?php echo i18n("Home"); ?></a></li> </ul> <ul> - <li><span><?php echo i18n("Search"); ?> v</span> + <li><span><?php echo i18n("Search"); ?> </span> <ul> <li><a href="./?cat=search"><?php echo i18n("Extended Search"); ?></a></li> <li> @@ -89,14 +89,14 @@ </ul> <ul> <li> - <span><?php echo i18n("Login"); ?> v</span> + <span><?php echo i18n("Login"); ?> </span> <ul> <li> - <span> + <div> <?php echo i18n("Username"); ?>: <input type="text" name="username" value="" /><br /> <?php echo i18n("Password"); ?>: <input type="password" name="password" value="" /><br /> <input type="submit" name="submit" value="<?php echo i18n("Login"); ?>" /> - </span> + </div> </li> </ul> </li> Modified: trunk/linpha2/templates/default/view_img.html.php =================================================================== --- trunk/linpha2/templates/default/view_img.html.php 2006-04-01 12:19:15 UTC (rev 4469) +++ trunk/linpha2/templates/default/view_img.html.php 2006-04-01 16:15:21 UTC (rev 4470) @@ -1,68 +1,95 @@ -<div id="left"> - <?php - foreach($GLOBALS['linpha']->template->output['image_infos'] AS $value) - { - echo $value['name'].': '.$value['value'].'<br />'; - } - ?> -</div> - <?php if(isset($GLOBALS['linpha']->template->output['navigation']) && !empty($GLOBALS['linpha']->template->output['navigation'])) { ?> <div id="navigation"> <?php echo $GLOBALS['linpha']->template->output['navigation']; ?> </div> <?php } ?> -<div class="div_all_main"> - <div class="div_all_prevthumb"> - <?php echo $GLOBALS['linpha']->template->output['prev_thumb']; ?> +<div id="divthumbnavi"> + <div class="roundtop"> + <img src="<?php echo LINPHA_DIR.'/templates/'.$GLOBALS['linpha']->template->template_name.'/images/tl.gif'; ?>" alt="" width="15" height="15" class="corner" style="display: none" /> </div> - <?php echo $GLOBALS['linpha']->template->output['current_thumb']; ?> - <div class="div_all_nextthumb"> - <?php echo $GLOBALS['linpha']->template->output['next_thumb']; ?> + + <div id="thumbnavi"> + <div class="thumbnavi_prevthumb"> + <?php echo $GLOBALS['linpha']->template->output['prev_thumb']; ?> + </div> + <?php echo $GLOBALS['linpha']->template->output['current_thumb']; ?> + <div class="thumbnavi_nextthumb"> + <?php echo $GLOBALS['linpha']->template->output['next_thumb']; ?> + </div> </div> + + <div class="roundbottom"> + <img src="<?php echo LINPHA_DIR.'/templates/'.$GLOBALS['linpha']->template->template_name.'/images/bl.gif'; ?>" alt="" width="15" height="15" class="corner" style="display: none" /> + </div> </div> -<div id="main"> +<div id="divmain"> + <div class="roundtop"> + <img src="<?php echo LINPHA_DIR.'/templates/'.$GLOBALS['linpha']->template->template_name.'/images/tl.gif'; ?>" alt="" width="15" height="15" class="corner" style="display: none" /> + </div> + <div id="main"> -<!-- show image --> -<?php echo $GLOBALS['linpha']->template->output['image']; ?> -<br /><br /> + <!-- show image --> + <?php echo $GLOBALS['linpha']->template->output['image']; ?> + <br /><br /> + + <!-- show add comment form --> + <div class="add_comment"> + <form action="<?php echo $GLOBALS['linpha']->template->URL_full; ?>" method="POST"> + <?php echo i18n("Add Comment"); ?>:<br /> + <div id="comment_div_text"> + <input type="text" id="comment_input_text" name="comment_text" value="" tabindex="1" size="40" maxlength="40" /> + <a href="javascript:open_textarea()">(+)</a> + </div> + <textarea style="display: none;" id="comment_textarea" name="comment_textarea" tabindex="1" rows="10" cols="50"></textarea> + <?php echo i18n("Name"); ?>: <input type="text" name="author" value="" tabindex="2" size="10" maxlength="40" /> + <input type="hidden" name="cmd" value="add_comment" /> + <input type="submit" name="submit" value="<?php echo i18n("submit"); ?>" /> + </form> + </div> + <br /><br /> + + <!-- show image comments --> + <?php while($data = $GLOBALS['linpha']->template->output['image_comments']->FetchRow()) { ?> + <div class="comments"> + <?php echo $data['time']; ?> <?php echo $data['author']; ?> + <br /> + <?php echo $data['comment']; ?> + <br /><br /> + </div> + <?php } ?> + + <script language="JavaScript" type="text/javascript"> + function open_textarea() + { + document.getElementById('comment_textarea').style.display = 'block'; + document.getElementById('comment_div_text').style.display = 'none'; + + document.getElementById('comment_textarea').value = document.getElementById('comment_input_text').value; + } + </script> -<!-- show add comment form --> -<div class="add_comment"> -<form action="<?php echo $GLOBALS['linpha']->template->URL_full; ?>" method="POST"> -<?php echo i18n("Add Comment"); ?>:<br /> -<div id="comment_div_text"> -<input type="text" id="comment_input_text" name="comment_text" value="" tabindex="1" size="40" maxlength="40" /> -<a href="javascript:open_textarea()">(+)</a> -</div> -<textarea style="display: none;" id="comment_textarea" name="comment_textarea" tabindex="1" rows="10" cols="50"></textarea> -<?php echo i18n("Name"); ?>: <input type="text" name="author" value="" tabindex="2" size="10" maxlength="40" /> -<input type="hidden" name="cmd" value="add_comment" /> -<input type="submit" name="submit" value="<?php echo i18n("submit"); ?>" /> -</form> -</div> -<br /><br /> - -<!-- show image comments --> -<?php while($data = $GLOBALS['linpha']->template->output['image_comments']->FetchRow()) { ?> - <div class="comments"> - <?php echo $data['time']; ?> <?php echo $data['author']; ?> - <br /> - <?php echo $data['comment']; ?> - <br /><br /> </div> -<?php } ?> + <div class="roundbottom"> + <img src="<?php echo LINPHA_DIR.'/templates/'.$GLOBALS['linpha']->template->template_name.'/images/bl.gif'; ?>" alt="" width="15" height="15" class="corner" style="display: none" /> + </div> </div> -<script language="JavaScript" type="text/javascript"> -function open_textarea() -{ - document.getElementById('comment_textarea').style.display = 'block'; - document.getElementById('comment_div_text').style.display = 'none'; - - document.getElementById('comment_textarea').value = document.getElementById('comment_input_text').value; -} -</script> \ No newline at end of file +<div id="divright" + <div class="roundtop"> + <img src="<?php echo LINPHA_DIR.'/templates/'.$GLOBALS['linpha']->template->template_name.'/images/tl.gif'; ?>" alt="" width="15" height="15" class="corner" style="display: none" /> + </div> + <div id="right"> + <?php + foreach($GLOBALS['linpha']->template->output['image_infos'] AS $value) + { + echo $value['name'].': '.$value['value'].'<br />'; + } + ?> + </div> + <div class="roundbottom"> + <img src="<?php echo LINPHA_DIR.'/templates/'.$GLOBALS['linpha']->template->template_name.'/images/bl.gif'; ?>" alt="" width="15" height="15" class="corner" style="display: none" /> + </div> +</div> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
