[Linpha-cvs] SF.net SVN: linpha: [4451] trunk/linpha2
Status: Inactive
Brought to you by:
bzrudi
Menu
▾
▴
[Linpha-cvs] SF.net SVN: linpha: [4451] trunk/linpha2
|
From: <fan...@us...> - 2006-03-29 13:12:11
|
Revision: 4451 Author: fangehrn Date: 2006-03-29 05:11:38 -0800 (Wed, 29 Mar 2006) ViewCVS: http://svn.sourceforge.net/linpha/?rev=4451&view=rev Log Message: ----------- * rearanged templates Modified Paths: -------------- trunk/linpha2/ChangeLog trunk/linpha2/index_template.php trunk/linpha2/lib/classes/linpha.class.php trunk/linpha2/lib/classes/linpha.imgview.class.php trunk/linpha2/lib/classes/linpha.template.class.php trunk/linpha2/lib/classes/thumbnails.js trunk/linpha2/lib/modules/module.basket.php trunk/linpha2/linpha2.specs.txt trunk/linpha2/templates/default/css/global.css trunk/linpha2/templates/default/css/view_thumb.css trunk/linpha2/templates/default/global.html.php trunk/linpha2/templates/default/home.html.php trunk/linpha2/templates/default/view_meta.head.php trunk/linpha2/templates/default/view_thumb.html.php trunk/linpha2/templates/default_old/index.php trunk/linpha2/templates/default_old/main.php Modified: trunk/linpha2/ChangeLog =================================================================== --- trunk/linpha2/ChangeLog 2006-03-29 12:30:11 UTC (rev 4450) +++ trunk/linpha2/ChangeLog 2006-03-29 13:11:38 UTC (rev 4451) @@ -1,3 +1,6 @@ +2006-03-29 flo + * rearanged templates + 2006-03-26 flo * applying bastian's theme * added "more" menu entry Modified: trunk/linpha2/index_template.php =================================================================== --- trunk/linpha2/index_template.php 2006-03-29 12:30:11 UTC (rev 4450) +++ trunk/linpha2/index_template.php 2006-03-29 13:11:38 UTC (rev 4451) @@ -37,7 +37,7 @@ // "<lib/include/dbconnect.php> in $_SERVER[SCRIPT_FILENAME]"); //} - if(!include_once(LINPHA_DIR.'/templates/default/main.php')) + if(!include_once(LINPHA_DIR.'/templates/default_old/main.php')) { throw new Exception ("ERROR: failed to include " . "</templates/default/main.php><br>LOCATION: index.php"); Modified: trunk/linpha2/lib/classes/linpha.class.php =================================================================== --- trunk/linpha2/lib/classes/linpha.class.php 2006-03-29 12:30:11 UTC (rev 4450) +++ trunk/linpha2/lib/classes/linpha.class.php 2006-03-29 13:11:38 UTC (rev 4451) @@ -43,7 +43,7 @@ } include_once(LINPHA_DIR.'/lib/classes/linpha.sql.class.php'); -include_once(LINPHA_DIR.'/lib/classes/linpha.template_new.class.php'); +include_once(LINPHA_DIR.'/lib/classes/linpha.template.class.php'); include_once(LINPHA_DIR.'/lib/classes/linpha.image.class.php'); include_once(LINPHA_DIR.'/lib/classes/linpha.filesys.class.php'); Modified: trunk/linpha2/lib/classes/linpha.imgview.class.php =================================================================== --- trunk/linpha2/lib/classes/linpha.imgview.class.php 2006-03-29 12:30:11 UTC (rev 4450) +++ trunk/linpha2/lib/classes/linpha.imgview.class.php 2006-03-29 13:11:38 UTC (rev 4451) @@ -205,7 +205,7 @@ break; } - include_once(LINPHA_DIR.'/templates/html/'.$GLOBALS['linpha']->template->template_name.'/global.html.php'); + include_once(LINPHA_DIR.'/templates/'.$GLOBALS['linpha']->template->template_name.'/global.html.php'); } @@ -356,8 +356,8 @@ if(isset($_GET['use_js'])) { $this->use_javascript = 1; - $GLOBALS['linpha']->template->URL_base .= '&use_js=1'; - $GLOBALS['linpha']->template->URL_full .= '&use_js=1'; + $GLOBALS['linpha']->template->URL_base .= '&use_js=1'; + $GLOBALS['linpha']->template->URL_full .= '&use_js=1'; $GLOBALS['linpha']->template->output['page_nr_left'] = ''; $GLOBALS['linpha']->template->output['page_nr_right'] = ''; $GLOBALS['linpha']->template->output['page_nr'] = ''; Modified: trunk/linpha2/lib/classes/linpha.template.class.php =================================================================== --- trunk/linpha2/lib/classes/linpha.template.class.php 2006-03-29 12:30:11 UTC (rev 4450) +++ trunk/linpha2/lib/classes/linpha.template.class.php 2006-03-29 13:11:38 UTC (rev 4451) @@ -24,13 +24,13 @@ switch($what) { case 'body': - $filename = LINPHA_DIR.'/templates/html/'.$this->template_name.'/'.$this->body_name.'.html.php'; + $filename = LINPHA_DIR.'/templates/'.$this->template_name.'/'.$this->body_name.'.html.php'; break; case 'head': - $filename = LINPHA_DIR.'/templates/html/'.$this->template_name.'/'.$this->head_name.'.head.php'; + $filename = LINPHA_DIR.'/templates/'.$this->template_name.'/'.$this->head_name.'.head.php'; break; case 'css': - echo LINPHA_DIR.'/templates/css/'.$this->template_name.'/'.$this->css_name.'.css'; + echo LINPHA_DIR.'/templates/'.$this->template_name.'/css/'.$this->css_name.'.css'; break; } Modified: trunk/linpha2/lib/classes/thumbnails.js =================================================================== --- trunk/linpha2/lib/classes/thumbnails.js 2006-03-29 12:30:11 UTC (rev 4450) +++ trunk/linpha2/lib/classes/thumbnails.js 2006-03-29 13:11:38 UTC (rev 4451) @@ -1,17 +1,3 @@ -/* -Important links (dont delete!) -http://de.selfhtml.org/javascript/beispiele/fensterueberwachen.htm -http://www.quirksmode.org/viewport/ !! -http://css.maxdesign.com.au/floatutorial/ Float Tutorial -http://www.csszengarden.com/tr/deutsch - -http://www.thestyleworks.de/tut-art/layout_div.shtml sehr ausf?hrlich! - -max-width in IE: -http://www.svendtofte.com/code/max_width_in_ie/ - -*/ - var current_page = startup_page var nr_pages = 0; Modified: trunk/linpha2/lib/modules/module.basket.php =================================================================== --- trunk/linpha2/lib/modules/module.basket.php 2006-03-29 12:30:11 UTC (rev 4450) +++ trunk/linpha2/lib/modules/module.basket.php 2006-03-29 13:11:38 UTC (rev 4451) @@ -106,5 +106,5 @@ $linpha->template->setModuleName('basket'); $linpha->template->URL_full = LINPHA_DIR.'/?cat=basket&ref_id='.$_GET['ref_id']; -include_once(LINPHA_DIR.'/templates/html/'.$GLOBALS['linpha']->template->template_name.'/global.html.php'); +include_once(LINPHA_DIR.'/templates/'.$GLOBALS['linpha']->template->template_name.'/global.html.php'); ?> \ No newline at end of file Modified: trunk/linpha2/linpha2.specs.txt =================================================================== --- trunk/linpha2/linpha2.specs.txt 2006-03-29 12:30:11 UTC (rev 4450) +++ trunk/linpha2/linpha2.specs.txt 2006-03-29 13:11:38 UTC (rev 4451) @@ -69,7 +69,20 @@ - getID3 for all Video stuff - PHPThumb for all image related manipulation (needs testing!) + Links: + CSS/ Javascript + - Rounded Corners http://kalsey.com/2003/07/rounded_corners_in_css/ + - Menu http://www.tanfa.co.uk/css/examples/menu/tutorial-h.asp + - CSS Zen Garden http://www.csszengarden.com/tr/deutsch + - Float Tutorial http://css.maxdesign.com.au/floatutorial/ + - CSS Layouts, sehr ausfuehrlich http://www.thestyleworks.de/tut-art/layout_div.shtml + - http://www.quirksmode.org/viewport/ !! + - max-width in IE: http://www.svendtofte.com/code/max_width_in_ie/ + - Fenster ueberwachen http://de.selfhtml.org/javascript/beispiele/fensterueberwachen.htm + + + Part 5: Folder Structure ============================================================================== actions/ @@ -258,10 +271,6 @@ ############################################################################ Open questions ############################################################################ -- store thumbnails in /var/cache/thumb? - - id or md5sum based? - /* edit bzrudi */ - (as discussed it should be id based...) - thumbnail size, set a max size (for example 150px), to be able to switch the size on fly @@ -332,6 +341,11 @@ DONE ==== + - store thumbnails in /var/cache/thumb? + - id or md5sum based? + /* edit bzrudi */ + (as discussed it should be id based...) + - allow unlimited subfolders - allow permissions set to all files and folders Modified: trunk/linpha2/templates/default/css/global.css =================================================================== --- trunk/linpha2/templates/default/css/global.css 2006-03-29 12:30:11 UTC (rev 4450) +++ trunk/linpha2/templates/default/css/global.css 2006-03-29 13:11:38 UTC (rev 4451) @@ -25,6 +25,7 @@ */ #divtitle { margin-top: 10px; + margin-bottom: 20px; height: 40px; } #title { @@ -83,29 +84,25 @@ * main */ #divmain { - margin: 10px 10px 10px 10px; + margin: 0px 10px 10px 10px; } #main { - /* background-color: #d5eeff;*/ - /* border: 1px solid #09f;*/ - padding: 5px; + /*background-color: #d5eeff;*/ + /*border: 1px solid #09f;*/ + padding: 5px; } /** * menu - * view http://www.tanfa.co.uk/css/examples/menu/tutorial-h.asp - * the nicest one! */ #divmenu { /* background-color: #ffd5ee;*/ /* border: 1px solid #f09;*/ - margin-top: 5px; - z-index: 400; - height: 40px; + height: 30px; } #menu { @@ -208,18 +205,17 @@ /** * rounded corner stuff - * http://kalsey.com/2003/07/rounded_corners_in_css/ */ #divmain { background-color: #f90; } .roundtop { - background: url(../../html/images/tr.gif) no-repeat top right; + background: url(../images/tr.gif) no-repeat top right; } .roundbottom { - background: url(../../html/images/br.gif) no-repeat top right; + background: url(../images/br.gif) no-repeat top right; } img.corner { Modified: trunk/linpha2/templates/default/css/view_thumb.css =================================================================== --- trunk/linpha2/templates/default/css/view_thumb.css 2006-03-29 12:30:11 UTC (rev 4450) +++ trunk/linpha2/templates/default/css/view_thumb.css 2006-03-29 13:11:38 UTC (rev 4451) @@ -1,5 +1,5 @@ #main { - min-height: 500px; /* @todo floated divs in thumb view without javascript doesnt count to the main div height */ + min-height: 500px; @todo floated divs in thumb view without javascript doesnt count to the main div height */ } /** Modified: trunk/linpha2/templates/default/global.html.php =================================================================== --- trunk/linpha2/templates/default/global.html.php 2006-03-29 12:30:11 UTC (rev 4450) +++ trunk/linpha2/templates/default/global.html.php 2006-03-29 13:11:38 UTC (rev 4451) @@ -10,11 +10,11 @@ <title><?php echo $GLOBALS['linpha']->template->linpha_title; ?></title> <!-- css includes --> -<link rel='stylesheet' href='<?php echo LINPHA_DIR.'/templates/css/'.$GLOBALS['linpha']->template->template_name.'/global.css'; ?>' type='text/css'> +<link rel='stylesheet' href='<?php echo LINPHA_DIR.'/templates/'.$GLOBALS['linpha']->template->template_name.'/css/global.css'; ?>' type='text/css'> <link rel='stylesheet' href='<?php $GLOBALS['linpha']->template->includeFile('css'); ?>' type='text/css'> <?php if( isset($GLOBALS['linpha']->template->output['sys_log'])) { ?> - <link rel='stylesheet' href='<?php echo LINPHA_DIR.'/templates/css/'.$GLOBALS['linpha']->template->template_name.'/syslog.css'; ?>' type='text/css'> + <link rel='stylesheet' href='<?php echo LINPHA_DIR.'/templates/'.$GLOBALS['linpha']->template->template_name.'/css/syslog.css'; ?>' type='text/css'> <?php } ?> <?php $GLOBALS['linpha']->template->includeFile('head'); ?> Modified: trunk/linpha2/templates/default/home.html.php =================================================================== --- trunk/linpha2/templates/default/home.html.php 2006-03-29 12:30:11 UTC (rev 4450) +++ trunk/linpha2/templates/default/home.html.php 2006-03-29 13:11:38 UTC (rev 4451) @@ -1,6 +1,6 @@ <div id="divmain"> <div class="roundtop"> - <img src="templates/html/images/tl.gif" alt="" width="15" height="15" class="corner" style="display: none" /> + <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"> @@ -58,6 +58,6 @@ </div> <div class="roundbottom"> - <img src="templates/html/images/bl.gif" alt="" width="15" height="15" class="corner" style="display: none" /> + <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 Modified: trunk/linpha2/templates/default/view_meta.head.php =================================================================== --- trunk/linpha2/templates/default/view_meta.head.php 2006-03-29 12:30:11 UTC (rev 4450) +++ trunk/linpha2/templates/default/view_meta.head.php 2006-03-29 13:11:38 UTC (rev 4451) @@ -3,4 +3,4 @@ * use all definitions from view_img.css, and append here view_meta.css */ ?> -<link rel="stylesheet" href="<?php echo LINPHA_DIR.'/templates/css/'.$GLOBALS['linpha']->template->template_name.'/view_meta.css'; ?>" type="text/css" /> \ No newline at end of file +<link rel="stylesheet" href="<?php echo LINPHA_DIR.'/templates/'.$GLOBALS['linpha']->template->template_name.'/css/view_meta.css'; ?>" type="text/css" /> \ No newline at end of file Modified: trunk/linpha2/templates/default/view_thumb.html.php =================================================================== --- trunk/linpha2/templates/default/view_thumb.html.php 2006-03-29 12:30:11 UTC (rev 4450) +++ trunk/linpha2/templates/default/view_thumb.html.php 2006-03-29 13:11:38 UTC (rev 4451) @@ -1,20 +1,33 @@ -<?php -/** - * javascript enabled - */ -if($GLOBALS['linpha']->imgview->use_javascript) -{ -?> - <script language="JavaScript" type="text/javascript"> +<script language="JavaScript" type="text/javascript"> +<!-- + <?php // javascript enabled + if($GLOBALS['linpha']->imgview->use_javascript) { + ?> window.onresize = display_images; - </script> + <?php + } else { // javascript disabled + ?> + location.href = "<?php echo convert_amp($GLOBALS['linpha']->template->URL_full.'&use_js=1'); ?>"; + <?php + } + ?> +//--> +</script> - <?php if(isset($GLOBALS['linpha']->template->output['navigation']) && !empty($GLOBALS['linpha']->template->output['navigation'])) { ?> - <div id="navigation"> - <?php echo $GLOBALS['linpha']->template->output['navigation']; ?> +<?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 id="spacer_height"> +</div> + +<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> - <?php } ?> <!-- need an outer div for the correct height, because elements in #page_nr are floated @@ -22,84 +35,54 @@ --> <div id="divpage_nr"> <div id="page_nr"> - <div class="page_nr_divs" id="page_nr_left">left</div> - <div class="page_nr_divs page_nr_maindiv" id="page_nr_middle">page nr middle</div> - <div class="page_nr_divs" id="page_nr_right">right</div> + <div id="page_nr_left" class="page_nr_divs"><?php echo $GLOBALS['linpha']->template->output['page_nr_left']; ?></div> + <div id="page_nr_middle" class="page_nr_divs page_nr_maindiv"><?php echo $GLOBALS['linpha']->template->output['page_nr']; ?></div> + <div id="page_nr_right" class="page_nr_divs"><?php echo $GLOBALS['linpha']->template->output['page_nr_right']; ?></div> </div> </div> - - <div id="spacer_height"> - </div> - - <div id="divmain"> - <div class="roundtop"> - <img src="templates/html/images/tl.gif" alt="" width="15" height="15" class="corner" style="display: none" /> - </div> - <div id="main"> - </div> - <div class="roundbottom"> - <img src="templates/html/images/bl.gif" alt="" width="15" height="15" class="corner" style="display: none" /> - </div> - </div> - - <script language="JavaScript" type="text/javascript"> - display_images(); - </script> -<?php -} -else -{ -/** - * javascript disabled - */ -?> - <script language="JavaScript" type="text/javascript"> - <!-- - location.href = "<?php echo convert_amp($GLOBALS['linpha']->template->URL_full.'&use_js=1'); ?>"; - //--> - </script> - - <?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 id="page_nr"> - <div class="page_nr_divs" id="page_nr_right"><?php echo $GLOBALS['linpha']->template->output['page_nr_right']; ?></div> - <div class="page_nr_divs page_nr_maindiv" id="page_nr"><?php echo $GLOBALS['linpha']->template->output['page_nr']; ?></div> - <div class="page_nr_divs" id="page_nr_left"><?php echo $GLOBALS['linpha']->template->output['page_nr_left']; ?></div> - </div> - <div id="main"> - <?php - $i = 1; - foreach($GLOBALS['linpha']->imgview->photos_show AS $value) + <?php // javascript disabled + if( ! $GLOBALS['linpha']->imgview->use_javascript) { - /** - * add clear float to last div on row - */ - if( ($i-1) % $GLOBALS['no_js_nr_cols'] == 0) + $i = 1; + foreach($GLOBALS['linpha']->imgview->photos_show AS $value) { - $str_clear = ' clear: left;'; + /** + * add clear float to last div on row + */ + if( ($i-1) % $GLOBALS['no_js_nr_cols'] == 0) + { + $str_clear = ' clear: left;'; + } + else + { + $str_clear = ''; + } + $i++; + ?> + <div style="width: <?php echo $GLOBALS['def_tn_size']; ?>px; height: <?php echo $GLOBALS['def_tn_size']; ?>px; <?php echo $str_clear; ?>" class="imgdiv"> + <a href="<?php echo LINPHA_DIR.'/?cat=alb&id='.$value['id']; ?>"> + <img height="<?php echo ($GLOBALS['def_tn_size']-20); ?>" src="<?php echo LINPHA_DIR.'/get_thumb.php?id='.$value['id']; ?>" class="img_thumbnail" /> + </a> + <br /><?php echo $value['name']; ?> + </div> + <?php } - else - { - $str_clear = ''; - } - $i++; - ?> - <div style="width: <?php echo $GLOBALS['def_tn_size']; ?>px; height: <?php echo $GLOBALS['def_tn_size']; ?>px; <?php echo $str_clear; ?>" class="imgdiv"> - <a href="./?cat=alb&id=<?php echo $value['id']; ?>"> - <img height="<?php echo ($GLOBALS['def_tn_size']-20); ?>" src="./get_thumb.php?id=<?php echo $value['id']; ?>" class="img_thumbnail" /> - </a> - <br /><?php echo $value['name']; ?> - </div> - <?php } ?> + </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> -<?php -} -?> \ No newline at end of file + + <?php // javascript enabled + if($GLOBALS['linpha']->imgview->use_javascript) { + ?> + <script language="JavaScript" type="text/javascript"> + display_images(); + </script> + <?php + } + ?> \ No newline at end of file Modified: trunk/linpha2/templates/default_old/index.php =================================================================== --- trunk/linpha2/templates/default_old/index.php 2006-03-29 12:30:11 UTC (rev 4450) +++ trunk/linpha2/templates/default_old/index.php 2006-03-29 13:11:38 UTC (rev 4451) @@ -49,13 +49,13 @@ <div><a href="">Guestbook</a></div> </li> <li class="button"> - <div><a href=""><img src="<?php echo TOP_DIR.'/templates/default/images/slideshow.png'?>" alt="slideshow" /></a></div> + <div><a href=""><img src="<?php echo TOP_DIR.'/templates/default_old/images/slideshow.png'?>" alt="slideshow" /></a></div> </li> <li class="button"> - <div><a href=""><img src="<?php echo LINPHA_DIR.'/templates/default/images/download.png'?>" alt="download" /></a></div> + <div><a href=""><img src="<?php echo LINPHA_DIR.'/templates/default_old/images/download.png'?>" alt="download" /></a></div> </li> <li class="button"> - <div><a href=""><img src="<?php echo LINPHA_DIR.'/templates/default/images/print.png'?>" alt="print" /></a></div> + <div><a href=""><img src="<?php echo LINPHA_DIR.'/templates/default_old/images/print.png'?>" alt="print" /></a></div> </li> <li> <div><a href="">My settings</a></div> @@ -75,11 +75,11 @@ </div> </div> <div id="thumb_navigation"> - <div id="previous"><img src="<?php echo LINPHA_DIR.'/templates/default/images/previous.png'?>" alt="previous" /></div> - <div id="next"><img src="<?php echo LINPHA_DIR.'/templates/default/images/next.png'?>" alt="next" /></div> + <div id="previous"><img src="<?php echo LINPHA_DIR.'/templates/default_old/images/previous.png'?>" alt="previous" /></div> + <div id="next"><img src="<?php echo LINPHA_DIR.'/templates/default_old/images/next.png'?>" alt="next" /></div> </div> <div id="content"> - <div id="photo"><img src="<?php echo LINPHA_DIR.'/templates/default/images/photo.jpg'?>" alt="photo" /></div> + <div id="photo"><img src="<?php echo LINPHA_DIR.'/templates/default_old/images/photo.jpg'?>" alt="photo" /></div> <div id="photo_comment">The colorado beetle. This beetle is serious pest of potatoes and other solanaceous plants. But a very beautifull one!</div> <div id="photo_exif"> Name: org00164.jpg<br /> Modified: trunk/linpha2/templates/default_old/main.php =================================================================== --- trunk/linpha2/templates/default_old/main.php 2006-03-29 12:30:11 UTC (rev 4450) +++ trunk/linpha2/templates/default_old/main.php 2006-03-29 13:11:38 UTC (rev 4451) @@ -28,13 +28,13 @@ { if(!defined('LINPHA2_INC')) { die("ERROR: Direct access forbidden."); } - if(include_once(LINPHA_DIR.'/lib/classes/linpha.template.class.php')) + if(include_once(LINPHA_DIR.'/lib/classes/linpha.template_old.class.php')) { /** * Create new instance of class Template * @param string template name */ - $objTemplate = new Template("default"); + $objTemplate = new Template("default_old"); } else { @@ -51,7 +51,7 @@ $objTemplate -> linXhtmlHeader(); -require_once(LINPHA_DIR.'/templates/default/index.php'); +require_once(LINPHA_DIR.'/templates/default_old/index.php'); } // end try This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
