Thread: [Linpha-cvs] SF.net SVN: linpha: [4446] trunk/linpha2/templates/default
Status: Inactive
Brought to you by:
bzrudi
Menu
▾
▴
linpha-cvs
|
From: <fan...@us...> - 2006-03-29 12:24:24
|
Revision: 4446 Author: fangehrn Date: 2006-03-29 04:23:37 -0800 (Wed, 29 Mar 2006) ViewCVS: http://svn.sourceforge.net/linpha/?rev=4446&view=rev Log Message: ----------- Added Paths: ----------- trunk/linpha2/templates/default/basket.html.php trunk/linpha2/templates/default/global.html.php trunk/linpha2/templates/default/home.html.php trunk/linpha2/templates/default/view_basket.html.php trunk/linpha2/templates/default/view_comment.html.php trunk/linpha2/templates/default/view_img.html.php trunk/linpha2/templates/default/view_meta.head.php trunk/linpha2/templates/default/view_meta.html.php trunk/linpha2/templates/default/view_thumb.head.php trunk/linpha2/templates/default/view_thumb.html.php trunk/linpha2/templates/default/view_thumbdetail.html.php Removed Paths: ------------- trunk/linpha2/templates/html/default/basket.html.php trunk/linpha2/templates/html/default/global.html.php trunk/linpha2/templates/html/default/home.html.php trunk/linpha2/templates/html/default/view_basket.html.php trunk/linpha2/templates/html/default/view_comment.html.php trunk/linpha2/templates/html/default/view_img.html.php trunk/linpha2/templates/html/default/view_meta.head.php trunk/linpha2/templates/html/default/view_meta.html.php trunk/linpha2/templates/html/default/view_thumb.head.php trunk/linpha2/templates/html/default/view_thumb.html.php trunk/linpha2/templates/html/default/view_thumbdetail.html.php Copied: trunk/linpha2/templates/default/basket.html.php (from rev 4442, trunk/linpha2/templates/html/default/basket.html.php) =================================================================== --- trunk/linpha2/templates/default/basket.html.php (rev 0) +++ trunk/linpha2/templates/default/basket.html.php 2006-03-29 12:23:37 UTC (rev 4446) @@ -0,0 +1,54 @@ +<form name="basket" action="<?php echo $GLOBALS['linpha']->template->URL_full; ?>&cmd=remove_selected" method="POST"> +<div class='navigation'> +<a href="<?php echo LINPHA_DIR.'/?cat=alb&id='.$_GET['ref_id']; ?>"><?php echo i18n("Go Back"); ?></a> +<a href="<?php echo $GLOBALS['linpha']->template->URL_full; ?>&cmd=remove_all"><?php echo i18n("Remove all"); ?></a> +<input type="submit" name="submit" value="<?php echo i18n("Remove selected"); ?>" /> +<br /><br /> +<?php echo i18n("Images in basket");?>: <?php echo count($_SESSION['basket_ids']); ?> +</div> + +<div id="main"> + +<?php if( count($_SESSION['basket_ids']) > 0 ) { ?> + + <?php + foreach($GLOBALS['linpha']->template->output['basket_folders'] AS $value) + { + echo set_navigation_line($value).'<br />'; + $i = 1; + foreach($GLOBALS['linpha']->template->output['basket_folder_contents'][$value] AS $sub_value) + { + ?> + <div class='imgdiv'> + <a href='javascript:void(0)' onclick='update_checkbox(<?php echo $i; ?>)'><img src='<?php echo LINPHA_DIR.'/get_thumb.php?id='.$sub_value; ?>' class='img_thumbnail' /></a> + <br /> + <input type='checkbox' id='<?php echo $i; ?>' name='img_id[]' value='<?php echo $sub_value; ?>'> + </div> + <?php + $i++; + } + echo '<div style="clear: both;"></div><br /><br />'; + } + ?> + <script language="JavaScript" type='text/javascript'> + function update_checkbox(elem_id) + { + elem = document.getElementById(elem_id); + if(elem.checked==true) + { + elem.checked = false; + } + else + { + elem.checked = true; + } + } + </script> +<?php +} +else +{ + echo i18n("Empty Basket"); +} ?> +</div> +</form> \ No newline at end of file Copied: trunk/linpha2/templates/default/global.html.php (from rev 4442, trunk/linpha2/templates/html/default/global.html.php) =================================================================== --- trunk/linpha2/templates/default/global.html.php (rev 0) +++ trunk/linpha2/templates/default/global.html.php 2006-03-29 12:23:37 UTC (rev 4446) @@ -0,0 +1,100 @@ +<?php +/** + * first output starts here + */ +?> +<?php /*header('Content-type: text/html; charset='.$html_charset);*/ ?> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<html> +<head> +<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 $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'> +<?php } ?> + +<?php $GLOBALS['linpha']->template->includeFile('head'); ?> +</head> + + + +<body> + +<?php if( isset($GLOBALS['linpha']->template->output['sys_log']) ) { ?> + <!-- syslog --> + <div id="sys_log"> + <div class="sys_log_close"><a href="javascript:toggleWindow()">X</a></div> + <div id="sys_log_text"> + <?php echo i18n("Linpha Syslog"); ?>:<br /> + <?php echo $GLOBALS['linpha']->template->output['sys_log']; ?> + </div> + </div> + <script type="text/javascript" language="javascript" src="<?php echo LINPHA_DIR; ?>/lib/classes/syslog.js"> </script> +<?php } ?> + +<!-- title/navigation --> +<div id="divtitle"> +<div id="title"> + <?php echo $GLOBALS['linpha']->template->linpha_title." :: ".$GLOBALS['linpha']->template->output['title']; ?> +</div> +</div> + +<!-- menu --> +<!-- +need an outer div for the correct height, because elements in #menu are floated +and doesn't count to the this elements height +--> +<div id="divmenu"> +<div id="menu"> + <ul> + <li><a href="./"><?php echo i18n("Home"); ?></a></li> + </ul> + <ul> + <li><a href="./admin/"><?php echo i18n("Admin"); ?></a></li> + </ul> + <ul> + <li><span><?php echo i18n("Search"); ?> v</span> + <ul> + <li><a href="./?cat=search"><?php echo i18n("Extended Search"); ?></a></li> + <li> + <span> + <input type="text" name="search" value="" /> + <input type="submit" name="submit" value="<?php echo i18n("Search"); ?>" /> + </span> + </li> + </ul> + </li> + </ul> + <ul> + <li> + <span><?php echo i18n("Login"); ?> v</span> + <ul> + <li> + <span> + <?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> + </li> + </ul> + </li> + </ul> + <?php + /** + * Print "More"-menu entry + */ + if( isset( $GLOBALS['linpha']->template->output['menu_more'] ) ) { + $GLOBALS['linpha']->template->printMenu('more'); + } + ?> +</div> +</div> +<!-- end menu --> + +<?php $GLOBALS['linpha']->template->includeFile('body'); ?> +</body> +</html> \ No newline at end of file Property changes on: trunk/linpha2/templates/default/global.html.php ___________________________________________________________________ Name: svn:eol-style + native Copied: trunk/linpha2/templates/default/home.html.php (from rev 4442, trunk/linpha2/templates/html/default/home.html.php) =================================================================== --- trunk/linpha2/templates/default/home.html.php (rev 0) +++ trunk/linpha2/templates/default/home.html.php 2006-03-29 12:23:37 UTC (rev 4446) @@ -0,0 +1,63 @@ +<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"> + +<h1><?php echo i18n("Welcome"); ?></h1> +<br /><br /><br /> + +<hr /> + +<?php if( count($GLOBALS['linpha']->template->output['random_images']) > 0 ) { ?> + <h1><?php echo i18n("Random images"); ?></h1> + <div class='div_random'> + <?php + foreach($GLOBALS['linpha']->template->output['random_images'] AS $key=>$value) + { + ?> + <div class='div_random_img'> + <?php echo '<a href="'.LINPHA_DIR.'/?cat=alb&id='.$value['id'].'">' + . '<img class="img_random_thumbnail" title="'.htmlentities($value['path']).'" src="'. LINPHA_DIR.'/get_thumb.php?id=' .$value['id'] .'" alt="randomimage" /></a>'; ?> + </div> + <?php + } + ?> + </div> + + <hr /> +<?php } ?> + +<?php echo i18n("Browse by Date").': '.$GLOBALS['linpha']->template->output['browse_by_date']; ?><br /> +<hr /> + +<h1><?php echo i18n("Albums"); ?></h1> + +<?php +foreach($GLOBALS['linpha']->imgview->photos_filtered AS $key=>$value) +{ + ?> + <div class='div_folder'> + <?php echo '<a href="'.LINPHA_DIR.'/?cat=alb&id='.$value['id'].'">' + . '<img class="img_folder_thumbnail" src="'. LINPHA_DIR.'/get_thumb.php?id=' .$value['id'] .'" alt="thumbnail_album" /></a>'; ?> + + <div class='div_folder_text'> + <h2><?php echo $value['name']; ?></h2> + + <?php echo $value['stats_numbers'].' '.i18n("Photos"); ?> + + <br /> + <?php echo strftime("%x %X",$value['time_add']); ?> + + </div> + </div> + <?php +} +?> +</div> + + <div class="roundbottom"> + <img src="templates/html/images/bl.gif" alt="" width="15" height="15" class="corner" style="display: none" /> + </div> +</div> \ No newline at end of file Copied: trunk/linpha2/templates/default/view_basket.html.php (from rev 4442, trunk/linpha2/templates/html/default/view_basket.html.php) =================================================================== --- trunk/linpha2/templates/default/view_basket.html.php (rev 0) +++ trunk/linpha2/templates/default/view_basket.html.php 2006-03-29 12:23:37 UTC (rev 4446) @@ -0,0 +1,119 @@ +<div id="left"> +left<br />left<br />left<br />left<br />left<br />left<br /> +left<br />left<br />left<br />left<br />left<br />left<br /> +</div> + + +<div class="page_nr_main"> + <!-- cannot use floated div in another div !! + in this div it is possible because it has position: absolute --> + <div class='page_nr' id='page_nr_right'><?php echo $GLOBALS['linpha']->template->output['page_nr_right']; ?></div> + <div class='page_nr' id='page_nr' style="width: 350px; text-align: center;"><?php echo $GLOBALS['linpha']->template->output['page_nr']; ?></div> + <div class='page_nr' id='page_nr_left'><?php echo $GLOBALS['linpha']->template->output['page_nr_left']; ?></div> +</div> + +<div id="navigation"> + <?php echo $GLOBALS['linpha']->template->output['navigation']; ?> + <br /><br /> + <?php echo i18n("Images In Basket"); ?>: <?php echo count($_SESSION['basket_ids']); ?> + (<a href="<?php echo LINPHA_DIR.'?cat=basket&ref_id='.$GLOBALS['linpha']->imgview->id_current; ?>"><?php echo i18n("Open Basket"); ?></a>) + <br /> + <a href="<?php echo $GLOBALS['linpha']->template->URL_full.'&view=thumb'; ?>"><?php echo i18n("Back To Normal View"); ?></a> +</div> + +<form name='basket' action='<?php echo LINPHA_DIR.'/?cat=basket&cmd=add_selected&ref_id='.$GLOBALS['linpha']->imgview->id_current; ?>' method='POST'> +<div id="main"> + <?php + $i = 1; + foreach($GLOBALS['linpha']->imgview->photos_show AS $value) + { + /** + * add clear float to last div on row + */ + if( ($i-1) % $GLOBALS['no_js_nr_cols'] == 0) + { + echo "<div style='height: ".$GLOBALS['def_tn_size']."px; clear: left;' class='imgdiv'>"; + echo "<a href='javascript:void(0)' onclick='check_from_to(".$i.",".($i+$GLOBALS['no_js_nr_cols']-1).")'>Check row</a>"; + echo "</div>"; + } + ?> + <div style='width: <?php echo $GLOBALS['def_tn_size']; ?>px; height: <?php echo $GLOBALS['def_tn_size']; ?>px;' class='imgdiv'> + <a href='javascript:void(0)' onclick='update_checkbox(<?php echo $i; ?>)'><img height='<?php echo ($GLOBALS['def_tn_size']-20); ?>' src='./get_thumb.php?id=<?php echo $value['id']; ?>' class='img_thumbnail' /></a> + + <div class="img_text"> + <input type='checkbox' id='<?php echo $i; ?>' name='img_id[]' value='<?php echo $value['id']; ?>'> + <?php echo $value['name']; ?> + </div> + + </div> + + <?php + $i++; + } + ?> + <div style="clear: left;"></div> + <br /><br /> + <input type='button' name='button_check_all' value='check all of this page' onClick='this.value=check_all()'> + <input type='submit' value='add to basket'> + <a href="<?php echo LINPHA_DIR.'?cat=basket&ref_id='.$GLOBALS['linpha']->imgview->id_current.'&cmd=add_all'; ?>">add all of this folder to basket</a> + <script language="JavaScript" type='text/javascript'> + var checkflag = 0; + function check_all() { + if (checkflag == 0) // check all + { + checkflag = 1; + var return_value = "remove selection"; + } + else // clear all + { + checkflag = 0; + var return_value = "check all of this page"; + } + + for (var i = 0; i < document.forms[0].length; i++) + { + elem = document.forms[0].elements[i]; + if (elem.type == "checkbox") { + elem.checked = checkflag; + } + } + return return_value; + } + + function update_checkbox(elem_id) + { + elem = document.getElementById(elem_id); + if(elem.checked==true) + { + elem.checked = false; + } + else + { + elem.checked = true; + } + } + + function check_from_to(i_start,i_end) + { + var do_what; + elem = document.getElementById(i_start); + if(elem.checked==true) + { + do_what = false; + } + else + { + do_what = true; + } + + for(var i = i_start; i <= i_end; i++) + { + if(document.getElementById(i)) // don't run out of index on last line + { + document.getElementById(i).checked = do_what; + } + } + } + </script> + +</div> \ No newline at end of file Property changes on: trunk/linpha2/templates/default/view_basket.html.php ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: trunk/linpha2/templates/default/view_comment.html.php (from rev 4442, trunk/linpha2/templates/html/default/view_comment.html.php) =================================================================== --- trunk/linpha2/templates/default/view_comment.html.php (rev 0) +++ trunk/linpha2/templates/default/view_comment.html.php 2006-03-29 12:23:37 UTC (rev 4446) @@ -0,0 +1,15 @@ +<div id="main"> +<form action="<?php echo $GLOBALS['linpha']->template->URL_full; ?>" method="POST"> +<a href="<?php echo $GLOBALS['linpha']->template->URL_full.'&view=thumb'; ?>">back</a> +<br /><br /> + +Author: +<input type="text" name="author" value="<?php echo $GLOBALS['linpha']->template->output['comment']['author']; ?>" size="40" maxlength="40" /> +<br /> +<textarea name="comment" rows="10" cols="50"><?php echo $GLOBALS['linpha']->template->output['comment']['comment']; ?></textarea> +<br /> +<input type="hidden" name="cmd" value="add_comment" /> +<input type="submit" name="submit" value="submit" /> + +</form> +</div> \ No newline at end of file Copied: trunk/linpha2/templates/default/view_img.html.php (from rev 4442, trunk/linpha2/templates/html/default/view_img.html.php) =================================================================== --- trunk/linpha2/templates/default/view_img.html.php (rev 0) +++ trunk/linpha2/templates/default/view_img.html.php 2006-03-29 12:23:37 UTC (rev 4446) @@ -0,0 +1,68 @@ +<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> + <?php echo $GLOBALS['linpha']->template->output['current_thumb']; ?> + <div class="div_all_nextthumb"> + <?php echo $GLOBALS['linpha']->template->output['next_thumb']; ?> + </div> +</div> + +<div id="main"> + +<!-- 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 } ?> + +</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 Copied: trunk/linpha2/templates/default/view_meta.head.php (from rev 4442, trunk/linpha2/templates/html/default/view_meta.head.php) =================================================================== --- trunk/linpha2/templates/default/view_meta.head.php (rev 0) +++ trunk/linpha2/templates/default/view_meta.head.php 2006-03-29 12:23:37 UTC (rev 4446) @@ -0,0 +1,6 @@ +<?php +/** + * 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 Copied: trunk/linpha2/templates/default/view_meta.html.php (from rev 4442, trunk/linpha2/templates/html/default/view_meta.html.php) =================================================================== --- trunk/linpha2/templates/default/view_meta.html.php (rev 0) +++ trunk/linpha2/templates/default/view_meta.html.php 2006-03-29 12:23:37 UTC (rev 4446) @@ -0,0 +1,85 @@ +<div class="div_all_main"> + <div class="div_all_prevthumb"> + <?php echo $GLOBALS['linpha']->template->output['prev_thumb']; ?> + </div> + <?php echo $GLOBALS['linpha']->template->output['current_thumb']; ?> + <div class="div_all_nextthumb"> + <?php echo $GLOBALS['linpha']->template->output['next_thumb']; ?> + </div> +</div> + +<div id="main"> +<a href="<?php echo $GLOBALS['linpha']->template->URL_full.'&view=img'; ?>">Back to normal view</a> +<h1><?php i18n("Edit Image Imformation"); ?></h1> +<?php +$query = $GLOBALS['linpha']->db->Execute("SELECT id, name, field_type FROM ".PREFIX."meta_fields " . + "WHERE flags = '5' OR flags = '7' ORDER by id"); +$num = $query->RecordCount(); +?> +<form action="<?php echo $GLOBALS['linpha']->template->URL_full; ?>" method="POST"> +<table border='1'> + <tr> + <td width="150"><b><?php i18n("Name"); ?></b></td> + <td width="200"><b><?php i18n("Value"); ?></b></td> + <td rowspan="<?php echo $num+1; ?>"><?php echo $GLOBALS['linpha']->template->output['image']; ?></td> + </tr> + <?php + while($data = $query->FetchRow()) + { + ?> + <tr> + <td><?php echo $data['name']; ?></td> + <td> + <?php + $meta_data = $GLOBALS['linpha']->db->GetRow("SELECT meta_data FROM ".PREFIX."meta_data " . + "WHERE md5sum = '".$GLOBALS['linpha']->imgview->md5sum."'" . + "AND field_id = '".$data['id']."'"); + + switch($data['field_type']) + { + case 1: + case 3: + if(isset($meta_data['meta_data'])) { + $value = $meta_data['meta_data']; + } else { + $value = ''; + } + echo '<input type="text" name="field['.$data['id'].']" value="'.$value.'" style="width: 200px;" maxlength="255"/>'; + break; + case 2: + if(isset($meta_data['meta_data'])) { + $array_pieces = explodeAndSlice(';',$meta_data['meta_data']); + } else { + $array_pieces = Array(); + } + ?> + <select name="field[<?php echo $data['id']; ?>][]" multiple="multiple" style="width: 200px;"> + <?php + $cat_query = $GLOBALS['linpha']->db->Execute("SELECT id, name FROM ".PREFIX."meta_category " . + "WHERE field_id = '".$data['id']."'"); + while($cat_data = $cat_query->FetchRow()) + { + if(in_array($cat_data['id'],$array_pieces)) { + $checked = ' selected="selected"'; + } else { + $checked = ''; + } + + echo '<option value="'.$cat_data['id'].'"'.$checked.'>'.$cat_data['name'].'</option>'."\n"; + } + ?> + </select> + <?php + break; + } + ?> + </td> + </tr> + <?php + } + ?> +</table> +<input type="hidden" name="cmd" value="insert_metadata" /> +<input type="submit" name="submit" value="submit" /> +</form> +</div> \ No newline at end of file Copied: trunk/linpha2/templates/default/view_thumb.head.php (from rev 4442, trunk/linpha2/templates/html/default/view_thumb.head.php) =================================================================== --- trunk/linpha2/templates/default/view_thumb.head.php (rev 0) +++ trunk/linpha2/templates/default/view_thumb.head.php 2006-03-29 12:23:37 UTC (rev 4446) @@ -0,0 +1,12 @@ +<?php if($GLOBALS['linpha']->imgview->use_javascript) { ?> +<script language="JavaScript" type="text/javascript"> +var tot_photos = <?php echo $GLOBALS['linpha']->imgview->tot_photos; ?>; +var startup_page = 1; +var link_get_thumb = '<?php echo LINPHA_DIR.'/get_thumb.php?id='; ?>'; +var link_url = '<?php echo convert_amp($GLOBALS['linpha']->template->URL_base); ?>'; +var tn_size = <?php echo $GLOBALS['def_tn_size']; ?>; +var photos_per_page = 'auto'; +<?php echo $GLOBALS['linpha']->template->output['files_db']."\n"; ?> +</script> +<script type="text/javascript" language="javascript" src="<?php echo LINPHA_DIR; ?>/lib/classes/thumbnails.js"> </script> +<?php } ?> \ No newline at end of file Property changes on: trunk/linpha2/templates/default/view_thumb.head.php ___________________________________________________________________ Name: svn:eol-style + native Copied: trunk/linpha2/templates/default/view_thumb.html.php (from rev 4442, trunk/linpha2/templates/html/default/view_thumb.html.php) =================================================================== --- trunk/linpha2/templates/default/view_thumb.html.php (rev 0) +++ trunk/linpha2/templates/default/view_thumb.html.php 2006-03-29 12:23:37 UTC (rev 4446) @@ -0,0 +1,105 @@ +<?php +/** + * javascript enabled + */ +if($GLOBALS['linpha']->imgview->use_javascript) +{ +?> + + <script language="JavaScript" type="text/javascript"> + window.onresize = display_images; + </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 } ?> + + <!-- + need an outer div for the correct height, because elements in #page_nr are floated + and doesn't count to the this elements height + --> + <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> + </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) + { + /** + * 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="./?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> +<?php +} +?> \ No newline at end of file Property changes on: trunk/linpha2/templates/default/view_thumb.html.php ___________________________________________________________________ Name: svn:eol-style + native Copied: trunk/linpha2/templates/default/view_thumbdetail.html.php (from rev 4442, trunk/linpha2/templates/html/default/view_thumbdetail.html.php) =================================================================== --- trunk/linpha2/templates/default/view_thumbdetail.html.php (rev 0) +++ trunk/linpha2/templates/default/view_thumbdetail.html.php 2006-03-29 12:23:37 UTC (rev 4446) @@ -0,0 +1,47 @@ +<div id="left"> +left<br />left<br />left<br />left<br />left<br />left<br /> +left<br />left<br />left<br />left<br />left<br />left<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 id="main"> + +<?php +foreach($GLOBALS['linpha']->imgview->photos_filtered AS $key=>$value) +{ + ?> + <div class='div_folder'> + <?php echo '<a href="'.LINPHA_DIR.'/?cat=alb&id='.$value['id'].'">' + . '<img class="img_folder_thumbnail" src="'. LINPHA_DIR.'/get_thumb.php?id=' .$value['id'] .'" /></a>'; ?> + + <div class='div_folder_text'> + <h2><?php echo $value['name']; ?></h2> + + <?php if($value['img_type']==0) { ?> + + <!-- folder view --> + <?php echo $value['stats_numbers'].' '.i18n("Photos"); ?> + <br /> + <?php echo strftime("%x %X",$value['time_add']); ?> + + <?php } else { ?> + + <!-- file view --> + <?php echo strftime("%x %X",$value['time_add']); ?> + + <?php } ?> + + + + </div> + </div> + <?php +} +?> +</div> \ No newline at end of file Deleted: trunk/linpha2/templates/html/default/basket.html.php =================================================================== --- trunk/linpha2/templates/html/default/basket.html.php 2006-03-29 12:22:45 UTC (rev 4445) +++ trunk/linpha2/templates/html/default/basket.html.php 2006-03-29 12:23:37 UTC (rev 4446) @@ -1,54 +0,0 @@ -<form name="basket" action="<?php echo $GLOBALS['linpha']->template->URL_full; ?>&cmd=remove_selected" method="POST"> -<div class='navigation'> -<a href="<?php echo LINPHA_DIR.'/?cat=alb&id='.$_GET['ref_id']; ?>"><?php echo i18n("Go Back"); ?></a> -<a href="<?php echo $GLOBALS['linpha']->template->URL_full; ?>&cmd=remove_all"><?php echo i18n("Remove all"); ?></a> -<input type="submit" name="submit" value="<?php echo i18n("Remove selected"); ?>" /> -<br /><br /> -<?php echo i18n("Images in basket");?>: <?php echo count($_SESSION['basket_ids']); ?> -</div> - -<div id="main"> - -<?php if( count($_SESSION['basket_ids']) > 0 ) { ?> - - <?php - foreach($GLOBALS['linpha']->template->output['basket_folders'] AS $value) - { - echo set_navigation_line($value).'<br />'; - $i = 1; - foreach($GLOBALS['linpha']->template->output['basket_folder_contents'][$value] AS $sub_value) - { - ?> - <div class='imgdiv'> - <a href='javascript:void(0)' onclick='update_checkbox(<?php echo $i; ?>)'><img src='<?php echo LINPHA_DIR.'/get_thumb.php?id='.$sub_value; ?>' class='img_thumbnail' /></a> - <br /> - <input type='checkbox' id='<?php echo $i; ?>' name='img_id[]' value='<?php echo $sub_value; ?>'> - </div> - <?php - $i++; - } - echo '<div style="clear: both;"></div><br /><br />'; - } - ?> - <script language="JavaScript" type='text/javascript'> - function update_checkbox(elem_id) - { - elem = document.getElementById(elem_id); - if(elem.checked==true) - { - elem.checked = false; - } - else - { - elem.checked = true; - } - } - </script> -<?php -} -else -{ - echo i18n("Empty Basket"); -} ?> -</div> -</form> \ No newline at end of file Deleted: trunk/linpha2/templates/html/default/global.html.php =================================================================== --- trunk/linpha2/templates/html/default/global.html.php 2006-03-29 12:22:45 UTC (rev 4445) +++ trunk/linpha2/templates/html/default/global.html.php 2006-03-29 12:23:37 UTC (rev 4446) @@ -1,100 +0,0 @@ -<?php -/** - * first output starts here - */ -?> -<?php /*header('Content-type: text/html; charset='.$html_charset);*/ ?> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> -<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 $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'> -<?php } ?> - -<?php $GLOBALS['linpha']->template->includeFile('head'); ?> -</head> - - - -<body> - -<?php if( isset($GLOBALS['linpha']->template->output['sys_log']) ) { ?> - <!-- syslog --> - <div id="sys_log"> - <div class="sys_log_close"><a href="javascript:toggleWindow()">X</a></div> - <div id="sys_log_text"> - <?php echo i18n("Linpha Syslog"); ?>:<br /> - <?php echo $GLOBALS['linpha']->template->output['sys_log']; ?> - </div> - </div> - <script type="text/javascript" language="javascript" src="<?php echo LINPHA_DIR; ?>/lib/classes/syslog.js"> </script> -<?php } ?> - -<!-- title/navigation --> -<div id="divtitle"> -<div id="title"> - <?php echo $GLOBALS['linpha']->template->linpha_title." :: ".$GLOBALS['linpha']->template->output['title']; ?> -</div> -</div> - -<!-- menu --> -<!-- -need an outer div for the correct height, because elements in #menu are floated -and doesn't count to the this elements height ---> -<div id="divmenu"> -<div id="menu"> - <ul> - <li><a href="./"><?php echo i18n("Home"); ?></a></li> - </ul> - <ul> - <li><a href="./admin/"><?php echo i18n("Admin"); ?></a></li> - </ul> - <ul> - <li><span><?php echo i18n("Search"); ?> v</span> - <ul> - <li><a href="./?cat=search"><?php echo i18n("Extended Search"); ?></a></li> - <li> - <span> - <input type="text" name="search" value="" /> - <input type="submit" name="submit" value="<?php echo i18n("Search"); ?>" /> - </span> - </li> - </ul> - </li> - </ul> - <ul> - <li> - <span><?php echo i18n("Login"); ?> v</span> - <ul> - <li> - <span> - <?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> - </li> - </ul> - </li> - </ul> - <?php - /** - * Print "More"-menu entry - */ - if( isset( $GLOBALS['linpha']->template->output['menu_more'] ) ) { - $GLOBALS['linpha']->template->printMenu('more'); - } - ?> -</div> -</div> -<!-- end menu --> - -<?php $GLOBALS['linpha']->template->includeFile('body'); ?> -</body> -</html> \ No newline at end of file Deleted: trunk/linpha2/templates/html/default/home.html.php =================================================================== --- trunk/linpha2/templates/html/default/home.html.php 2006-03-29 12:22:45 UTC (rev 4445) +++ trunk/linpha2/templates/html/default/home.html.php 2006-03-29 12:23:37 UTC (rev 4446) @@ -1,63 +0,0 @@ -<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"> - -<h1><?php echo i18n("Welcome"); ?></h1> -<br /><br /><br /> - -<hr /> - -<?php if( count($GLOBALS['linpha']->template->output['random_images']) > 0 ) { ?> - <h1><?php echo i18n("Random images"); ?></h1> - <div class='div_random'> - <?php - foreach($GLOBALS['linpha']->template->output['random_images'] AS $key=>$value) - { - ?> - <div class='div_random_img'> - <?php echo '<a href="'.LINPHA_DIR.'/?cat=alb&id='.$value['id'].'">' - . '<img class="img_random_thumbnail" title="'.htmlentities($value['path']).'" src="'. LINPHA_DIR.'/get_thumb.php?id=' .$value['id'] .'" alt="randomimage" /></a>'; ?> - </div> - <?php - } - ?> - </div> - - <hr /> -<?php } ?> - -<?php echo i18n("Browse by Date").': '.$GLOBALS['linpha']->template->output['browse_by_date']; ?><br /> -<hr /> - -<h1><?php echo i18n("Albums"); ?></h1> - -<?php -foreach($GLOBALS['linpha']->imgview->photos_filtered AS $key=>$value) -{ - ?> - <div class='div_folder'> - <?php echo '<a href="'.LINPHA_DIR.'/?cat=alb&id='.$value['id'].'">' - . '<img class="img_folder_thumbnail" src="'. LINPHA_DIR.'/get_thumb.php?id=' .$value['id'] .'" alt="thumbnail_album" /></a>'; ?> - - <div class='div_folder_text'> - <h2><?php echo $value['name']; ?></h2> - - <?php echo $value['stats_numbers'].' '.i18n("Photos"); ?> - - <br /> - <?php echo strftime("%x %X",$value['time_add']); ?> - - </div> - </div> - <?php -} -?> -</div> - - <div class="roundbottom"> - <img src="templates/html/images/bl.gif" alt="" width="15" height="15" class="corner" style="display: none" /> - </div> -</div> \ No newline at end of file Deleted: trunk/linpha2/templates/html/default/view_basket.html.php =================================================================== --- trunk/linpha2/templates/html/default/view_basket.html.php 2006-03-29 12:22:45 UTC (rev 4445) +++ trunk/linpha2/templates/html/default/view_basket.html.php 2006-03-29 12:23:37 UTC (rev 4446) @@ -1,119 +0,0 @@ -<div id="left"> -left<br />left<br />left<br />left<br />left<br />left<br /> -left<br />left<br />left<br />left<br />left<br />left<br /> -</div> - - -<div class="page_nr_main"> - <!-- cannot use floated div in another div !! - in this div it is possible because it has position: absolute --> - <div class='page_nr' id='page_nr_right'><?php echo $GLOBALS['linpha']->template->output['page_nr_right']; ?></div> - <div class='page_nr' id='page_nr' style="width: 350px; text-align: center;"><?php echo $GLOBALS['linpha']->template->output['page_nr']; ?></div> - <div class='page_nr' id='page_nr_left'><?php echo $GLOBALS['linpha']->template->output['page_nr_left']; ?></div> -</div> - -<div id="navigation"> - <?php echo $GLOBALS['linpha']->template->output['navigation']; ?> - <br /><br /> - <?php echo i18n("Images In Basket"); ?>: <?php echo count($_SESSION['basket_ids']); ?> - (<a href="<?php echo LINPHA_DIR.'?cat=basket&ref_id='.$GLOBALS['linpha']->imgview->id_current; ?>"><?php echo i18n("Open Basket"); ?></a>) - <br /> - <a href="<?php echo $GLOBALS['linpha']->template->URL_full.'&view=thumb'; ?>"><?php echo i18n("Back To Normal View"); ?></a> -</div> - -<form name='basket' action='<?php echo LINPHA_DIR.'/?cat=basket&cmd=add_selected&ref_id='.$GLOBALS['linpha']->imgview->id_current; ?>' method='POST'> -<div id="main"> - <?php - $i = 1; - foreach($GLOBALS['linpha']->imgview->photos_show AS $value) - { - /** - * add clear float to last div on row - */ - if( ($i-1) % $GLOBALS['no_js_nr_cols'] == 0) - { - echo "<div style='height: ".$GLOBALS['def_tn_size']."px; clear: left;' class='imgdiv'>"; - echo "<a href='javascript:void(0)' onclick='check_from_to(".$i.",".($i+$GLOBALS['no_js_nr_cols']-1).")'>Check row</a>"; - echo "</div>"; - } - ?> - <div style='width: <?php echo $GLOBALS['def_tn_size']; ?>px; height: <?php echo $GLOBALS['def_tn_size']; ?>px;' class='imgdiv'> - <a href='javascript:void(0)' onclick='update_checkbox(<?php echo $i; ?>)'><img height='<?php echo ($GLOBALS['def_tn_size']-20); ?>' src='./get_thumb.php?id=<?php echo $value['id']; ?>' class='img_thumbnail' /></a> - - <div class="img_text"> - <input type='checkbox' id='<?php echo $i; ?>' name='img_id[]' value='<?php echo $value['id']; ?>'> - <?php echo $value['name']; ?> - </div> - - </div> - - <?php - $i++; - } - ?> - <div style="clear: left;"></div> - <br /><br /> - <input type='button' name='button_check_all' value='check all of this page' onClick='this.value=check_all()'> - <input type='submit' value='add to basket'> - <a href="<?php echo LINPHA_DIR.'?cat=basket&ref_id='.$GLOBALS['linpha']->imgview->id_current.'&cmd=add_all'; ?>">add all of this folder to basket</a> - <script language="JavaScript" type='text/javascript'> - var checkflag = 0; - function check_all() { - if (checkflag == 0) // check all - { - checkflag = 1; - var return_value = "remove selection"; - } - else // clear all - { - checkflag = 0; - var return_value = "check all of this page"; - } - - for (var i = 0; i < document.forms[0].length; i++) - { - elem = document.forms[0].elements[i]; - if (elem.type == "checkbox") { - elem.checked = checkflag; - } - } - return return_value; - } - - function update_checkbox(elem_id) - { - elem = document.getElementById(elem_id); - if(elem.checked==true) - { - elem.checked = false; - } - else - { - elem.checked = true; - } - } - - function check_from_to(i_start,i_end) - { - var do_what; - elem = document.getElementById(i_start); - if(elem.checked==true) - { - do_what = false; - } - else - { - do_what = true; - } - - for(var i = i_start; i <= i_end; i++) - { - if(document.getElementById(i)) // don't run out of index on last line - { - document.getElementById(i).checked = do_what; - } - } - } - </script> - -</div> \ No newline at end of file Deleted: trunk/linpha2/templates/html/default/view_comment.html.php =================================================================== --- trunk/linpha2/templates/html/default/view_comment.html.php 2006-03-29 12:22:45 UTC (rev 4445) +++ trunk/linpha2/templates/html/default/view_comment.html.php 2006-03-29 12:23:37 UTC (rev 4446) @@ -1,15 +0,0 @@ -<div id="main"> -<form action="<?php echo $GLOBALS['linpha']->template->URL_full; ?>" method="POST"> -<a href="<?php echo $GLOBALS['linpha']->template->URL_full.'&view=thumb'; ?>">back</a> -<br /><br /> - -Author: -<input type="text" name="author" value="<?php echo $GLOBALS['linpha']->template->output['comment']['author']; ?>" size="40" maxlength="40" /> -<br /> -<textarea name="comment" rows="10" cols="50"><?php echo $GLOBALS['linpha']->template->output['comment']['comment']; ?></textarea> -<br /> -<input type="hidden" name="cmd" value="add_comment" /> -<input type="submit" name="submit" value="submit" /> - -</form> -</div> \ No newline at end of file Deleted: trunk/linpha2/templates/html/default/view_img.html.php =================================================================== --- trunk/linpha2/templates/html/default/view_img.html.php 2006-03-29 12:22:45 UTC (rev 4445) +++ trunk/linpha2/templates/html/default/view_img.html.php 2006-03-29 12:23:37 UTC (rev 4446) @@ -1,68 +0,0 @@ -<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> - <?php echo $GLOBALS['linpha']->template->output['current_thumb']; ?> - <div class="div_all_nextthumb"> - <?php echo $GLOBALS['linpha']->template->output['next_thumb']; ?> - </div> -</div> - -<div id="main"> - -<!-- 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 } ?> - -</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 Deleted: trunk/linpha2/templates/html/default/view_meta.head.php =================================================================== --- trunk/linpha2/templates/html/default/view_meta.head.php 2006-03-29 12:22:45 UTC (rev 4445) +++ trunk/linpha2/templates/html/default/view_meta.head.php 2006-03-29 12:23:37 UTC (rev 4446) @@ -1,6 +0,0 @@ -<?php -/** - * 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 Deleted: trunk/linpha2/templates/html/default/view_meta.html.php =================================================================== --- trunk/linpha2/templates/html/default/view_meta.html.php 2006-03-29 12:22:45 UTC (rev 4445) +++ trunk/linpha2/templates/html/default/view_meta.html.php 2006-03-29 12:23:37 UTC (rev 4446) @@ -1,85 +0,0 @@ -<div class="div_all_main"> - <div class="div_all_prevthumb"> - <?php echo $GLOBALS['linpha']->template->output['prev_thumb']; ?> - </div> - <?php echo $GLOBALS['linpha']->template->output['current_thumb']; ?> - <div class="div_all_nextthumb"> - <?php echo $GLOBALS['linpha']->template->output['next_thumb']; ?> - </div> -</div> - -<div id="main"> -<a href="<?php echo $GLOBALS['linpha']->template->URL_full.'&view=img'; ?>">Back to normal view</a> -<h1><?php i18n("Edit Image Imformation"); ?></h1> -<?php -$query = $GLOBALS['linpha']->db->Execute("SELECT id, name, field_type FROM ".PREFIX."meta_fields " . - "WHERE flags = '5' OR flags = '7' ORDER by id"); -$num = $query->RecordCount(); -?> -<form action="<?php echo $GLOBALS['linpha']->template->URL_full; ?>" method="POST"> -<table border='1'> - <tr> - <td width="150"><b><?php i18n("Name"); ?></b></td> - <td width="200"><b><?php i18n("Value"); ?></b></td> - <td rowspan="<?php echo $num+1; ?>"><?php echo $GLOBALS['linpha']->template->output['image']; ?></td> - </tr> - <?php - while($data = $query->FetchRow()) - { - ?> - <tr> - <td><?php echo $data['name']; ?></td> - <td> - <?php - $meta_data = $GLOBALS['linpha']->db->GetRow("SELECT meta_data FROM ".PREFIX."meta_data " . - "WHERE md5sum = '".$GLOBALS['linpha']->imgview->md5sum."'" . - "AND field_id = '".$data['id']."'"); - - switch($data['field_type']) - { - case 1: - case 3: - if(isset($meta_data['meta_data'])) { - $value = $meta_data['meta_data']; - } else { - $value = ''; - } - echo '<input type="text" name="field['.$data['id'].']" value="'.$value.'" style="width: 200px;" maxlength="255"/>'; - break; - case 2: - if(isset($meta_data['meta_data'])) { - $array_pieces = explodeAndSlice(';',$meta_data['meta_data']); - } else { - $array_pieces = Array(); - } - ?> - <select name="field[<?php echo $data['id']; ?>][]" multiple="multiple" style="width: 200px;"> - <?php - $cat_query = $GLOBALS['linpha']->db->Execute("SELECT id, name FROM ".PREFIX."meta_category " . - "WHERE field_id = '".$data['id']."'"); - while($cat_data = $cat_query->FetchRow()) - { - if(in_array($cat_data['id'],$array_pieces)) { - $checked = ' selected="selected"'; - } else { - $checked = ''; - } - - echo '<option value="'.$cat_data['id'].'"'.$checked.'>'.$cat_data['name'].'</option>'."\n"; - } - ?> - </select> - <?php - break; - } - ?> - </td> - </tr> - <?php - } - ?> -</table> -<input type="hidden" name="cmd" value="insert_metadata" /> -<input type="submit" name="submit" value="submit" /> -</form> -</div> \ No newline at end of file Deleted: trunk/linpha2/templates/html/default/view_thumb.head.php =================================================================== --- trunk/linpha2/templates/html/default/view_thumb.head.php 2006-03-29 12:22:45 UTC (rev 4445) +++ trunk/linpha2/templates/html/default/view_thumb.head.php 2006-03-29 12:23:37 UTC (rev 4446) @@ -1,12 +0,0 @@ -<?php if($GLOBALS['linpha']->imgview->use_javascript) { ?> -<script language="JavaScript" type="text/javascript"> -var tot_photos = <?php echo $GLOBALS['linpha']->imgview->tot_photos; ?>; -var startup_page = 1; -var link_get_thumb = '<?php echo LINPHA_DIR.'/get_thumb.php?id='; ?>'; -var link_url = '<?php echo convert_amp($GLOBALS['linpha']->template->URL_base); ?>'; -var tn_size = <?php echo $GLOBALS['def_tn_size']; ?>; -var photos_per_page = 'auto'; -<?php echo $GLOBALS['linpha']->template->output['files_db']."\n"; ?> -</script> -<script type="text/javascript" language="javascript" src="<?php echo LINPHA_DIR; ?>/lib/classes/thumbnails.js"> </script> -<?php } ?> \ No newline at end of file Deleted: trunk/linpha2/templates/html/default/view_thumb.html.php =================================================================== --- trunk/linpha2/templates/html/default/view_thumb.html.php 2006-03-29 12:22:45 UTC (rev 4445) +++ trunk/linpha2/templates/html/default/view_thumb.html.php 2006-03-29 12:23:37 UTC (rev 4446) @@ -1,105 +0,0 @@ -<?php -/** - * javascript enabled - */ -if($GLOBALS['linpha']->imgview->use_javascript) -{ -?> - - <script language="JavaScript" type="text/javascript"> - window.onresize = display_images; - </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 } ?> - - <!-- - need an outer div for the correct height, because elements in #page_nr are floated - and doesn't count to the this elements height - --> - <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> - </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) - { - /** - * 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="./?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> -<?php -} -?> \ No newline at end of file Deleted: trunk/linpha2/templates/html/default/view_thumbdetail.html.php =================================================================== --- trunk/linpha2/templates/html/default/view_thumbdetail.html.php 2006-03-29 12:22:45 UTC (rev 4445) +++ trunk/linpha2/templates/html/default/view_thumbdetail.html.php 2006-03-29 12:23:37 UTC (rev 4446) @@ -1,47 +0,0 @@ -<div id="left"> -left<br />left<br />left<br />left<br />left<br />left<br /> -left<br />left<br />left<br />left<br />left<br />left<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 id="main"> - -<?php -foreach($GLOBALS['linpha']->imgview->photos_filtered AS $key=>$value) -{ - ?> - <div class='div_folder'> - <?php echo '<a href="'.LINPHA_DIR.'/?cat=alb&id='.$value['id'].'">' - . '<img class="img_folder_thumbnail" src="'. LINPHA_DIR.'/get_thumb.php?id=' .$value['id'] .'" /></a>'; ?> - - <div class='div_folder_text'> - <h2><?php echo $value['name']; ?></h2> - - <?php if($value['img_type']==0) { ?> - - <!-- folder view --> - <?php echo $value['stats_numbers'].' '.i18n("Photos"); ?> - <br /> - <?php echo strftime("%x %X",$value['time_add']); ?> - - <?php } else { ?> - - <!-- file view --> - <?php echo strftime("%x %X",$value['time_add']); ?> - - <?php } ?> - - - - </div> - </div> - <?php -} -?> -</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. |
|
From: <fan...@us...> - 2006-10-02 19:10:51
|
Revision: 4568
http://svn.sourceforge.net/linpha/?rev=4568&view=rev
Author: fangehrn
Date: 2006-10-02 12:10:42 -0700 (Mon, 02 Oct 2006)
Log Message:
-----------
2006-10-02 flo
* working on an ajax image view... ;-)
Added Paths:
-----------
trunk/linpha2/templates/default/view_img_static.html.php
Removed Paths:
-------------
trunk/linpha2/templates/default/view_img.html.php
Deleted: trunk/linpha2/templates/default/view_img.html.php
===================================================================
--- trunk/linpha2/templates/default/view_img.html.php 2006-10-02 19:09:18 UTC (rev 4567)
+++ trunk/linpha2/templates/default/view_img.html.php 2006-10-02 19:10:42 UTC (rev 4568)
@@ -1,103 +0,0 @@
-<?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="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>
-
- <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="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">
- <?php if($_SESSION['mode_imageview']=='meta') { ?>
- <!-- edit meta data - include view_meta.html -->
- <?php include_once(LINPHA_DIR.'/templates/'.$GLOBALS['linpha']->template->template_name.'/view_meta.html.php');
- } else { ?>
-
- <!-- show image -->
- <?php echo $GLOBALS['linpha']->template->output['image']; ?>
- <br /><br />
-
- <!-- comments -->
- <?php if($GLOBALS['linpha']->sql->checkPermission('metadata_comments')) { ?>
- <!-- 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>
- <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>
-
- <br /><br />
- <?php } /* end if checkPermission('metadata_comments') */ ?>
-
- <!-- show image comments -->
- <?php while($data = $GLOBALS['linpha']->template->output['image_comments']->FetchRow()) { ?>
- <div class="comments">
- <?php echo $data['meta_time']; ?> <?php echo htmlspecialchars($data['meta_author'],ENT_QUOTES); ?>
- <br />
- <?php echo htmlspecialchars($data['meta_comment'],ENT_QUOTES); ?>
- <br /><br />
- </div>
- <?php } ?>
-
- <?php } /* end if view!=meta */ ?>
- </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="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
Copied: trunk/linpha2/templates/default/view_img_static.html.php (from rev 4565, trunk/linpha2/templates/default/view_img.html.php)
===================================================================
--- trunk/linpha2/templates/default/view_img_static.html.php (rev 0)
+++ trunk/linpha2/templates/default/view_img_static.html.php 2006-10-02 19:10:42 UTC (rev 4568)
@@ -0,0 +1,103 @@
+<?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="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>
+
+ <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="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">
+ <?php if($_SESSION['mode_imageview']=='meta') { ?>
+ <!-- edit meta data - include view_meta.html -->
+ <?php include_once(LINPHA_DIR.'/templates/'.$GLOBALS['linpha']->template->template_name.'/view_meta.html.php');
+ } else { ?>
+
+ <!-- show image -->
+ <?php echo $GLOBALS['linpha']->template->output['image']; ?>
+ <br /><br />
+
+ <!-- comments -->
+ <?php if($GLOBALS['linpha']->sql->checkPermission('metadata_comments')) { ?>
+ <!-- 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>
+ <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>
+
+ <br /><br />
+ <?php } /* end if checkPermission('metadata_comments') */ ?>
+
+ <!-- show image comments -->
+ <?php while($data = $GLOBALS['linpha']->template->output['image_comments']->FetchRow()) { ?>
+ <div class="comments">
+ <?php echo $data['meta_time']; ?> <?php echo htmlspecialchars($data['meta_author'],ENT_QUOTES); ?>
+ <br />
+ <?php echo htmlspecialchars($data['meta_comment'],ENT_QUOTES); ?>
+ <br /><br />
+ </div>
+ <?php } ?>
+
+ <?php } /* end if view!=meta */ ?>
+ </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="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.
|
|
From: <fan...@us...> - 2006-10-26 19:03:38
|
Revision: 4592
http://svn.sourceforge.net/linpha/?rev=4592&view=rev
Author: fangehrn
Date: 2006-10-26 12:03:25 -0700 (Thu, 26 Oct 2006)
Log Message:
-----------
Added Paths:
-----------
trunk/linpha2/templates/default/layouts/
trunk/linpha2/templates/default/layouts/default/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fan...@us...> - 2006-10-26 19:04:36
|
Revision: 4593
http://svn.sourceforge.net/linpha/?rev=4593&view=rev
Author: fangehrn
Date: 2006-10-26 12:04:25 -0700 (Thu, 26 Oct 2006)
Log Message:
-----------
working on thumbdetail view
Modified Paths:
--------------
trunk/linpha2/templates/default/css/view_thumb.css
trunk/linpha2/templates/default/css/view_thumbdetail.css
trunk/linpha2/templates/default/view_img.head.php
trunk/linpha2/templates/default/view_thumb.head.php
trunk/linpha2/templates/default/view_thumbdetail.html.php
Modified: trunk/linpha2/templates/default/css/view_thumb.css
===================================================================
--- trunk/linpha2/templates/default/css/view_thumb.css 2006-10-26 19:03:25 UTC (rev 4592)
+++ trunk/linpha2/templates/default/css/view_thumb.css 2006-10-26 19:04:25 UTC (rev 4593)
@@ -52,16 +52,18 @@
float: left;
font-size: 8pt;
}
- .divimg {
+ .divimg { /* inner div with thumbnail */
}
-
- .imgthumb { /* inner div with thumbnail */
+ .divimgdetail { /* in detail mode, additional to .divimg */
+ float: left;
+ }
+ .imgthumb { /* thumbnail */
border: 0;
}
.divtext { /* inner div with bottom or right text */
padding-left: 10px;
text-align: left;
- width: 150px;
+ width: 150px; /* hardcoded in LinThumbnails.js */
float: left;
}
Modified: trunk/linpha2/templates/default/css/view_thumbdetail.css
===================================================================
--- trunk/linpha2/templates/default/css/view_thumbdetail.css 2006-10-26 19:03:25 UTC (rev 4592)
+++ trunk/linpha2/templates/default/css/view_thumbdetail.css 2006-10-26 19:04:25 UTC (rev 4593)
@@ -1,3 +1,5 @@
+/* deprecated */
+
#navigation {
background-color: #d5fcf4;
padding: 0;
Modified: trunk/linpha2/templates/default/view_img.head.php
===================================================================
--- trunk/linpha2/templates/default/view_img.head.php 2006-10-26 19:03:25 UTC (rev 4592)
+++ trunk/linpha2/templates/default/view_img.head.php 2006-10-26 19:04:25 UTC (rev 4593)
@@ -3,8 +3,8 @@
var xmlUrl = '<?php echo convert_amp($GLOBALS['linpha']->template->URL_base); ?>';
var imageSrc = '<?php echo LINPHA_DIR.'/get_image.php?id='; ?>';
var thumbSrc = '<?php echo LINPHA_DIR.'/get_thumb.php?id='; ?>';
-var maxImageWidth = <?php echo $GLOBALS['linpha']->sql->config->value['sys_style_image_size']; ?>;
-var maxImageHeight = <?php echo $GLOBALS['linpha']->sql->config->value['sys_style_image_size']; ?>;
+var maxImageWidth = <?php echo $GLOBALS['linpha']->sql->config->value['sys_style_image_width']; ?>;
+var maxImageHeight = <?php echo $GLOBALS['linpha']->sql->config->value['sys_style_image_height']; ?>;
var startImgId = <?php echo $GLOBALS['linpha']->imgview->id_current; ?>;
var startImgHeight = <?php echo $GLOBALS['linpha']->imgview->img_height; ?>;
var firstImgId = <?php echo $GLOBALS['linpha']->imgview->photos_filtered[0]['id']; /* @todo needs updating on change of sort order */ ?>;
Modified: trunk/linpha2/templates/default/view_thumb.head.php
===================================================================
--- trunk/linpha2/templates/default/view_thumb.head.php 2006-10-26 19:03:25 UTC (rev 4592)
+++ trunk/linpha2/templates/default/view_thumb.head.php 2006-10-26 19:04:25 UTC (rev 4593)
@@ -11,3 +11,4 @@
<script type="text/javascript" language="javascript" src="<?php echo LINPHA_DIR; ?>/lib/js/scriptaculous.js?load=builder"></script>
<script type="text/javascript" language="javascript" src="<?php echo LINPHA_DIR; ?>/lib/js/LinThumbnails.js"></script>
+<script type="text/javascript" language="javascript" src="<?php echo LINPHA_DIR; ?>/lib/js/LinThumbnails.js"></script>
\ No newline at end of file
Modified: trunk/linpha2/templates/default/view_thumbdetail.html.php
===================================================================
--- trunk/linpha2/templates/default/view_thumbdetail.html.php 2006-10-26 19:03:25 UTC (rev 4592)
+++ trunk/linpha2/templates/default/view_thumbdetail.html.php 2006-10-26 19:04:25 UTC (rev 4593)
@@ -1,8 +1,8 @@
<?php
-
+/*
@todo not needed anymore
to be deleted
-
+*/
?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fan...@us...> - 2006-10-26 19:06:56
|
Revision: 4594
http://svn.sourceforge.net/linpha/?rev=4594&view=rev
Author: fangehrn
Date: 2006-10-26 12:06:14 -0700 (Thu, 26 Oct 2006)
Log Message:
-----------
moved css and images to layouts folder
Added Paths:
-----------
trunk/linpha2/templates/default/layouts/default/css/
trunk/linpha2/templates/default/layouts/default/css/basket.css
trunk/linpha2/templates/default/layouts/default/css/csshover.htc
trunk/linpha2/templates/default/layouts/default/css/filemanager.css
trunk/linpha2/templates/default/layouts/default/css/global.css
trunk/linpha2/templates/default/layouts/default/css/home.css
trunk/linpha2/templates/default/layouts/default/css/view_basket.css
trunk/linpha2/templates/default/layouts/default/css/view_img.css
trunk/linpha2/templates/default/layouts/default/css/view_thumb.css
trunk/linpha2/templates/default/layouts/default/css/view_thumbdetail.css
trunk/linpha2/templates/default/layouts/default/images/
trunk/linpha2/templates/default/layouts/default/images/bl.gif
trunk/linpha2/templates/default/layouts/default/images/br.gif
trunk/linpha2/templates/default/layouts/default/images/download.png
trunk/linpha2/templates/default/layouts/default/images/expand.gif
trunk/linpha2/templates/default/layouts/default/images/print.png
trunk/linpha2/templates/default/layouts/default/images/slideshow.png
trunk/linpha2/templates/default/layouts/default/images/tl.gif
trunk/linpha2/templates/default/layouts/default/images/tr.gif
Removed Paths:
-------------
trunk/linpha2/templates/default/css/
trunk/linpha2/templates/default/images/
trunk/linpha2/templates/default/layouts/default/css/basket.css
trunk/linpha2/templates/default/layouts/default/css/csshover.htc
trunk/linpha2/templates/default/layouts/default/css/filemanager.css
trunk/linpha2/templates/default/layouts/default/css/global.css
trunk/linpha2/templates/default/layouts/default/css/home.css
trunk/linpha2/templates/default/layouts/default/css/view_basket.css
trunk/linpha2/templates/default/layouts/default/css/view_img.css
trunk/linpha2/templates/default/layouts/default/css/view_thumb.css
trunk/linpha2/templates/default/layouts/default/css/view_thumbdetail.css
trunk/linpha2/templates/default/layouts/default/images/bl.gif
trunk/linpha2/templates/default/layouts/default/images/br.gif
trunk/linpha2/templates/default/layouts/default/images/download.png
trunk/linpha2/templates/default/layouts/default/images/expand.gif
trunk/linpha2/templates/default/layouts/default/images/print.png
trunk/linpha2/templates/default/layouts/default/images/slideshow.png
trunk/linpha2/templates/default/layouts/default/images/tl.gif
trunk/linpha2/templates/default/layouts/default/images/tr.gif
Copied: trunk/linpha2/templates/default/layouts/default/css (from rev 4590, trunk/linpha2/templates/default/css)
Deleted: trunk/linpha2/templates/default/layouts/default/css/basket.css
===================================================================
--- trunk/linpha2/templates/default/css/basket.css 2006-10-25 19:48:04 UTC (rev 4590)
+++ trunk/linpha2/templates/default/layouts/default/css/basket.css 2006-10-26 19:06:14 UTC (rev 4594)
@@ -1,18 +0,0 @@
-#main {
- margin-left: 10px;
-}
-
-.imgdiv {
- border: 1px #000000 solid;
- margin: 3px;
- text-align: center;
- float: left;
- width: 150px;
- height: 150px;
-}
-
-.img_thumbnail {
- border: 0;
- width: auto;
- height: 130px;
-}
\ No newline at end of file
Copied: trunk/linpha2/templates/default/layouts/default/css/basket.css (from rev 4593, trunk/linpha2/templates/default/css/basket.css)
===================================================================
--- trunk/linpha2/templates/default/layouts/default/css/basket.css (rev 0)
+++ trunk/linpha2/templates/default/layouts/default/css/basket.css 2006-10-26 19:06:14 UTC (rev 4594)
@@ -0,0 +1,18 @@
+#main {
+ margin-left: 10px;
+}
+
+.imgdiv {
+ border: 1px #000000 solid;
+ margin: 3px;
+ text-align: center;
+ float: left;
+ width: 150px;
+ height: 150px;
+}
+
+.img_thumbnail {
+ border: 0;
+ width: auto;
+ height: 130px;
+}
\ No newline at end of file
Deleted: trunk/linpha2/templates/default/layouts/default/css/csshover.htc
===================================================================
--- trunk/linpha2/templates/default/css/csshover.htc 2006-10-25 19:48:04 UTC (rev 4590)
+++ trunk/linpha2/templates/default/layouts/default/css/csshover.htc 2006-10-26 19:06:14 UTC (rev 4594)
@@ -1,115 +0,0 @@
-<attach event="ondocumentready" handler="parseStylesheets" />
-<script>
-/**
- * Whatever:hover - V1.41.050927 - hover & active
- * ------------------------------------------------------------
- * (c) 2005 - Peter Nederlof
- * Peterned - http://www.xs4all.nl/~peterned/
- * License - http://creativecommons.org/licenses/LGPL/2.1/
- *
- * Whatever:hover is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Whatever:hover is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * Credits and thanks to:
- * Arnoud Berendsen, Martin Reurings, Robert Hanson
- *
- * howto: body { behavior:url("csshover.htc"); }
- * ------------------------------------------------------------
- */
-
-var csshoverReg = /(^|\s)(([^a]([^ ]+)?)|(a([^#.][^ ]+)+)):(hover|active)/i,
-currentSheet, doc = window.document, hoverEvents = [], activators = {
- onhover:{on:'onmouseover', off:'onmouseout'},
- onactive:{on:'onmousedown', off:'onmouseup'}
-}
-
-function parseStylesheets() {
- if(!/MSIE (5|6)/.test(navigator.userAgent)) return;
- window.attachEvent('onunload', unhookHoverEvents);
- var sheets = doc.styleSheets, l = sheets.length;
- for(var i=0; i<l; i++)
- parseStylesheet(sheets[i]);
-}
- function parseStylesheet(sheet) {
- if(sheet.imports) {
- try {
- var imports = sheet.imports, l = imports.length;
- for(var i=0; i<l; i++) parseStylesheet(sheet.imports[i]);
- } catch(securityException){}
- }
-
- try {
- var rules = (currentSheet = sheet).rules, l = rules.length;
- for(var j=0; j<l; j++) parseCSSRule(rules[j]);
- } catch(securityException){}
- }
-
- function parseCSSRule(rule) {
- var select = rule.selectorText, style = rule.style.cssText;
- if(!csshoverReg.test(select) || !style) return;
-
- var pseudo = select.replace(/[^:]+:([a-z-]+).*/i, 'on$1');
- var newSelect = select.replace(/(\.([a-z0-9_-]+):[a-z]+)|(:[a-z]+)/gi, '.$2' + pseudo);
- var className = (/\.([a-z0-9_-]*on(hover|active))/i).exec(newSelect)[1];
- var affected = select.replace(/:(hover|active).*$/, '');
- var elements = getElementsBySelect(affected);
- if(elements.length == 0) return;
-
- currentSheet.addRule(newSelect, style);
- for(var i=0; i<elements.length; i++)
- new HoverElement(elements[i], className, activators[pseudo]);
- }
-
-function HoverElement(node, className, events) {
- if(!node.hovers) node.hovers = {};
- if(node.hovers[className]) return;
- node.hovers[className] = true;
- hookHoverEvent(node, events.on, function() { node.className += ' ' + className; });
- hookHoverEvent(node, events.off, function() { node.className = node.className.replace(new RegExp('\\s+'+className, 'g'),''); });
-}
- function hookHoverEvent(node, type, handler) {
- node.attachEvent(type, handler);
- hoverEvents[hoverEvents.length] = {
- node:node, type:type, handler:handler
- };
- }
-
- function unhookHoverEvents() {
- for(var e,i=0; i<hoverEvents.length; i++) {
- e = hoverEvents[i];
- e.node.detachEvent(e.type, e.handler);
- }
- }
-
-function getElementsBySelect(rule) {
- var parts, nodes = [doc];
- parts = rule.split(' ');
- for(var i=0; i<parts.length; i++) {
- nodes = getSelectedNodes(parts[i], nodes);
- } return nodes;
-}
- function getSelectedNodes(select, elements) {
- var result, node, nodes = [];
- var identify = (/\#([a-z0-9_-]+)/i).exec(select);
- if(identify) return [doc.getElementById(identify[1])];
-
- var classname = (/\.([a-z0-9_-]+)/i).exec(select);
- var tagName = select.replace(/(\.|\#|\:)[a-z0-9_-]+/i, '');
- var classReg = classname? new RegExp('\\b' + classname[1] + '\\b'):false;
- for(var i=0; i<elements.length; i++) {
- result = tagName? elements[i].all.tags(tagName):elements[i].all;
- for(var j=0; j<result.length; j++) {
- node = result[j];
- if(classReg && !classReg.test(node.className)) continue;
- nodes[nodes.length] = node;
- }
- } return nodes;
- }
-</script>
\ No newline at end of file
Copied: trunk/linpha2/templates/default/layouts/default/css/csshover.htc (from rev 4593, trunk/linpha2/templates/default/css/csshover.htc)
===================================================================
--- trunk/linpha2/templates/default/layouts/default/css/csshover.htc (rev 0)
+++ trunk/linpha2/templates/default/layouts/default/css/csshover.htc 2006-10-26 19:06:14 UTC (rev 4594)
@@ -0,0 +1,115 @@
+<attach event="ondocumentready" handler="parseStylesheets" />
+<script>
+/**
+ * Whatever:hover - V1.41.050927 - hover & active
+ * ------------------------------------------------------------
+ * (c) 2005 - Peter Nederlof
+ * Peterned - http://www.xs4all.nl/~peterned/
+ * License - http://creativecommons.org/licenses/LGPL/2.1/
+ *
+ * Whatever:hover is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Whatever:hover is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * Credits and thanks to:
+ * Arnoud Berendsen, Martin Reurings, Robert Hanson
+ *
+ * howto: body { behavior:url("csshover.htc"); }
+ * ------------------------------------------------------------
+ */
+
+var csshoverReg = /(^|\s)(([^a]([^ ]+)?)|(a([^#.][^ ]+)+)):(hover|active)/i,
+currentSheet, doc = window.document, hoverEvents = [], activators = {
+ onhover:{on:'onmouseover', off:'onmouseout'},
+ onactive:{on:'onmousedown', off:'onmouseup'}
+}
+
+function parseStylesheets() {
+ if(!/MSIE (5|6)/.test(navigator.userAgent)) return;
+ window.attachEvent('onunload', unhookHoverEvents);
+ var sheets = doc.styleSheets, l = sheets.length;
+ for(var i=0; i<l; i++)
+ parseStylesheet(sheets[i]);
+}
+ function parseStylesheet(sheet) {
+ if(sheet.imports) {
+ try {
+ var imports = sheet.imports, l = imports.length;
+ for(var i=0; i<l; i++) parseStylesheet(sheet.imports[i]);
+ } catch(securityException){}
+ }
+
+ try {
+ var rules = (currentSheet = sheet).rules, l = rules.length;
+ for(var j=0; j<l; j++) parseCSSRule(rules[j]);
+ } catch(securityException){}
+ }
+
+ function parseCSSRule(rule) {
+ var select = rule.selectorText, style = rule.style.cssText;
+ if(!csshoverReg.test(select) || !style) return;
+
+ var pseudo = select.replace(/[^:]+:([a-z-]+).*/i, 'on$1');
+ var newSelect = select.replace(/(\.([a-z0-9_-]+):[a-z]+)|(:[a-z]+)/gi, '.$2' + pseudo);
+ var className = (/\.([a-z0-9_-]*on(hover|active))/i).exec(newSelect)[1];
+ var affected = select.replace(/:(hover|active).*$/, '');
+ var elements = getElementsBySelect(affected);
+ if(elements.length == 0) return;
+
+ currentSheet.addRule(newSelect, style);
+ for(var i=0; i<elements.length; i++)
+ new HoverElement(elements[i], className, activators[pseudo]);
+ }
+
+function HoverElement(node, className, events) {
+ if(!node.hovers) node.hovers = {};
+ if(node.hovers[className]) return;
+ node.hovers[className] = true;
+ hookHoverEvent(node, events.on, function() { node.className += ' ' + className; });
+ hookHoverEvent(node, events.off, function() { node.className = node.className.replace(new RegExp('\\s+'+className, 'g'),''); });
+}
+ function hookHoverEvent(node, type, handler) {
+ node.attachEvent(type, handler);
+ hoverEvents[hoverEvents.length] = {
+ node:node, type:type, handler:handler
+ };
+ }
+
+ function unhookHoverEvents() {
+ for(var e,i=0; i<hoverEvents.length; i++) {
+ e = hoverEvents[i];
+ e.node.detachEvent(e.type, e.handler);
+ }
+ }
+
+function getElementsBySelect(rule) {
+ var parts, nodes = [doc];
+ parts = rule.split(' ');
+ for(var i=0; i<parts.length; i++) {
+ nodes = getSelectedNodes(parts[i], nodes);
+ } return nodes;
+}
+ function getSelectedNodes(select, elements) {
+ var result, node, nodes = [];
+ var identify = (/\#([a-z0-9_-]+)/i).exec(select);
+ if(identify) return [doc.getElementById(identify[1])];
+
+ var classname = (/\.([a-z0-9_-]+)/i).exec(select);
+ var tagName = select.replace(/(\.|\#|\:)[a-z0-9_-]+/i, '');
+ var classReg = classname? new RegExp('\\b' + classname[1] + '\\b'):false;
+ for(var i=0; i<elements.length; i++) {
+ result = tagName? elements[i].all.tags(tagName):elements[i].all;
+ for(var j=0; j<result.length; j++) {
+ node = result[j];
+ if(classReg && !classReg.test(node.className)) continue;
+ nodes[nodes.length] = node;
+ }
+ } return nodes;
+ }
+</script>
\ No newline at end of file
Deleted: trunk/linpha2/templates/default/layouts/default/css/filemanager.css
===================================================================
--- trunk/linpha2/templates/default/css/filemanager.css 2006-10-25 19:48:04 UTC (rev 4590)
+++ trunk/linpha2/templates/default/layouts/default/css/filemanager.css 2006-10-26 19:06:14 UTC (rev 4594)
@@ -1,10 +0,0 @@
-#filemanager table
-{
- border-collapse:collapse;
-}
-
-#filemanager td
-{
- border:1px solid black;
- padding:5px;
-}
\ No newline at end of file
Copied: trunk/linpha2/templates/default/layouts/default/css/filemanager.css (from rev 4593, trunk/linpha2/templates/default/css/filemanager.css)
===================================================================
--- trunk/linpha2/templates/default/layouts/default/css/filemanager.css (rev 0)
+++ trunk/linpha2/templates/default/layouts/default/css/filemanager.css 2006-10-26 19:06:14 UTC (rev 4594)
@@ -0,0 +1,10 @@
+#filemanager table
+{
+ border-collapse:collapse;
+}
+
+#filemanager td
+{
+ border:1px solid black;
+ padding:5px;
+}
\ No newline at end of file
Deleted: trunk/linpha2/templates/default/layouts/default/css/global.css
===================================================================
--- trunk/linpha2/templates/default/css/global.css 2006-10-25 19:48:04 UTC (rev 4590)
+++ trunk/linpha2/templates/default/layouts/default/css/global.css 2006-10-26 19:06:14 UTC (rev 4594)
@@ -1,338 +0,0 @@
-<!--
-/**
- * common definitions
- */
- body {
- font-family: arial, helvetica, sans-serif;
- margin: 0px;
- padding: 0px;
- }
-
- a:link {
- color: #666666;
- text-decoration: underline;
- }
- a:visited {
- color:#666666;
- text-decoration: underline;
- }
- a:hover {
- color:#0080D0;
- text-decoration: underline;
- }
-
- /**
- * background color
- * #divthumbnavi amd #divSlideshowControls used in view_img.html.php
- */
- #divleft, #divmain, #divright, #divthumbnavi, #divnavigation, #divSlideshowControlsInner, .roundAlphabottomInner {
- background-color: #f90;
- }
-
- /**
- * link button
- */
- .button, a.button {
- cursor: pointer;
- border: 1px solid #000000;
- background-color: #9ACD32;
- color: #000000;
- padding: 5px;
- text-decoration: none;
- font-size: 10pt;
- }
- a.button { /* adjust height to same as html element button, it works at least in firefox */
- padding: 6px;
- padding-bottom: 7px;
- }
-
- .button:visited, a.button:visited {
- color: #000000;
- }
- .button:hover, a.button:hover {
- color: #00FF00;
- }
-
-
-/**
- * title
- */
- #title
- {
- margin-top: 10px;
- margin-bottom: 20px;
- margin-left: 100px;
-
- font-size: 25pt;
- }
- #title a:link, #title a:visited, #title a:hover
- {
- color: #444444;
- text-decoration: none;
- }
- #title a:hover
- {
- text-decoration: underline;
- }
-
-/**
- * left
- */
- #divleft
- {
- position: absolute;
- top: 120px;
- left: 10px;
- }
- #left
- {
- width: 205px;
-
- padding: 5px;
- margin: 0px;
- }
-
-/**
- * navigation
- */
- #divnavigation {
- margin: 0px 10px 10px 10px;
- }
- #navigation
- {
- padding: 5px;
- }
-
-/**
- * main
- */
- #divmain {
- margin: 0px 10px 10px 10px;
- padding: 0px;
- }
- #main {
- padding: 5px;
- }
-
-/**
- * right
- *
- * @todo not used anymore, but in static view..
- */
- #divright
- {
- margin: 10px 10px 10px 10px;
- }
- #right
- {
- padding: 5px;
- margin: 0px;
- }
-
-/**
- * syslog
- */
- #divSysLog {
- position: absolute;
- left: 15px;
- top: 15px;
- width: auto;
-
- z-index: 10;
-
- padding: 5px;
-
- border: 1px solid #FFD500;
- background-color: #FFFF81;
- }
-
- #divSyslogClose {
- position: absolute;
- right: 0;
- top: 0;
- z-index: 10;
-
- background-color: #ffd5ee;
- border: 1px solid #f09;
- }
-
-
-/**
- * menu
- */
- #menu {
- margin-left: 50px;
- }
-
- /**
- * icons
- */
- #menu div {
- margin: 0;
- margin-left: 5px;
- margin-right: 5px;
- padding: 0;
- float: left;
- }
-
- /**
- * hover
- */
- #menu a:hover, #menu span:hover {
- background: #bbbbbb;
- }
-
- /**
- * first level elements
- */
- #menu ul {
- list-style: none;
- margin: 0;
- margin-left: 5px;
- margin-right: 5px;
- padding: 0;
- float: left;
- white-space: nowrap;
-
- border-top: 1px solid #000000;
- }
-
- /**
- * first level elements
- */
- #menu ul a, #menu ul span {
- display: block;
-
- margin: 0;
- padding-left: 10px;
- padding-right: 10px;
- padding-top: 2px;
- padding-bottom: 2px;
-
- text-align: center;
- text-decoration: none;
-
- color: #000000;
- background: #FFFFFF;
- }
-
- /**
- * only two or more level elements
- */
- #menu ul ul {
- position: absolute;
- z-index: 500;
-
- /**
- * relativ to parent element! be careful
- */
- font-size: 1em;
- margin: 0;
- padding: 0;
- }
- #menu ul ul a, #menu ul ul span, #menu ul ul div {
- display: block;
-
- margin: 0;
- padding-left: 5px;
- padding-right: 5px;
- padding-top: 2px;
- padding-bottom: 2px;
-
- text-align: left;
- text-decoration: none;
-
- border: 1px solid #000000;
- border-top-width: 0px;
- 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
- * enable/disable submenus
- */
- #menu li {
- position: relative;
- }
-
- div#menu ul ul,
- div#menu ul li:hover ul ul,
- div#menu ul ul li:hover ul ul
- {
- display: none;
- }
- div#menu ul li:hover ul,
- div#menu ul ul li:hover ul,
- div#menu ul ul ul li:hover ul
- {
- display: block;
- }
-
- /**
- * third stage, switch to horizontal menu entries
- */
- #menu ul ul ul {
- position: absolute;
- top: 0;
- left: 100%;
- }
-/**
- * end menu
- */
-
-
-/**
- * rounded corner stuff
- */
- .roundtop {
- background: url(../images/tr.gif) no-repeat top right;
- }
-
- .roundbottom {
- background: url(../images/br.gif) no-repeat top right;
- }
-
- img.corner {
- width: 15px;
- height: 15px;
- border: none;
- display: block !important;
- }
-
- .roundAlphatop {
- position: relative;
- background: url(../images/tr_alpha.gif) no-repeat top right;
- }
-
- .roundAlphabottom {
- position: relative;
- background: url(../images/br_alpha.gif) no-repeat top right;
- }
-
-
- .roundAlphabottomInner {
- margin: 0px;
- padding: 0px;
- margin-left: 15px;
- margin-right: 15px;
- height: 15px;
- }
-
- img.AlphaCorner {
- position: absolute;
- top: 0px;
- left: 0px;
- width: 15px;
- height: 15px;
- border: none;
- display: block !important;
- }
-
--->
\ No newline at end of file
Copied: trunk/linpha2/templates/default/layouts/default/css/global.css (from rev 4593, trunk/linpha2/templates/default/css/global.css)
===================================================================
--- trunk/linpha2/templates/default/layouts/default/css/global.css (rev 0)
+++ trunk/linpha2/templates/default/layouts/default/css/global.css 2006-10-26 19:06:14 UTC (rev 4594)
@@ -0,0 +1,338 @@
+<!--
+/**
+ * common definitions
+ */
+ body {
+ font-family: arial, helvetica, sans-serif;
+ margin: 0px;
+ padding: 0px;
+ }
+
+ a:link {
+ color: #666666;
+ text-decoration: underline;
+ }
+ a:visited {
+ color:#666666;
+ text-decoration: underline;
+ }
+ a:hover {
+ color:#0080D0;
+ text-decoration: underline;
+ }
+
+ /**
+ * background color
+ * #divthumbnavi amd #divSlideshowControls used in view_img.html.php
+ */
+ #divleft, #divmain, #divright, #divthumbnavi, #divnavigation, #divSlideshowControlsInner, .roundAlphabottomInner {
+ background-color: #f90;
+ }
+
+ /**
+ * link button
+ */
+ .button, a.button {
+ cursor: pointer;
+ border: 1px solid #000000;
+ background-color: #9ACD32;
+ color: #000000;
+ padding: 5px;
+ text-decoration: none;
+ font-size: 10pt;
+ }
+ a.button { /* adjust height to same as html element button, it works at least in firefox */
+ padding: 6px;
+ padding-bottom: 7px;
+ }
+
+ .button:visited, a.button:visited {
+ color: #000000;
+ }
+ .button:hover, a.button:hover {
+ color: #00FF00;
+ }
+
+
+/**
+ * title
+ */
+ #title
+ {
+ margin-top: 10px;
+ margin-bottom: 20px;
+ margin-left: 100px;
+
+ font-size: 25pt;
+ }
+ #title a:link, #title a:visited, #title a:hover
+ {
+ color: #444444;
+ text-decoration: none;
+ }
+ #title a:hover
+ {
+ text-decoration: underline;
+ }
+
+/**
+ * left
+ */
+ #divleft
+ {
+ position: absolute;
+ top: 120px;
+ left: 10px;
+ }
+ #left
+ {
+ width: 205px;
+
+ padding: 5px;
+ margin: 0px;
+ }
+
+/**
+ * navigation
+ */
+ #divnavigation {
+ margin: 0px 10px 10px 10px;
+ }
+ #navigation
+ {
+ padding: 5px;
+ }
+
+/**
+ * main
+ */
+ #divmain {
+ margin: 0px 10px 10px 10px;
+ padding: 0px;
+ }
+ #main {
+ padding: 5px;
+ }
+
+/**
+ * right
+ *
+ * @todo not used anymore, but in static view..
+ */
+ #divright
+ {
+ margin: 10px 10px 10px 10px;
+ }
+ #right
+ {
+ padding: 5px;
+ margin: 0px;
+ }
+
+/**
+ * syslog
+ */
+ #divSysLog {
+ position: absolute;
+ left: 15px;
+ top: 15px;
+ width: auto;
+
+ z-index: 10;
+
+ padding: 5px;
+
+ border: 1px solid #FFD500;
+ background-color: #FFFF81;
+ }
+
+ #divSyslogClose {
+ position: absolute;
+ right: 0;
+ top: 0;
+ z-index: 10;
+
+ background-color: #ffd5ee;
+ border: 1px solid #f09;
+ }
+
+
+/**
+ * menu
+ */
+ #menu {
+ margin-left: 50px;
+ }
+
+ /**
+ * icons
+ */
+ #menu div {
+ margin: 0;
+ margin-left: 5px;
+ margin-right: 5px;
+ padding: 0;
+ float: left;
+ }
+
+ /**
+ * hover
+ */
+ #menu a:hover, #menu span:hover {
+ background: #bbbbbb;
+ }
+
+ /**
+ * first level elements
+ */
+ #menu ul {
+ list-style: none;
+ margin: 0;
+ margin-left: 5px;
+ margin-right: 5px;
+ padding: 0;
+ float: left;
+ white-space: nowrap;
+
+ border-top: 1px solid #000000;
+ }
+
+ /**
+ * first level elements
+ */
+ #menu ul a, #menu ul span {
+ display: block;
+
+ margin: 0;
+ padding-left: 10px;
+ padding-right: 10px;
+ padding-top: 2px;
+ padding-bottom: 2px;
+
+ text-align: center;
+ text-decoration: none;
+
+ color: #000000;
+ background: #FFFFFF;
+ }
+
+ /**
+ * only two or more level elements
+ */
+ #menu ul ul {
+ position: absolute;
+ z-index: 500;
+
+ /**
+ * relativ to parent element! be careful
+ */
+ font-size: 1em;
+ margin: 0;
+ padding: 0;
+ }
+ #menu ul ul a, #menu ul ul span, #menu ul ul div {
+ display: block;
+
+ margin: 0;
+ padding-left: 5px;
+ padding-right: 5px;
+ padding-top: 2px;
+ padding-bottom: 2px;
+
+ text-align: left;
+ text-decoration: none;
+
+ border: 1px solid #000000;
+ border-top-width: 0px;
+ 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
+ * enable/disable submenus
+ */
+ #menu li {
+ position: relative;
+ }
+
+ div#menu ul ul,
+ div#menu ul li:hover ul ul,
+ div#menu ul ul li:hover ul ul
+ {
+ display: none;
+ }
+ div#menu ul li:hover ul,
+ div#menu ul ul li:hover ul,
+ div#menu ul ul ul li:hover ul
+ {
+ display: block;
+ }
+
+ /**
+ * third stage, switch to horizontal menu entries
+ */
+ #menu ul ul ul {
+ position: absolute;
+ top: 0;
+ left: 100%;
+ }
+/**
+ * end menu
+ */
+
+
+/**
+ * rounded corner stuff
+ */
+ .roundtop {
+ background: url(../images/tr.gif) no-repeat top right;
+ }
+
+ .roundbottom {
+ background: url(../images/br.gif) no-repeat top right;
+ }
+
+ img.corner {
+ width: 15px;
+ height: 15px;
+ border: none;
+ display: block !important;
+ }
+
+ .roundAlphatop {
+ position: relative;
+ background: url(../images/tr_alpha.gif) no-repeat top right;
+ }
+
+ .roundAlphabottom {
+ position: relative;
+ background: url(../images/br_alpha.gif) no-repeat top right;
+ }
+
+
+ .roundAlphabottomInner {
+ margin: 0px;
+ padding: 0px;
+ margin-left: 15px;
+ margin-right: 15px;
+ height: 15px;
+ }
+
+ img.AlphaCorner {
+ position: absolute;
+ top: 0px;
+ left: 0px;
+ width: 15px;
+ height: 15px;
+ border: none;
+ display: block !important;
+ }
+
+-->
\ No newline at end of file
Deleted: trunk/linpha2/templates/default/layouts/default/css/home.css
===================================================================
--- trunk/linpha2/templates/default/css/home.css 2006-10-25 19:48:04 UTC (rev 4590)
+++ trunk/linpha2/templates/default/layouts/default/css/home.css 2006-10-26 19:06:14 UTC (rev 4594)
@@ -1,67 +0,0 @@
-#main {
- margin-left: 10px;
-}
-
-
-
-h1 {
- font-size: 18pt;
- font-family: Verdana, Arial, Helvetica, sans-serif;
-}
-
-h2 {
- font-size: 14pt;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- margin-top: 2px;
- margin-bottom: 7px;
-}
-
-hr {
- clear: both;
-}
-
-.div_random {
-
-}
-.div_random_img, .div_new_img {
- float: left;
- margin-left: 40px;
-}
-
-.img_random_thumbnail, .img_new_thumbnail {
- border: 0;
-
- width: 130px;
- height: 130px;
-}
-
-.div_folder {
- position: relative;
- margin: 2px;
- margin-left: 15px;
- margin-bottom: 15px;
- padding: 5px;
-
- height: 151px;
- width: 700px;
-
- background-color: #d5fcf4;
- border: 1px solid #0c9;
-}
-
-.div_folder_text {
- margin-left: 180px;
- height: 140px;
- padding: 5px;
-}
-
-.img_folder_thumbnail {
- position: absolute;
- top: 15px;
- left: 20px;
-
- width: 130px;
- height: 130px;
-
- border: 0;
-}
\ No newline at end of file
Copied: trunk/linpha2/templates/default/layouts/default/css/home.css (from rev 4593, trunk/linpha2/templates/default/css/home.css)
===================================================================
--- trunk/linpha2/templates/default/layouts/default/css/home.css (rev 0)
+++ trunk/linpha2/templates/default/layouts/default/css/home.css 2006-10-26 19:06:14 UTC (rev 4594)
@@ -0,0 +1,67 @@
+#main {
+ margin-left: 10px;
+}
+
+
+
+h1 {
+ font-size: 18pt;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+}
+
+h2 {
+ font-size: 14pt;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ margin-top: 2px;
+ margin-bottom: 7px;
+}
+
+hr {
+ clear: both;
+}
+
+.div_random {
+
+}
+.div_random_img, .div_new_img {
+ float: left;
+ margin-left: 40px;
+}
+
+.img_random_thumbnail, .img_new_thumbnail {
+ border: 0;
+
+ width: 130px;
+ height: 130px;
+}
+
+.div_folder {
+ position: relative;
+ margin: 2px;
+ margin-left: 15px;
+ margin-bottom: 15px;
+ padding: 5px;
+
+ height: 151px;
+ width: 700px;
+
+ background-color: #d5fcf4;
+ border: 1px solid #0c9;
+}
+
+.div_folder_text {
+ margin-left: 180px;
+ height: 140px;
+ padding: 5px;
+}
+
+.img_folder_thumbnail {
+ position: absolute;
+ top: 15px;
+ left: 20px;
+
+ width: 130px;
+ height: 130px;
+
+ border: 0;
+}
\ No newline at end of file
Deleted: trunk/linpha2/templates/default/layouts/default/css/view_basket.css
===================================================================
Copied: trunk/linpha2/templates/default/layouts/default/css/view_basket.css (from rev 4593, trunk/linpha2/templates/default/css/view_basket.css)
===================================================================
Deleted: trunk/linpha2/templates/default/layouts/default/css/view_img.css
===================================================================
--- trunk/linpha2/templates/default/css/view_img.css 2006-10-25 19:48:04 UTC (rev 4590)
+++ trunk/linpha2/templates/default/layouts/default/css/view_img.css 2006-10-26 19:06:14 UTC (rev 4594)
@@ -1,182 +0,0 @@
-#navigation {
-/* margin: 10px 237px 10px 10px;*/
- margin: 10px 10px 10px 10px;
-}
-
-#divmain {
-/* margin: 10px 237px 10px 10px;*/
- margin: 10px 10px 10px 10px;
-}
-#main {
-/* text-align: center;*/
- position: relative;
-}
-
-#divimage {
- text-align: center;
-}
-#mainimage {
-}
-#divloading {
- position: absolute;
- left: 50%;
- top: 20px;
- z-index: 95;
-}
-
-
-#divmeta {
- position: absolute;
- text-align: left;
- padding: 10px;
- border: 1px solid black;
-}
-#divinfolinks {
- position: absolute;
- text-align: right;
- width: 50px; /* hardcoded in LinImage.js setImageInfoLink() better to not change!*/
-}
-
-
-/**
- * thumb navigation stuff
- */
- #divthumbnavi {
- margin: 10px 10px 10px 10px;
- }
-
- #thumbnavi {
- position: relative;
- height: 80px;
- font-size: 0.5em;
- text-align: center;
- }
-
- .thumbnavi_prevthumb {
- position: absolute;
- right: 50%;
- margin-right: 50px;
- }
-
- .thumbnavi_nextthumb {
- position: absolute;
- left: 50%;
- margin-left: 50px;
- }
-
- .thumbnavi_prevnextthumb {
- /*border: 1px solid #000000;*/
- float: left;
- width: 80px;
- height: 80px;
- margin: 2px;
- }
-
- .thumbnavi_currentthumb {
- /*border: 1px solid #000000;*/
- position: absolute;
- left: 50%;
- margin: 2px;
-
- width: 80px;
- margin-left: -40px; /* should be the half of 'width' */
- height: 80px;
- }
-
- .img_prevnextthumb {
- width: 75px;
- height: auto;
- border: 0px;
- }
- .img_currentthumb {
- width: 50px;
- height: auto;
- border: 0px;
- }
-
-/**
- * comment stuff
- */
- .add_comment {
-/* color: #036;*/
- width: 600px;
- text-align: left;
- margin-left: 100px;
- font-size: 8pt;
- }
- .add_comment input, .add_comment textarea {
- background-color: #d5eeff;
- border: 1px solid grey;
- }
-
- .comments {
- width: 70%;
- margin-left: 100px;
- font-size: 8pt;
- }
- .comments hr {
- padding: 0px;
- margin: 0px;
-/* color: #f00;*/
- background-color: #f00;
- height: 1px;
- }
-
-/**
- * slideshow
- */
-#divSlideshowOverlay
-{
- position: absolute;
- top: 0px;
- left: 0px;
-
- width: 100%;
- height: 100%;
-
- padding: 0px;
- margin: 0px;
-
- z-index: 90;
- background-color: #000;
-}
-
-#divSlideshowControls
-{
- position: absolute;
- top: 0px;
- left: 50%;
-
- padding: 0px;
- margin: 0px;
-
- width: 600px;
- margin-left: -300px; /* should be the half of 'width' */
-
- z-index: 91;
-}
-#divSlideshowControlsInner
-{
- padding: 5px;
- margin: 0px;
-}
-
-
-#divSlideshowImage {
- position: absolute;
- top: 65px;
-
- padding: 0px;
- margin: 0px;
-
- width: 100%;
-
- z-index: 91;
- text-align: center;
-}
-
-.imgSlideshow {
- border: 20px solid white;
-}
-
-
Copied: trunk/linpha2/templates/default/layouts/default/css/view_img.css (from rev 4593, trunk/linpha2/templates/default/css/view_img.css)
===================================================================
--- trunk/linpha2/templates/default/layouts/default/css/view_img.css (rev 0)
+++ trunk/linpha2/templates/default/layouts/default/css/view_img.css 2006-10-26 19:06:14 UTC (rev 4594)
@@ -0,0 +1,182 @@
+#navigation {
+/* margin: 10px 237px 10px 10px;*/
+ margin: 10px 10px 10px 10px;
+}
+
+#divmain {
+/* margin: 10px 237px 10px 10px;*/
+ margin: 10px 10px 10px 10px;
+}
+#main {
+/* text-align: center;*/
+ position: relative;
+}
+
+#divimage {
+ text-align: center;
+}
+#mainimage {
+}
+#divloading {
+ position: absolute;
+ left: 50%;
+ top: 20px;
+ z-index: 95;
+}
+
+
+#divmeta {
+ position: absolute;
+ text-align: left;
+ padding: 10px;
+ border: 1px solid black;
+}
+#divinfolinks {
+ position: absolute;
+ text-align: right;
+ width: 50px; /* hardcoded in LinImage.js setImageInfoLink() better to not change!*/
+}
+
+
+/**
+ * thumb navigation stuff
+ */
+ #divthumbnavi {
+ margin: 10px 10px 10px 10px;
+ }
+
+ #thumbnavi {
+ position: relative;
+ height: 80px;
+ font-size: 0.5em;
+ text-align: center;
+ }
+
+ .thumbnavi_prevthumb {
+ position: absolute;
+ right: 50%;
+ margin-right: 50px;
+ }
+
+ .thumbnavi_nextthumb {
+ position: absolute;
+ left: 50%;
+ margin-left: 50px;
+ }
+
+ .thumbnavi_prevnextthumb {
+ /*border: 1px solid #000000;*/
+ float: left;
+ width: 80px;
+ height: 80px;
+ margin: 2px;
+ }
+
+ .thumbnavi_currentthumb {
+ /*border: 1px solid #000000;*/
+ position: absolute;
+ left: 50%;
+ margin: 2px;
+
+ width: 80px;
+ margin-left: -40px; /* should be the half of 'width' */
+ height: 80px;
+ }
+
+ .img_prevnextthumb {
+ width: 75px;
+ height: auto;
+ border: 0px;
+ }
+ .img_currentthumb {
+ width: 50px;
+ height: auto;
+ border: 0px;
+ }
+
+/**
+ * comment stuff
+ */
+ .add_comment {
+/* color: #036;*/
+ width: 600px;
+ text-align: left;
+ margin-left: 100px;
+ font-size: 8pt;
+ }
+ .add_comment input, .add_comment textarea {
+ background-color: #d5eeff;
+ border: 1px solid grey;
+ }
+
+ .comments {
+ width: 70%;
+ margin-left: 100px;
+ font-size: 8pt;
+ }
+ .comments hr {
+ padding: 0px;
+ margin: 0px;
+/* color: #f00;*/
+ background-color: #f00;
+ height: 1px;
+ }
+
+/**
+ * slideshow
+ */
+#divSlideshowOverlay
+{
+ position: absolute;
+ top: 0px;
+ left: 0px;
+
+ width: 100%;
+ height: 100%;
+
+ padding: 0px;
+ margin: 0px;
+
+ z-index: 90;
+ background-color: #000;
+}
+
+#divSlideshowControls
+{
+ position: absolute;
+ top: 0px;
+ left: 50%;
+
+ padding: 0px;
+ margin: 0px;
+
+ width: 600px;
+ margin-left: -300px; /* should be the half of 'width' */
+
+ z-index: 91;
+}
+#divSlideshowControlsInner
+{
+ padding: 5px;
+ margin: 0px;
+}
+
+
+#divSlideshowImage {
+ position: absolute;
+ top: 65px;
+
+ padding: 0px;
+ margin: 0px;
+
+ width: 100%;
+
+ z-index: 91;
+ text-align: center;
+}
+
+.imgSlideshow {
+ border: 20px solid white;
+}
+
+
Deleted: trunk/linpha2/templates/default/layouts/default/css/view_thumb.css
===================================================================
--- trunk/linpha2/templates/default/css/view_thumb.css 2006-10-25 19:48:04 UTC (rev 4590)
+++ trunk/linpha2/templates/default/layouts/default/css/view_thumb.css 2006-10-26 19:06:14 UTC (rev 4594)
@@ -1,65 +0,0 @@
-
-/**
- * not used anymore
-
- need this to calculate heigh of main div
- * if you're gettings scrollbars, adjust the height!
- * height: 12.52em; dosent work, it increases to much if we adjust browsers font-size
-
-#spacer_height {
- height: 208px;
- position: absolute;
- visibility: hidden;
-}*/
-
-/**
- * page nr
- */
- #divpage_nr {
- margin-top: 5px;
- height: 35px;
- }
-
- #page_nr {
- position: absolute;
- left: 50%;
- width: 530px;
- height: 35px;
- margin-left: -265px; /* should be the half of 'width' */
- }
- .page_nr_divs {
- float: left;
- margin-left: 5px;
- margin-right: 5px;
- padding-left: 10px;
- padding-right: 10px;
-
-/* height: 25px;*/
- width: 40px;
- white-space: nowrap;
- }
- .page_nr_maindiv {
- width: 350px;
- text-align: center;
- }
-
-/**
- * thumbnails
- */
- .imgdiv {
- /* border: 1px #000000 solid;*/
- margin: 3px;
- text-align: center;
- float: left;
- font-size: 8pt;
- }
-
- .img_thumbnail {
- border: 0;
- /*width: auto;*/
- }
-
- .img_text {
- padding-left: 10px;
- text-align: left;
- }
\ No newline at end of file
Copied: trunk/linpha2/templates/default/layouts/default/css/view_thumb.css (from rev 4593, trunk/linpha2/templates/default/css/view_thumb.css)
===================================================================
--- trunk/linpha2/templates/default/layouts/default/css/view_thumb.css (rev 0)
+++ trunk/linpha2/templates/default/layouts/default/css/view_thumb.css 2006-10-26 19:06:14 UTC (rev 4594)
@@ -0,0 +1,69 @@
+
+/**
+ * not used anymore
+
+ need this to calculate heigh of main div
+ * if you're gettings scrollbars, adjust the height!
+ * height: 12.52em; dosent work, it increases to much if we adjust browsers font-size
+
+#spacer_height {
+ height: 208px;
+ position: absolute;
+ visibility: hidden;
+}*/
+
+/**
+ * page nr
+ */
+ #divpage_nr {
+ margin-top: 5px;
+ height: 35px;
+ }
+
+ #page_nr {
+ position: absolute;
+ left: 50%;
+ width: 530px;
+ height: 35px;
+ margin-left: -265px; /* should be the half of 'width' */
+ }
+ .page_nr_divs {
+ float: left;
+ margin-left: 5px;
+ margin-right: 5px;
+ padding-left: 10px;
+ padding-right: 10px;
+
+/* height: 25px;*/
+ width: 40px;
+ white-space: nowrap;
+ }
+ .page_nr_maindiv {
+ width: 350px;
+ text-align: center;
+ }
+
+/**
+ * thumbnails
+ */
+ .divthumb { /* outer div */
+ margin: 3px;
+ text-align: center;
+ float: left;
+ font-size: 8pt;
+ }
+ .divimg { /* inner div with thumbnail */
+ }
+ .divimgdetail { /* in detail mode, additional to .divimg */
+ float: left;
+ }
+ .imgthumb { /* thumbnail */
+ border: 0;
+ }
+
+ .divtext { /* inner div with bottom or right text */
+ padding-left: 10px;
+ text-align: left;
+ width: 150px; /* hardcoded in LinThumbnails.js */
+ float: left;
+ }
Deleted: trunk/linpha2/templates/default/layouts/default/css/view_thumbdetail.css
===================================================================
--- trunk/linpha2/templates/default/css/view_thumbdetail.css 2006-10-25 19:48:04 UTC (rev 4590)
+++ trunk/linpha2/templates/default/layouts/default/css/view_thumbdetail.css 2006-10-26 19:06:14 UTC (rev 4594)
@@ -1,37 +0,0 @@
-#navigation {
- background-color: #d5fcf4;
- padding: 0;
- border: 1px solid #0c9;
- margin: 10px 10px 10px 237px;
-}
-
-.div_folder {
- position: relative;
- margin: 2px;
- margin-left: 15px;
- margin-bottom: 15px;
- padding: 5px;
-
- height: 151px;
- width: 700px;
-
- background-color: #d5fcf4;
- border: 1px solid #0c9;
-}
-
-.div_folder_text {
- margin-left: 180px;
- height: 140px;
- padding: 5px;
-}
-
-.img_folder_thumbnail {
- position: absolute;
- top: 15px;
- left: 20px;
-
- width: 130px;
- height: auto;
-
- border: 0;
-}
\ No newline at end of file
Copied: trunk/linpha2/templates/default/layouts/default/css/view_thumbdetail.css (from rev 4593, trunk/linpha2/templates/default/css/view_thumbdetail.css)
===================================================================
--- trunk/linpha2/templates/default/layouts/default/css/view_thumbdetail.css (rev 0)
+++ trunk/linpha2/templates/default/layouts/default/css/view_thumbdetail.css 2006-10-26 19:06:14 UTC (rev 4594)
@@ -0,0 +1,39 @@
+/* deprecated */
+
+#navigation {
+ background-color: #d5fcf4;
+ padding: 0;
+ border: 1px solid #0c9;
+ margin: 10px 10px 10px 237px;
+}
+
+.div_folder {
+ position: relative;
+ margin: 2px;
+ margin-left: 15px;
+ margin-bottom: 15px;
+ padding: 5px;
+
+ height: 151px;
+ width: 700px;
+
+ background-color: #d5fcf4;
+ border: 1px solid #0c9;
+}
+
+.div_folder_text {
+ margin-left: 180px;
+ height: 140px;
+ padding: 5px;
+}
+
+.img_folder_thumbnail {
+ position: absolute;
+ top: 15px;
+ left: 20px;
+
+ width: 130px;
+ height: auto;
+
+ border: 0;
+}
\ No newline at end of file
Copied: trunk/linpha2/templates/default/layouts/default/images (from rev 4590, trunk/linpha2/templates/default/images)
Deleted: trunk/linpha2/templates/default/layouts/default/images/bl.gif
===================================================================
(Binary files differ)
Copied: trunk/linpha2/templates/default/layouts/default/images/bl.gif (from rev 4593, trunk/linpha2/templates/default/images/bl.gif)
===================================================================
(Binary files differ)
Deleted: trunk/linpha2/templates/default/layouts/default/images/br.gif
===================================================================
(Binary files differ)
Copied: trunk/linpha2/templates/default/layouts/default/images/br.gif (from rev 4593, trunk/linpha2/templates/default/images/br.gif)
===================================================================
(Binary files differ)
Deleted: trunk/linpha2/templates/default/layouts/default/images/download.png
===================================================================
(Binary files differ)
Copied: trunk/linpha2/templates/default/layouts/default/images/download.png (from rev 4593, trunk/linpha2/templates/default/images/download.png)
===================================================================
(Binary files differ)
Deleted: trunk/linpha2/templates/default/layouts/default/images/expand.gif
===================================================================
(Binary files differ)
Copied: trunk/linpha2/templates/default/layouts/default/images/expand.gif (from rev 4593, trunk/linpha2/templates/default/images/expand.gif)
===================================================================
(Binary files differ)
Deleted: trunk/linpha2/templates/default/layouts/default/images/print.png
===================================================================
(Binary files differ)
Copied: trunk/linpha2/templates/default/layouts/default/images/print.png (from rev 4593, trunk/linpha2/templates/default/images/print.png)
===================================================================
(Binary files differ)
Deleted: trunk/linpha2/templates/default/layouts/default/images/slideshow.png
===================================================================
(Binary files differ)
Copied: trunk/linpha2/templates/default/layouts/default/images/slideshow.png (from rev 4593, trunk/linpha2/templates/default/images/slideshow.png)
===================================================================
(Binary files differ)
Deleted: trunk/linpha2/templates/default/layouts/default/images/tl.gif
===================================================================
(Binary files differ)
Copied: trunk/linpha2/templates/default/layouts/default/images/tl.gif (from rev 4593, trunk/linpha2/templates/default/images/tl.gif)
===================================================================
(Binary files differ)
Deleted: trunk/linpha2/templates/default/layouts/default/images/tr.gif
===================================================================
(Binary files differ)
Copied: trunk/linpha2/templates/default/layouts/default/images/tr.gif (from rev 4593, trunk/linpha2/templates/default/images/tr.gif)
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fan...@us...> - 2006-10-27 19:54:25
|
Revision: 4598
http://svn.sourceforge.net/linpha/?rev=4598&view=rev
Author: fangehrn
Date: 2006-10-27 12:54:08 -0700 (Fri, 27 Oct 2006)
Log Message:
-----------
working on admin settings
Added Paths:
-----------
trunk/linpha2/templates/default/default.html.php
trunk/linpha2/templates/default/layouts/default/css/admin.css
trunk/linpha2/templates/default/layouts/default/css/filemanager.css
Removed Paths:
-------------
trunk/linpha2/templates/default/filemanager.html.php
trunk/linpha2/templates/default/layouts/default/css/filemanager.css
Added: trunk/linpha2/templates/default/default.html.php
===================================================================
--- trunk/linpha2/templates/default/default.html.php (rev 0)
+++ trunk/linpha2/templates/default/default.html.php 2006-10-27 19:54:08 UTC (rev 4598)
@@ -0,0 +1,11 @@
+<div id="divmain">
+ <?php echo $GLOBALS['linpha']->template->divRoundCorners('top'); ?>
+ <div id="main">
+
+<?php
+echo $GLOBALS['linpha']->template->output['default'];
+?>
+
+ </div>
+ <?php echo $GLOBALS['linpha']->template->divRoundCorners('bottom'); ?>
+</div>
\ No newline at end of file
Deleted: trunk/linpha2/templates/default/filemanager.html.php
===================================================================
--- trunk/linpha2/templates/default/filemanager.html.php 2006-10-27 19:28:12 UTC (rev 4597)
+++ trunk/linpha2/templates/default/filemanager.html.php 2006-10-27 19:54:08 UTC (rev 4598)
@@ -1,19 +0,0 @@
-<div id="divmain">
- <div class="roundtop">
- <img src="<?php echo $GLOBALS['linpha']->template->layoutsimagespath.'/tl.gif'; ?>" alt="" width="15" height="15" class="corner" style="display: none" />
- </div>
-
- <div id="main">
-
-
-<?php
-echo $GLOBALS['linpha']->template->output['filemanager'];
-?>
-
-
- </div>
-
- <div class="roundbottom">
- <img src="<?php echo $GLOBALS['linpha']->template->layoutsimagespath.'/bl.gif'; ?>" alt="" width="15" height="15" class="corner" style="display: none" />
- </div>
-</div>
\ No newline at end of file
Copied: trunk/linpha2/templates/default/layouts/default/css/admin.css (from rev 4597, trunk/linpha2/admin/admin.css)
===================================================================
--- trunk/linpha2/templates/default/layouts/default/css/admin.css (rev 0)
+++ trunk/linpha2/templates/default/layouts/default/css/admin.css 2006-10-27 19:54:08 UTC (rev 4598)
@@ -0,0 +1,52 @@
+form
+{
+ margin: 0;
+ padding: 0;
+}
+
+.navlist
+{
+padding: 3px 0;
+margin-left: 0;
+border-bottom: 1px solid #778;
+font: bold 12px Verdana, sans-serif;
+}
+
+.navlist li
+{
+list-style: none;
+margin: 0;
+display: inline;
+}
+
+.navlist li a
+{
+padding: 3px 0.5em;
+margin-left: 3px;
+border: 1px solid #778;
+border-bottom: none;
+background: #DDE;
+text-decoration: none;
+}
+
+.navlist li a:link { color: #448; }
+.navlist li a:visited { color: #667; }
+
+.navlist li a:hover
+{
+color: #000;
+background: #AAE;
+border-color: #227;
+}
+
+.navlist li a.current
+{
+background: white;
+border-bottom: 1px solid white;
+}
+
+
+.option_title
+{
+ font-weight: bold;
+}
\ No newline at end of file
Deleted: trunk/linpha2/templates/default/layouts/default/css/filemanager.css
===================================================================
--- trunk/linpha2/templates/default/layouts/default/css/filemanager.css 2006-10-27 19:28:12 UTC (rev 4597)
+++ trunk/linpha2/templates/default/layouts/default/css/filemanager.css 2006-10-27 19:54:08 UTC (rev 4598)
@@ -1,10 +0,0 @@
-#filemanager table
-{
- border-collapse:collapse;
-}
-
-#filemanager td
-{
- border:1px solid black;
- padding:5px;
-}
\ No newline at end of file
Added: trunk/linpha2/templates/default/layouts/default/css/filemanager.css
===================================================================
--- trunk/linpha2/templates/default/layouts/default/css/filemanager.css (rev 0)
+++ trunk/linpha2/templates/default/layouts/default/css/filemanager.css 2006-10-27 19:54:08 UTC (rev 4598)
@@ -0,0 +1,10 @@
+#filemanager table
+{
+ border-collapse:collapse;
+}
+
+#filemanager td
+{
+ border:1px solid black;
+ padding:5px;
+}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fan...@us...> - 2006-10-27 20:02:08
|
Revision: 4601
http://svn.sourceforge.net/linpha/?rev=4601&view=rev
Author: fangehrn
Date: 2006-10-27 13:01:57 -0700 (Fri, 27 Oct 2006)
Log Message:
-----------
renamed layouts -> themes
Added Paths:
-----------
trunk/linpha2/templates/default/themes/default/
Removed Paths:
-------------
trunk/linpha2/templates/default/layouts/default/
Copied: trunk/linpha2/templates/default/themes/default (from rev 4599, trunk/linpha2/templates/default/layouts/default)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fan...@us...> - 2008-02-07 23:24:41
|
Revision: 4858
http://linpha.svn.sourceforge.net/linpha/?rev=4858&view=rev
Author: fangehrn
Date: 2008-02-07 15:24:36 -0800 (Thu, 07 Feb 2008)
Log Message:
-----------
changed line ending to LF
Modified Paths:
--------------
trunk/linpha2/templates/default/maps.html.php
trunk/linpha2/templates/default/view_img.head.php
trunk/linpha2/templates/default/view_img.html.php
trunk/linpha2/templates/default/view_thumb_static.html.php
Modified: trunk/linpha2/templates/default/maps.html.php
===================================================================
--- trunk/linpha2/templates/default/maps.html.php 2008-02-07 23:22:46 UTC (rev 4857)
+++ trunk/linpha2/templates/default/maps.html.php 2008-02-07 23:24:36 UTC (rev 4858)
@@ -1,166 +1,166 @@
-
-<div id="linDivMainOuter">
- <?php echo $linTpl->divRoundCorners('top'); ?>
- <div id="linDivMain">
-
-
-<div id="linDivMapTop"></div>
-
-<div id="linDivMapMain">
- <div id="linDivMapNav"></div>
- <div id="linDivMapResizeBorder" ondblClick="myLinMaps.toggleNav();"></div>
- <div id="linDivMapObject"></div>
-</div>
-
-<div id="linDivMapBottom">
- <form action="" style="margin: 0;">
- <input type="text" id="linInputAddress" size="30">
- <input type="button" onclick="myLinMapObject.geocodeAddress( $('linInputAddress').value )" value="<?php
- echo i18n("Geocode"); ?>">
- <a href="javascript:myLinGlobal.createPopup('linDivPopupHelp');"><img style="border: 0;" src="<?php
- echo LINPHA_CLIENT; ?>/lib/graphics/ss_random.gif" /></a>
- <a href="javascript:myLinMaps.loadAlbums();"><?php echo i18n("Albums"); ?></a>
-
- </form>
-</div>
-
- </div>
- <?php echo $linTpl->divRoundCorners('bottom'); ?>
-</div>
-
-<div id="linDivPopupHelp" style="display: none">
- <div>
- <b><?php echo i18n("Legend:"); ?></b><br /><br />
- <img src="http://maps.google.com/mapfiles/ms/micons/red-dot.png" style="vertical-align:middle" alt="red" />
- <?php echo i18n("Current Marker"); ?><br /><br />
- <img src="http://maps.google.com/mapfiles/ms/micons/purple-dot.png" style="vertical-align:middle" alt="blue" />
- <?php echo i18n("Location Marker"); ?><br /><br />
- <img src="http://maps.google.com/mapfiles/ms/micons/blue-dot.png" style="vertical-align:middle" alt="purple" />
- <?php echo i18n("Location Marker With Assigned Albums"); ?><br /><br />
- <img src="http://maps.google.com/mapfiles/ms/micons/green-dot.png" style="vertical-align:middle" alt="green" />
- <?php echo i18n("Location Marker With Assigned Images (GPS)"); ?><br /><br />
- <img src="http://maps.google.com/mapfiles/ms/micons/yellow-dot.png" style="vertical-align:middle" alt="yellow" />
- <?php echo i18n("Images"); ?><br /><br />
- </div>
-
- <?php
- if( $GLOBALS['linpha']->sql->checkPermission('plugins_maps_setMarkers') )
- {
- ?>
- <br />
- <div>
- <b>Create marker:</b><br />
- 1. Enter address or just press "Geocode"<br />
- 2. Drag the marker to fine adjust<br />
- 3. Check marker name<br />
- 4. Press "Save"<br />
- <br />
- <b>Assign albums:</b><br />
- 1. Click on a marker<br />
- 2. Press "Assign album"<br />
- 3. Choose album and press "Save"<br />
- 4. Repeat for multiple albums<br />
- <br />
- <b>Assign images to an album marker:</b><br />
- This is done automatically. But it's required that your images have the
- GPS information stored inside. You will need a GPS Data Logger to do this
- automatically. It is also possible do it manually. Robogeo is a tool, but
- it is not free.<br />
- </div>
-
- <div>
- <b>Not assigned images:</b><br />
- albums/album1 (22 images)<br />
- </div>
- <?php
- }
- ?>
-</div>
-
-<div id="linDivPopupAlbums" style="display: none;">
- <br />
- <?php echo i18n("Please select the album to show in Google Maps:"); ?>
- <div id="linDivMapAlbums"></div>
-</div>
-
-<div id="linDivEditMarker" style="display: none;">
- <fieldset style="width: 350px;"><legend><?php echo i18n("Create New Marker"); ?></legend>
- <label for="linInputMarkerName" class="linInputEditMarker"><?php echo i18n("Marker Name"); ?>:
- </label><input type="text" id="linInputMarkerName" name="linInputMarkerName" size="31" /><br />
- <label for="linInputLat" class="linInputEditMarker"><?php echo i18n("Lat/Lon/Zoom"); ?>:
- </label><input type="text" id="linInputLat" name="linInputLat" size="10" />
- <input type="text" id="linInputLon" name="linInputLon" size="10" />
- <input type="text" id="linInputZoom" name="linInputZoom" size="1" />
-
- <br /><br />
- <input type="submit" value="<?php echo i18n("Save"); ?>" />
- <input type="button" value="<?php echo i18n("Cancel"); ?>" onclick="myLinMaps.removeEditMarker()"/>
- <input type="hidden" name="cmd" value="saveMarker" />
-
- </fieldset>
-</div>
-
-<div id="linDivLoadingOuter" style="display: none;" class="linBackground">
- <?php echo $linTpl->divRoundCorners('top'); ?>
- <div id="linDivLoading">
- <img src="<?php echo LINPHA_CLIENT; ?>/lib/graphics/loading.gif" />
- </div>
- <?php echo $linTpl->divRoundCorners('bottom'); ?>
-</div>
-
+
+<div id="linDivMainOuter">
+ <?php echo $linTpl->divRoundCorners('top'); ?>
+ <div id="linDivMain">
+
+
+<div id="linDivMapTop"></div>
+
+<div id="linDivMapMain">
+ <div id="linDivMapNav"></div>
+ <div id="linDivMapResizeBorder" ondblClick="myLinMaps.toggleNav();"></div>
+ <div id="linDivMapObject"></div>
+</div>
+
+<div id="linDivMapBottom">
+ <form action="" style="margin: 0;">
+ <input type="text" id="linInputAddress" size="30">
+ <input type="button" onclick="myLinMapObject.geocodeAddress( $('linInputAddress').value )" value="<?php
+ echo i18n("Geocode"); ?>">
+ <a href="javascript:myLinGlobal.createPopup('linDivPopupHelp');"><img style="border: 0;" src="<?php
+ echo LINPHA_CLIENT; ?>/lib/graphics/ss_random.gif" /></a>
+ <a href="javascript:myLinMaps.loadAlbums();"><?php echo i18n("Albums"); ?></a>
+
+ </form>
+</div>
+
+ </div>
+ <?php echo $linTpl->divRoundCorners('bottom'); ?>
+</div>
+
+<div id="linDivPopupHelp" style="display: none">
+ <div>
+ <b><?php echo i18n("Legend:"); ?></b><br /><br />
+ <img src="http://maps.google.com/mapfiles/ms/micons/red-dot.png" style="vertical-align:middle" alt="red" />
+ <?php echo i18n("Current Marker"); ?><br /><br />
+ <img src="http://maps.google.com/mapfiles/ms/micons/purple-dot.png" style="vertical-align:middle" alt="blue" />
+ <?php echo i18n("Location Marker"); ?><br /><br />
+ <img src="http://maps.google.com/mapfiles/ms/micons/blue-dot.png" style="vertical-align:middle" alt="purple" />
+ <?php echo i18n("Location Marker With Assigned Albums"); ?><br /><br />
+ <img src="http://maps.google.com/mapfiles/ms/micons/green-dot.png" style="vertical-align:middle" alt="green" />
+ <?php echo i18n("Location Marker With Assigned Images (GPS)"); ?><br /><br />
+ <img src="http://maps.google.com/mapfiles/ms/micons/yellow-dot.png" style="vertical-align:middle" alt="yellow" />
+ <?php echo i18n("Images"); ?><br /><br />
+ </div>
+
+ <?php
+ if( $GLOBALS['linpha']->sql->checkPermission('plugins_maps_setMarkers') )
+ {
+ ?>
+ <br />
+ <div>
+ <b>Create marker:</b><br />
+ 1. Enter address or just press "Geocode"<br />
+ 2. Drag the marker to fine adjust<br />
+ 3. Check marker name<br />
+ 4. Press "Save"<br />
+ <br />
+ <b>Assign albums:</b><br />
+ 1. Click on a marker<br />
+ 2. Press "Assign album"<br />
+ 3. Choose album and press "Save"<br />
+ 4. Repeat for multiple albums<br />
+ <br />
+ <b>Assign images to an album marker:</b><br />
+ This is done automatically. But it's required that your images have the
+ GPS information stored inside. You will need a GPS Data Logger to do this
+ automatically. It is also possible do it manually. Robogeo is a tool, but
+ it is not free.<br />
+ </div>
+
+ <div>
+ <b>Not assigned images:</b><br />
+ albums/album1 (22 images)<br />
+ </div>
+ <?php
+ }
+ ?>
+</div>
+
+<div id="linDivPopupAlbums" style="display: none;">
+ <br />
+ <?php echo i18n("Please select the album to show in Google Maps:"); ?>
+ <div id="linDivMapAlbums"></div>
+</div>
+
+<div id="linDivEditMarker" style="display: none;">
+ <fieldset style="width: 350px;"><legend><?php echo i18n("Create New Marker"); ?></legend>
+ <label for="linInputMarkerName" class="linInputEditMarker"><?php echo i18n("Marker Name"); ?>:
+ </label><input type="text" id="linInputMarkerName" name="linInputMarkerName" size="31" /><br />
+ <label for="linInputLat" class="linInputEditMarker"><?php echo i18n("Lat/Lon/Zoom"); ?>:
+ </label><input type="text" id="linInputLat" name="linInputLat" size="10" />
+ <input type="text" id="linInputLon" name="linInputLon" size="10" />
+ <input type="text" id="linInputZoom" name="linInputZoom" size="1" />
+
+ <br /><br />
+ <input type="submit" value="<?php echo i18n("Save"); ?>" />
+ <input type="button" value="<?php echo i18n("Cancel"); ?>" onclick="myLinMaps.removeEditMarker()"/>
+ <input type="hidden" name="cmd" value="saveMarker" />
+
+ </fieldset>
+</div>
+
+<div id="linDivLoadingOuter" style="display: none;" class="linBackground">
+ <?php echo $linTpl->divRoundCorners('top'); ?>
+ <div id="linDivLoading">
+ <img src="<?php echo LINPHA_CLIENT; ?>/lib/graphics/loading.gif" />
+ </div>
+ <?php echo $linTpl->divRoundCorners('bottom'); ?>
+</div>
+
<script language="JavaScript" type="text/javascript">
-function linGetMarkerHtml(markerNode)
-{
- var htmlStr = '<b>' + markerNode.name + '</b><br />';
-
- if( markerNode.type == 'images' )
- {
- htmlStr += '<img src="'+imageSrc+markerNode.id+'" width="' +
- linMapsMarkerThumbSize+'" >' + markerNode.text;
-
- $('thumb_'+markerNode.id).focus();
- }
- else
- {
-
- if( markerNode.albId != 0 ) {
- htmlStr += '<?php echo i18n("Album"); ?>: ' + markerNode.path + '<br />';
-
- if( markerNode.type == 'albumWithImg') {
- htmlStr += '<a href="javascript:myLinMaps.loadImages('+ markerNode.albId +')"><?php
- echo i18n("Open Images"); ?></a><br />';
- }
- }
-
- <?php
- if( $GLOBALS['linpha']->sql->checkPermission('plugins_maps_setMarkers') )
- {
- ?>
- htmlStr += '<br /><fieldset style="width: 350px;"><legend><?php
- echo i18n("Edit Marker"); ?></legend><form><select name="linInputAlbum" style="width: 250px;"><?php
- linBuildAlbumSelect($with_all_albs_entry=false,$with_linebreaks=false); ?></select><br />';
-
- if(markerNode.albId != 0)
- {
- htmlStr += '<input type="button" value="<?php echo i18n("Change Assigned Album");
- ?>" onclick="myLinMaps.assignAlbumChange(' + markerNode.id + ',this.form.linInputAlbum.value)">' +
- '<input type="button" value="<?php echo i18n("Delete");
- ?>" onclick="myLinMaps.assignAlbumDelete(' + markerNode.id + ',0)"><br /><br />';
- } else {
- htmlStr += '<input type="button" value="<?php echo i18n("Assign Album");
- ?>" onclick="myLinMaps.assignAlbum(' + markerNode.id + ', this.form.linInputAlbum.value)">';
- }
-
- htmlStr += '<input type="button" value="<?php echo i18n("Delete Marker"); ?>" onclick="if(confirm(\'<?php
- echo sprintf(LIN_STR_CONFIRMDELETE, i18n("this marker"));
- ?>\')){myLinMaps.deleteMarker(' + markerNode.id + ');}"></form></fieldset>';
- <?php
- }
- ?>
- }
-
- return htmlStr;
-}
+function linGetMarkerHtml(markerNode)
+{
+ var htmlStr = '<b>' + markerNode.name + '</b><br />';
+
+ if( markerNode.type == 'images' )
+ {
+ htmlStr += '<img src="'+imageSrc+markerNode.id+'" width="' +
+ linMapsMarkerThumbSize+'" >' + markerNode.text;
+ $('thumb_'+markerNode.id).focus();
+ }
+ else
+ {
+
+ if( markerNode.albId != 0 ) {
+ htmlStr += '<?php echo i18n("Album"); ?>: ' + markerNode.path + '<br />';
+
+ if( markerNode.type == 'albumWithImg') {
+ htmlStr += '<a href="javascript:myLinMaps.loadImages('+ markerNode.albId +')"><?php
+ echo i18n("Open Images"); ?></a><br />';
+ }
+ }
+
+ <?php
+ if( $GLOBALS['linpha']->sql->checkPermission('plugins_maps_setMarkers') )
+ {
+ ?>
+ htmlStr += '<br /><fieldset style="width: 350px;"><legend><?php
+ echo i18n("Edit Marker"); ?></legend><form><select name="linInputAlbum" style="width: 250px;"><?php
+ linBuildAlbumSelect($with_all_albs_entry=false,$with_linebreaks=false); ?></select><br />';
+
+ if(markerNode.albId != 0)
+ {
+ htmlStr += '<input type="button" value="<?php echo i18n("Change Assigned Album");
+ ?>" onclick="myLinMaps.assignAlbumChange(' + markerNode.id + ',this.form.linInputAlbum.value)">' +
+ '<input type="button" value="<?php echo i18n("Delete");
+ ?>" onclick="myLinMaps.assignAlbumDelete(' + markerNode.id + ',0)"><br /><br />';
+ } else {
+ htmlStr += '<input type="button" value="<?php echo i18n("Assign Album");
+ ?>" onclick="myLinMaps.assignAlbum(' + markerNode.id + ', this.form.linInputAlbum.value)">';
+ }
+
+ htmlStr += '<input type="button" value="<?php echo i18n("Delete Marker"); ?>" onclick="if(confirm(\'<?php
+ echo sprintf(LIN_STR_CONFIRMDELETE, i18n("this marker"));
+ ?>\')){myLinMaps.deleteMarker(' + markerNode.id + ');}"></form></fieldset>';
+ <?php
+ }
+ ?>
+ }
+
+ return htmlStr;
+}
+
</script>
-
+
Modified: trunk/linpha2/templates/default/view_img.head.php
===================================================================
--- trunk/linpha2/templates/default/view_img.head.php 2008-02-07 23:22:46 UTC (rev 4857)
+++ trunk/linpha2/templates/default/view_img.head.php 2008-02-07 23:24:36 UTC (rev 4858)
@@ -1,25 +1,25 @@
-
-<script language="JavaScript" type="text/javascript">
-var xmlUrl = '<?php echo linConvertAmp($linTpl->URL_base); ?>';
-var imageSrc = '<?php echo LINPHA_CLIENT.'/get_image.php?linId='; ?>';
-var thumbSrc = '<?php echo LINPHA_CLIENT.'/get_thumb.php?linId='; ?>';
-var maxImageWidth = <?php echo $GLOBALS['linpha']->sql->config->value['sys_style_image_width']; ?>;
-var maxImageHeight = <?php echo $GLOBALS['linpha']->sql->config->value['sys_style_image_height']; ?>;
-var startImgHeight = <?php echo $GLOBALS['linpha']->imgview->img_height; ?>;
-var firstImgId = <?php echo $GLOBALS['linpha']->imgview->photos_filtered[0]['id']; /* @todo needs updating on change of sort order */ ?>;
-var lastImgId = <?php echo $GLOBALS['linpha']->imgview->photos_filtered[ count($GLOBALS['linpha']->imgview->photos_filtered)-1 ]['id']; /* @todo needs updating on change of sort order */ ?>;
-var useEffects = <?php echo $GLOBALS['linpha']->sql->config->value['sys_style_image_useeffects']; ?>;
-var linSlideshowHtml = '<?php
-/**
- * @todo is it somehow possible to cache the slideshow divs?
- * for example in external .js file? (that would have to be generated from a php file...)
- */
-$fragment = 'slideshow'; ob_start();
-include(LINPHA_DIR.'/templates/'.$this->template_name.'/fragments.php');
-$string = ob_get_clean(); $string = str_replace("\n","",$string); $string = str_replace("\r","",$string); $string = str_replace("\t","",$string);
-echo $string;
-?>';
-</script>
-
-<script type="text/javascript" language="javascript" src="<?php echo LINPHA_CLIENT; ?>/lib/js/scriptaculous.js?load=effects,builder"></script>
-<script type="text/javascript" language="javascript" src="<?php echo LINPHA_CLIENT; ?>/lib/js/LinImage.js"> </script>
+
+<script language="JavaScript" type="text/javascript">
+var xmlUrl = '<?php echo linConvertAmp($linTpl->URL_base); ?>';
+var imageSrc = '<?php echo LINPHA_CLIENT.'/get_image.php?linId='; ?>';
+var thumbSrc = '<?php echo LINPHA_CLIENT.'/get_thumb.php?linId='; ?>';
+var maxImageWidth = <?php echo $GLOBALS['linpha']->sql->config->value['sys_style_image_width']; ?>;
+var maxImageHeight = <?php echo $GLOBALS['linpha']->sql->config->value['sys_style_image_height']; ?>;
+var startImgHeight = <?php echo $GLOBALS['linpha']->imgview->img_height; ?>;
+var firstImgId = <?php echo $GLOBALS['linpha']->imgview->photos_filtered[0]['id']; /* @todo needs updating on change of sort order */ ?>;
+var lastImgId = <?php echo $GLOBALS['linpha']->imgview->photos_filtered[ count($GLOBALS['linpha']->imgview->photos_filtered)-1 ]['id']; /* @todo needs updating on change of sort order */ ?>;
+var useEffects = <?php echo $GLOBALS['linpha']->sql->config->value['sys_style_image_useeffects']; ?>;
+var linSlideshowHtml = '<?php
+/**
+ * @todo is it somehow possible to cache the slideshow divs?
+ * for example in external .js file? (that would have to be generated from a php file...)
+ */
+$fragment = 'slideshow'; ob_start();
+include(LINPHA_DIR.'/templates/'.$this->template_name.'/fragments.php');
+$string = ob_get_clean(); $string = str_replace("\n","",$string); $string = str_replace("\r","",$string); $string = str_replace("\t","",$string);
+echo $string;
+?>';
+</script>
+
+<script type="text/javascript" language="javascript" src="<?php echo LINPHA_CLIENT; ?>/lib/js/scriptaculous.js?load=effects,builder"></script>
+<script type="text/javascript" language="javascript" src="<?php echo LINPHA_CLIENT; ?>/lib/js/LinImage.js"> </script>
Modified: trunk/linpha2/templates/default/view_img.html.php
===================================================================
--- trunk/linpha2/templates/default/view_img.html.php 2008-02-07 23:22:46 UTC (rev 4857)
+++ trunk/linpha2/templates/default/view_img.html.php 2008-02-07 23:24:36 UTC (rev 4858)
@@ -48,14 +48,14 @@
<br /><br />
- <div id="linDivTabs">
- <a href="javascript:myLinGlobal.openTab('linDivTab',0)">Comments</a> |
- <a href="javascript:myLinGlobal.openTab('linDivTab',1)">Rating</a> |
- <a href="javascript:myLinGlobal.openTab('linDivTab',2)">Info</a> |
- <a id="linAMetaExif" href="javascript:myLinGlobal.openTab('linDivTab',3)">EXIF</a>
- <br /><br />
-
- <div class="linDivTab">
+ <div id="linDivTabs">
+ <a href="javascript:myLinGlobal.openTab('linDivTab',0)">Comments</a> |
+ <a href="javascript:myLinGlobal.openTab('linDivTab',1)">Rating</a> |
+ <a href="javascript:myLinGlobal.openTab('linDivTab',2)">Info</a> |
+ <a id="linAMetaExif" href="javascript:myLinGlobal.openTab('linDivTab',3)">EXIF</a>
+ <br /><br />
+
+ <div class="linDivTab">
<!-- comments -->
<?php if($GLOBALS['linpha']->sql->checkPermission('metadata_comments')) { ?>
<!-- show add comment form -->
@@ -81,32 +81,32 @@
<?php } /* end if checkPermission('metadata_comments') */ ?>
<!-- show image comments -->
- <div id="linDivComments"></div>
- </div>
- <div class="linDivTab">
- Rating
- </div>
- <div class="linDivTab">
- Info
- <div id="linDivMeta"></div>
-
- <div id="linDivVideoLink" class="linDivMetaLinks">
- <a href="<?php echo LINPHA_LINK.'linCat=video&linId='.$linTpl->idCurrent; ?>" onclick="javascript:myLinImage.updateLinId(this)" target="_blank"><?php echo i18n("Play Video"); ?></a>
- <br />
- <a href="<?php echo LINPHA_LINK.'linCat=metadata&linId='.$linTpl->idCurrent; ?>" onclick="javascript:myLinImage.updateLinId(this)" target="_blank"><?php echo i18n("Show All Metadata"); ?></a>
- <br />
- <a href="<?php echo LINPHA_LINK.'linCat=download&linId='.$linTpl->idCurrent; ?>&isDownload=true" onclick="javascript:myLinImage.updateLinId(this)"><?php echo i18n("Download Video"); ?></a>
- </div>
-
- </div>
- <div class="linDivTab">
- EXIF
-
- <div id="linDivExifLink" class="linDivMetaLinks"><a href="<?php echo LINPHA_LINK.'linCat=metadata&linId='.$linTpl->idCurrent; ?>" onclick="javascript:myLinImage.updateLinId(this)" target="_blank"><?php echo i18n("Show All Metadata"); ?></a></div>
- </div>
- <script type="text/javascript">
- myLinGlobal.openTab('linDivTab',0);
- </script>
+ <div id="linDivComments"></div>
+ </div>
+ <div class="linDivTab">
+ Rating
+ </div>
+ <div class="linDivTab">
+ Info
+ <div id="linDivMeta"></div>
+
+ <div id="linDivVideoLink" class="linDivMetaLinks">
+ <a href="<?php echo LINPHA_LINK.'linCat=video&linId='.$linTpl->idCurrent; ?>" onclick="javascript:myLinImage.updateLinId(this)" target="_blank"><?php echo i18n("Play Video"); ?></a>
+ <br />
+ <a href="<?php echo LINPHA_LINK.'linCat=metadata&linId='.$linTpl->idCurrent; ?>" onclick="javascript:myLinImage.updateLinId(this)" target="_blank"><?php echo i18n("Show All Metadata"); ?></a>
+ <br />
+ <a href="<?php echo LINPHA_LINK.'linCat=download&linId='.$linTpl->idCurrent; ?>&isDownload=true" onclick="javascript:myLinImage.updateLinId(this)"><?php echo i18n("Download Video"); ?></a>
+ </div>
+
+ </div>
+ <div class="linDivTab">
+ EXIF
+
+ <div id="linDivExifLink" class="linDivMetaLinks"><a href="<?php echo LINPHA_LINK.'linCat=metadata&linId='.$linTpl->idCurrent; ?>" onclick="javascript:myLinImage.updateLinId(this)" target="_blank"><?php echo i18n("Show All Metadata"); ?></a></div>
+ </div>
+ <script type="text/javascript">
+ myLinGlobal.openTab('linDivTab',0);
+ </script>
</div>
</div>
Modified: trunk/linpha2/templates/default/view_thumb_static.html.php
===================================================================
--- trunk/linpha2/templates/default/view_thumb_static.html.php 2008-02-07 23:22:46 UTC (rev 4857)
+++ trunk/linpha2/templates/default/view_thumb_static.html.php 2008-02-07 23:24:36 UTC (rev 4858)
@@ -1,56 +1,56 @@
-
-<!-- navigation -->
-<?php if(isset($linTpl->output['navigation']) && !empty($linTpl->output['navigation'])) { ?>
- <div id="linDivNavigationOuter">
- <?php echo $linTpl->divRoundCorners('top'); ?>
-
- <div id="linDivNavigation">
- <?php echo $linTpl->output['navigation']; ?>
- </div>
-
- <?php echo $linTpl->divRoundCorners('bottom'); ?>
- </div>
-<?php } ?>
-
-<!-- main -->
-<div id="linDivMainOuter">
- <?php echo $linTpl->divRoundCorners('top'); ?>
-
- <div id="linDivPagenrOuter">
- <div id="linDivPagenr">
- <div id="linDivPagenrLeft" class="linDivPagenrAll"><?php echo $linTpl->output['page_nr_left']; ?></div>
- <div id="linDivPagenrMiddle" class="linDivPagenrAll linDivPagenrMiddle"><?php echo $linTpl->output['page_nr']; ?></div>
- <div id="linDivPagenrRight" class="linDivPagenrAll"><?php echo $linTpl->output['page_nr_right']; ?></div>
- </div>
- </div>
-
- <div id="linDivMain">
-
- <?php
- if( isset($GLOBALS['linpha']->imgview->photos_show))
- {
- for($i=1; list($key,$value) = each($GLOBALS['linpha']->imgview->photos_show); $i++)
- {
- if( ($i-1) % $GLOBALS['linpha']->sql->config->value['sys_style_thumb_nojsnrcols'] == 0) {
- echo '<div style="clear: left;"></div>'; // add clear float for line break
- }
- ?>
-
- <div class="linDivThumb">
- <?php echo $linTpl->output['thumb_infos'][$value['id']]['before']; ?>
- <div class="linDivImg">
- <a href="<?php echo $linTpl->URL_base.'&linId='.$value['id']; ?>">
- <img src="<?php echo LINPHA_CLIENT.'/get_thumb.php?linId='.$value['id']; ?>" width="<?php echo $GLOBALS['linpha']->sql->config->value['sys_style_thumb_size_display']; ?>" height="<?php echo $GLOBALS['linpha']->sql->config->value['sys_style_thumb_size_display']; ?>" alt="<?php echo $linTpl->output['thumb_infos'][$value['id']]['title']; ?>" title="<?php echo $linTpl->output['thumb_infos'][$value['id']]['title']; ?>" class="linImgThumb" /></a>
- </div>
- <div class="linDivText"><?php echo $linTpl->output['thumb_infos'][$value['id']]['after']; ?></div>
- </div>
- <?php
- }
- }
- ?>
-
- </div>
- <div style="clear: both;"></div>
-
- <?php echo $linTpl->divRoundCorners('bottom'); ?>
+
+<!-- navigation -->
+<?php if(isset($linTpl->output['navigation']) && !empty($linTpl->output['navigation'])) { ?>
+ <div id="linDivNavigationOuter">
+ <?php echo $linTpl->divRoundCorners('top'); ?>
+
+ <div id="linDivNavigation">
+ <?php echo $linTpl->output['navigation']; ?>
+ </div>
+
+ <?php echo $linTpl->divRoundCorners('bottom'); ?>
+ </div>
+<?php } ?>
+
+<!-- main -->
+<div id="linDivMainOuter">
+ <?php echo $linTpl->divRoundCorners('top'); ?>
+
+ <div id="linDivPagenrOuter">
+ <div id="linDivPagenr">
+ <div id="linDivPagenrLeft" class="linDivPagenrAll"><?php echo $linTpl->output['page_nr_left']; ?></div>
+ <div id="linDivPagenrMiddle" class="linDivPagenrAll linDivPagenrMiddle"><?php echo $linTpl->output['page_nr']; ?></div>
+ <div id="linDivPagenrRight" class="linDivPagenrAll"><?php echo $linTpl->output['page_nr_right']; ?></div>
+ </div>
+ </div>
+
+ <div id="linDivMain">
+
+ <?php
+ if( isset($GLOBALS['linpha']->imgview->photos_show))
+ {
+ for($i=1; list($key,$value) = each($GLOBALS['linpha']->imgview->photos_show); $i++)
+ {
+ if( ($i-1) % $GLOBALS['linpha']->sql->config->value['sys_style_thumb_nojsnrcols'] == 0) {
+ echo '<div style="clear: left;"></div>'; // add clear float for line break
+ }
+ ?>
+
+ <div class="linDivThumb">
+ <?php echo $linTpl->output['thumb_infos'][$value['id']]['before']; ?>
+ <div class="linDivImg">
+ <a href="<?php echo $linTpl->URL_base.'&linId='.$value['id']; ?>">
+ <img src="<?php echo LINPHA_CLIENT.'/get_thumb.php?linId='.$value['id']; ?>" width="<?php echo $GLOBALS['linpha']->sql->config->value['sys_style_thumb_size_display']; ?>" height="<?php echo $GLOBALS['linpha']->sql->config->value['sys_style_thumb_size_display']; ?>" alt="<?php echo $linTpl->output['thumb_infos'][$value['id']]['title']; ?>" title="<?php echo $linTpl->output['thumb_infos'][$value['id']]['title']; ?>" class="linImgThumb" /></a>
+ </div>
+ <div class="linDivText"><?php echo $linTpl->output['thumb_infos'][$value['id']]['after']; ?></div>
+ </div>
+ <?php
+ }
+ }
+ ?>
+
+ </div>
+ <div style="clear: both;"></div>
+
+ <?php echo $linTpl->divRoundCorners('bottom'); ?>
</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.
|
![http://maps.google.com/mapfiles/ms/micons/red-dot.png"](http://maps.google.com/mapfiles/ms/micons/red-dot.png"){kind=link}
![http://maps.google.com/mapfiles/ms/micons/purple-dot.png"](http://maps.google.com/mapfiles/ms/micons/purple-dot.png"){kind=link}
![http://maps.google.com/mapfiles/ms/micons/blue-dot.png"](http://maps.google.com/mapfiles/ms/micons/blue-dot.png"){kind=link}
![http://maps.google.com/mapfiles/ms/micons/green-dot.png"](http://maps.google.com/mapfiles/ms/micons/green-dot.png"){kind=link}
![http://maps.google.com/mapfiles/ms/micons/yellow-dot.png"](http://maps.google.com/mapfiles/ms/micons/yellow-dot.png"){kind=link}
|
From: <fan...@us...> - 2008-04-26 19:28:29
|
Revision: 4927
http://linpha.svn.sourceforge.net/linpha/?rev=4927&view=rev
Author: fangehrn
Date: 2008-04-26 12:28:25 -0700 (Sat, 26 Apr 2008)
Log Message:
-----------
2008-04-26 flo
* Search bug fixes
* Menu bug fixes
* Maps plugin bug fixes
- set the thumbnail width to 250 (same width as the marker background)
Modified Paths:
--------------
trunk/linpha2/templates/default/basket.html.php
trunk/linpha2/templates/default/global.head.php
trunk/linpha2/templates/default/maps.head.php
trunk/linpha2/templates/default/maps.html.php
trunk/linpha2/templates/default/menu.html.php
trunk/linpha2/templates/default/search.html.php
trunk/linpha2/templates/default/static.login.html.php
trunk/linpha2/templates/default/viewer.head.php
Modified: trunk/linpha2/templates/default/basket.html.php
===================================================================
--- trunk/linpha2/templates/default/basket.html.php 2008-04-26 19:27:58 UTC (rev 4926)
+++ trunk/linpha2/templates/default/basket.html.php 2008-04-26 19:28:25 UTC (rev 4927)
@@ -1,3 +1,5 @@
+<?php if(!defined('LINPHA_DIR')) { exit(1); } ?>
+
<?php echo $linTpl->divRoundCorners('top','main'); ?>
<div id="linDivNavigation">
<?php if(isset($_SESSION['ref_url_full'])) { ?>
Modified: trunk/linpha2/templates/default/global.head.php
===================================================================
--- trunk/linpha2/templates/default/global.head.php 2008-04-26 19:27:58 UTC (rev 4926)
+++ trunk/linpha2/templates/default/global.head.php 2008-04-26 19:28:25 UTC (rev 4927)
@@ -73,10 +73,10 @@
<?php if (linUseAjax()) { ?>
<!-- Load the YUI Loader script: -->
<!--<script src="http://yui.yahooapis.com/2.5.0/build/yuiloader/yuiloader-beta-min.js"></script> -->
-<script src="http://yui.yahooapis.com/2.5.0/build/yuiloader/yuiloader-beta.js"></script>
+<script src="http://yui.yahooapis.com/2.5.1/build/yuiloader/yuiloader-beta-debug.js"></script>
<script type="text/javascript" language="Javascript">
var linYUILoader = new YAHOO.util.YUILoader({
- require: ["logger"/*, "menu"*/],
+ require: ["logger"], // , "menu"
loadOptional: true,
/*filter: {
'searchExp': "-min\\.js",
Modified: trunk/linpha2/templates/default/maps.head.php
===================================================================
--- trunk/linpha2/templates/default/maps.head.php 2008-04-26 19:27:58 UTC (rev 4926)
+++ trunk/linpha2/templates/default/maps.head.php 2008-04-26 19:28:25 UTC (rev 4927)
@@ -1,4 +1,6 @@
+<?php /*<script type="text/javascript" language="JavaScript" src="<?php echo LINPHA_CLIENT; ?>/lib/js/prototype.js"></script>
<script type="text/javascript" language="javascript" src="<?php echo LINPHA_CLIENT; ?>/lib/js/scriptaculous.js?load=effects,builder,dragdrop"></script>
+*/ ?>
<script language="JavaScript" type="text/javascript">
var imageSrc = '<?php echo LINPHA_CLIENT.'/get_image.php?linId='; ?>';
var thumbSrc = '<?php echo LINPHA_CLIENT.'/get_thumb.php?linId='; ?>';
@@ -10,13 +12,23 @@
var linMapsDefaultMarkerZoom = <?php echo $GLOBALS['linpha']->sql->config->value['plugins_maps_defaultMarkerZoom']; ?>;
var linMapsMarkerThumbSize = <?php echo $GLOBALS['linpha']->sql->config->value['plugins_maps_markerThumbSize']; ?>;
</script>
+<script type="text/javascript" language="javascript" src="<?php echo $linTpl->themeFile('DefsThumbView.js'); ?>"></script>
<?php
if( $GLOBALS['linpha']->sql->config->value['plugins_maps_mapType'] == '0' ) //0=google
{
- ?>
- <script type="text/javascript" src="http://www.google.com/jsapi?key=<?php echo $GLOBALS['linpha']->sql->config->value['plugins_maps_google_key']; ?>"></script>
- <script type="text/javascript" language="JavaScript" src="<?php echo LINPHA_CLIENT; ?>/lib/plugins/maps/class.googlemaps.js"></script>
+ ?>
+ <script src="http://maps.google.com/maps?file=api&v=2&key=<?php echo $GLOBALS['linpha']->sql->config->value['plugins_maps_google_key']; ?>" type="text/javascript"></script>
+ <?php /* <script type="text/javascript" src="http://www.google.com/jsapi?key=<?php echo $GLOBALS['linpha']->sql->config->value['plugins_maps_google_key']; ?>"></script> */ ?>
+ <?php /*<script type="text/javascript" language="JavaScript" src="<?php echo LINPHA_CLIENT; ?>/lib/plugins/maps/class.googlemaps.js"></script>*/ ?>
+ <script type="text/javascript" language="JavaScript">
+ linYUILoader.addModule({
+ name: 'linMapsClassJS',
+ type: 'js',
+ fullpath: LINPHA_CLIENT + '/lib/plugins/maps/class.googlemaps.YUI.js',
+ varName: 'linMapsClassJS'
+ });
+ </script>
<?php
/**
@@ -42,5 +54,20 @@
<script type="text/javascript" language="JavaScript" src="<?php echo LINPHA_CLIENT; ?>/lib/plugins/maps/class.xyz.js"></script>
<?php
}
+
?>
-<script type="text/javascript" language="JavaScript" src="<?php echo LINPHA_CLIENT; ?>/lib/plugins/maps/LinMaps.js"></script>
+
+
+<?php /*<script type="text/javascript" language="JavaScript" src="<?php echo LINPHA_CLIENT; ?>/lib/plugins/maps/LinMaps.js"></script>
+*/ ?>
+<script language="JavaScript" type="text/javascript">
+linYUILoader.addModule({
+ name: "linMapsJS",
+ type: "js",
+ fullpath: LINPHA_CLIENT + "/lib/plugins/maps/LinMapsYUI.js",
+ varName: "linMapsJS",
+ requires: ["LinYUIPageJS", "linMapsClassJS", "dragdrop", "container"]
+});
+linYUILoader.require("linMapsJS");
+linYUILoader.insert();
+</script>
Modified: trunk/linpha2/templates/default/maps.html.php
===================================================================
--- trunk/linpha2/templates/default/maps.html.php 2008-04-26 19:27:58 UTC (rev 4926)
+++ trunk/linpha2/templates/default/maps.html.php 2008-04-26 19:28:25 UTC (rev 4927)
@@ -1,9 +1,8 @@
+<div id="linDivTop"></div>
+
<?php echo $linTpl->divRoundCorners('top','main'); ?>
<div id="linDivMain">
-
-<div id="linDivMapTop"></div>
-
<div id="linDivMapMain">
<div id="linDivMapNav"></div>
<div id="linDivMapResizeBorder" ondblClick="myLinMaps.toggleNav();"></div>
@@ -13,9 +12,9 @@
<div id="linDivMapBottom">
<form action="" style="margin: 0;">
<input type="text" id="linInputAddress" size="30">
- <input type="button" onclick="myLinMapObject.geocodeAddress( $('linInputAddress').value )" value="<?php
+ <input type="button" onclick="myLinMapObject.geocodeAddress()" value="<?php
echo i18n("Geocode"); ?>">
- <a href="javascript:myLinGlobal.createPopup('linDivPopupHelp');"><img style="border: 0;" src="<?php
+ <a href="javascript:myLinMaps.helpPopup.show();"><img style="border: 0;" src="<?php
echo LINPHA_CLIENT; ?>/lib/graphics/ss_random.gif" /></a>
<a href="javascript:myLinMaps.loadAlbums();"><?php echo i18n("Albums"); ?></a>
@@ -25,106 +24,121 @@
</div>
<?php echo $linTpl->divRoundCorners('bottom','main'); ?>
-<div id="linDivPopupHelp" style="display: none">
- <div>
- <b><?php echo i18n("Legend:"); ?></b><br /><br />
- <img src="http://maps.google.com/mapfiles/ms/micons/red-dot.png" style="vertical-align:middle" alt="red" />
- <?php echo i18n("Current Marker"); ?><br /><br />
- <img src="http://maps.google.com/mapfiles/ms/micons/purple-dot.png" style="vertical-align:middle" alt="blue" />
- <?php echo i18n("Location Marker"); ?><br /><br />
- <img src="http://maps.google.com/mapfiles/ms/micons/blue-dot.png" style="vertical-align:middle" alt="purple" />
- <?php echo i18n("Location Marker With Assigned Albums"); ?><br /><br />
- <img src="http://maps.google.com/mapfiles/ms/micons/green-dot.png" style="vertical-align:middle" alt="green" />
- <?php echo i18n("Location Marker With Assigned Images (GPS)"); ?><br /><br />
- <img src="http://maps.google.com/mapfiles/ms/micons/yellow-dot.png" style="vertical-align:middle" alt="yellow" />
- <?php echo i18n("Images"); ?><br /><br />
- </div>
-
- <?php
- if( $GLOBALS['linpha']->sql->checkPermission('plugins_maps_setMarkers') )
- {
- ?>
- <br />
- <div>
- <b>Create marker:</b><br />
- 1. Enter address or just press "Geocode"<br />
- 2. Drag the marker to fine adjust<br />
- 3. Check marker name<br />
- 4. Press "Save"<br />
- <br />
- <b>Assign albums:</b><br />
- 1. Click on a marker<br />
- 2. Press "Assign album"<br />
- 3. Choose album and press "Save"<br />
- 4. Repeat for multiple albums<br />
- <br />
- <b>Assign images to an album marker:</b><br />
- This is done automatically. But it's required that your images have the
- GPS information stored inside. You will need a GPS Data Logger to do this
- automatically. It is also possible do it manually. Robogeo is a tool, but
- it is not free.<br />
- </div>
-
- <div>
- <b>Not assigned images:</b><br />
- albums/album1 (22 images)<br />
- </div>
- <?php
- }
- ?>
-</div>
-<div id="linDivPopupAlbums" style="display: none;">
- <br />
- <?php echo i18n("Please select the album to show in Google Maps:"); ?>
- <div id="linDivMapAlbums"></div>
-</div>
+<div id="linDivPanelContainer" class="yui-skin-sam">
-<div id="linDivEditMarker" style="display: none;">
- <fieldset style="width: 350px;"><legend><?php echo i18n("Create New Marker"); ?></legend>
- <label for="linInputMarkerName" class="linInputEditMarker"><?php echo i18n("Marker Name"); ?>:
- </label><input type="text" id="linInputMarkerName" name="linInputMarkerName" size="31" /><br />
- <label for="linInputLat" class="linInputEditMarker"><?php echo i18n("Lat/Lon/Zoom"); ?>:
- </label><input type="text" id="linInputLat" name="linInputLat" size="10" />
- <input type="text" id="linInputLon" name="linInputLon" size="10" />
- <input type="text" id="linInputZoom" name="linInputZoom" size="1" />
+ <div id="linDivPopupHelp" style="display: none">
+ <div class="hd"><?php echo i18n("Help"); ?></div>
+ <div class="bd">
+
+ <div>
+ <b><?php echo i18n("Legend:"); ?></b><br /><br />
+ <img src="http://maps.google.com/mapfiles/ms/micons/red-dot.png" style="vertical-align:middle" alt="red" />
+ <?php echo i18n("Current Marker"); ?><br /><br />
+ <img src="http://maps.google.com/mapfiles/ms/micons/purple-dot.png" style="vertical-align:middle" alt="blue" />
+ <?php echo i18n("Location Marker"); ?><br /><br />
+ <img src="http://maps.google.com/mapfiles/ms/micons/blue-dot.png" style="vertical-align:middle" alt="purple" />
+ <?php echo i18n("Location Marker With Assigned Albums"); ?><br /><br />
+ <img src="http://maps.google.com/mapfiles/ms/micons/green-dot.png" style="vertical-align:middle" alt="green" />
+ <?php echo i18n("Location Marker With Assigned Images (GPS)"); ?><br /><br />
+ <img src="http://maps.google.com/mapfiles/ms/micons/yellow-dot.png" style="vertical-align:middle" alt="yellow" />
+ <?php echo i18n("Images"); ?><br /><br />
+ </div>
+
+ <?php
+ if( $GLOBALS['linpha']->sql->checkPermission('plugins_maps_setMarkers') )
+ {
+ ?>
+ <div style="height: 200px; overflow: auto">
+ <br />
+ <b>Create marker:</b><br />
+ 1. Enter address or just press "Geocode"<br />
+ 2. Drag the marker to fine adjust<br />
+ 3. Check marker name<br />
+ 4. Press "Save"<br />
+ <br />
+ <b>Assign albums:</b><br />
+ 1. Click on a marker<br />
+ 2. Press "Assign album"<br />
+ 3. Choose album and press "Save"<br />
+ 4. Repeat for multiple albums<br />
+ <br />
+ <b>Assign images to an album marker:</b><br />
+ This is done automatically. But it's required that your images have the
+ GPS information stored inside. You will need a GPS Data Logger to do this
+ automatically. It is also possible do it manually. Robogeo is a tool for that, but
+ it is not free.<br />
+
+ <br />
+ <b>Not assigned images:</b><br />
+ albums/album1 (22 images)<br />
+ </div>
+ <?php
+ }
+ ?>
+ </div>
+ </div>
- <br /><br />
- <input type="submit" value="<?php echo i18n("Save"); ?>" />
- <input type="button" value="<?php echo i18n("Cancel"); ?>" onclick="myLinMaps.removeEditMarker()"/>
- <input type="hidden" name="cmd" value="saveMarker" />
-
- </fieldset>
+ <div id="linDivPopupAlbums" style="display: none;">
+ <div class="hd"><?php echo i18n("Albums"); ?></div>
+ <div class="bd">
+ <?php echo i18n("Please select the album to show in Google Maps:"); ?>
+ <br />
+ <div id="linDivMapAlbums"></div>
+ </div>
+ <div class="ft"></div>
+ </div>
+
+ <div id="linDivEditMarker" style="display: none">
+ <fieldset style="width: 350px;"><legend><?php echo i18n("Create New Marker"); ?></legend>
+ <label for="linInputMarkerName" class="linInputEditMarker"><?php echo i18n("Marker Name"); ?>:
+ </label><input type="text" id="linInputMarkerName" name="linInputMarkerName" size="31" /><br />
+ <label for="linInputLat" class="linInputEditMarker"><?php echo i18n("Lat/Lon/Zoom"); ?>:
+ </label><input type="text" id="linInputLat" name="linInputLat" size="10" />
+ <input type="text" id="linInputLon" name="linInputLon" size="10" />
+ <input type="text" id="linInputZoom" name="linInputZoom" size="1" />
+
+ <br /><br />
+ <input type="submit" value="<?php echo i18n("Save"); ?>" />
+ <input type="button" value="<?php echo i18n("Cancel"); ?>" onclick="myLinMaps.removeEditMarker()"/>
+ <input type="hidden" name="cmd" value="saveMarker" />
+
+ </fieldset>
+ </div>
</div>
<div id="linDivLoadingOuter" style="display: none;" class="linBackground">
- <?php echo $linTpl->divRoundCorners('top','main'); ?>
<div id="linDivLoading">
<img src="<?php echo LINPHA_CLIENT; ?>/lib/graphics/loading.gif" />
</div>
- <?php echo $linTpl->divRoundCorners('bottom','main'); ?>
</div>
+
<script language="JavaScript" type="text/javascript">
function linGetMarkerHtml(markerNode)
{
- var htmlStr = '<b>' + markerNode.name + '</b><br />';
+ htmlStr = [];
+ idx = 0;
+
+ htmlStr[idx++] = '<b>' + markerNode.name + '</b><br />';
if( markerNode.type == 'images' )
{
- htmlStr += '<img src="'+imageSrc+markerNode.id+'" width="' +
- linMapsMarkerThumbSize+'" >' + markerNode.text;
+ htmlStr[idx++] = '<a href="javascript:myLinMapObject.openImage(';
+ htmlStr[idx++] = (markerNode.index+1);
+ htmlStr[idx++] = ')"><img border="0" src="'+ imageSrc+markerNode.id;
+ htmlStr[idx++] = '" width="'+linMapsMarkerThumbSize+'" height="'+(linMapsMarkerThumbSize/markerNode.ratio);
+ htmlStr[idx++] = '"></a>' + markerNode.text;
$('thumb_'+markerNode.id).focus();
}
else
{
-
if( markerNode.albId != 0 ) {
- htmlStr += '<?php echo i18n("Album"); ?>: ' + markerNode.path + '<br />';
+ htmlStr[idx++] = '<?php echo i18n("Album"); ?>: ' + markerNode.path + '<br />';
if( markerNode.type == 'albumWithImg') {
- htmlStr += '<a href="javascript:myLinMaps.loadImages('+ markerNode.albId +')"><?php
+ htmlStr[idx++] = '<a href="javascript:myLinMaps.loadImages('+ markerNode.albId +')"><?php
echo i18n("Open Images"); ?></a><br />';
}
}
@@ -133,22 +147,22 @@
if( $GLOBALS['linpha']->sql->checkPermission('plugins_maps_setMarkers') )
{
?>
- htmlStr += '<br /><fieldset style="width: 350px;"><legend><?php
+ htmlStr[idx++] = '<br /><fieldset style="width: 350px;"><legend><?php
echo i18n("Edit Marker"); ?></legend><form><select name="linInputAlbum" style="width: 250px;"><?php
linBuildAlbumSelect($with_all_albs_entry=false,$with_linebreaks=false); ?></select><br />';
if(markerNode.albId != 0)
{
- htmlStr += '<input type="button" value="<?php echo i18n("Change Assigned Album");
+ htmlStr[idx++] = '<input type="button" value="<?php echo i18n("Change Assigned Album");
?>" onclick="myLinMaps.assignAlbumChange(' + markerNode.id + ',this.form.linInputAlbum.value)">' +
'<input type="button" value="<?php echo i18n("Delete");
?>" onclick="myLinMaps.assignAlbumDelete(' + markerNode.id + ',0)"><br /><br />';
} else {
- htmlStr += '<input type="button" value="<?php echo i18n("Assign Album");
+ htmlStr[idx++] = '<input type="button" value="<?php echo i18n("Assign Album");
?>" onclick="myLinMaps.assignAlbum(' + markerNode.id + ', this.form.linInputAlbum.value)">';
}
- htmlStr += '<input type="button" value="<?php echo i18n("Delete Marker"); ?>" onclick="if(confirm(\'<?php
+ htmlStr[idx++] = '<input type="button" value="<?php echo i18n("Delete Marker"); ?>" onclick="if(confirm(\'<?php
echo sprintf(LIN_STR_CONFIRMDELETE, i18n("this marker"));
?>\')){myLinMaps.deleteMarker(' + markerNode.id + ');}"></form></fieldset>';
<?php
@@ -156,7 +170,7 @@
?>
}
- return htmlStr;
+ return htmlStr.join("");
}
</script>
Modified: trunk/linpha2/templates/default/menu.html.php
===================================================================
--- trunk/linpha2/templates/default/menu.html.php 2008-04-26 19:27:58 UTC (rev 4926)
+++ trunk/linpha2/templates/default/menu.html.php 2008-04-26 19:28:25 UTC (rev 4927)
@@ -76,22 +76,22 @@
if ($GLOBALS['linpha']->sql->isLoggedIn()) {
$html_login .= i18n("Welcome").' '.$_SESSION['user_name'].' ('.$_SESSION['user_displayname'].')<br />' .
- '<input type="hidden" name="cmd" value="logout" />' .
+ '<input type="hidden" name="linCmd" value="logout" />' .
'<input type="submit" name="submit" class="linButton" value="'.i18n("Logout").'" />';
} else {
$html_login .= '<br /><label for="linFormUsername" style="display: block; float: left; width: 80px;">' .
- i18n("Username").': </label><input style="width: 105px;" class="linForms" type="text" name="username" value="" id="linFormUsername" />' .
+ i18n("Username").': </label><input style="width: 105px;" class="linForms" type="text" name="linUsername" value="" id="linFormUsername" />' .
'<br /><label for="linFormPassword" style="display: block; float: left; width: 80px;">' .
- i18n("Password").': </label><input style="width: 105px;" class="linForms" type="password" name="password" value="" id="linFormPassword" />' .
+ i18n("Password").': </label><input style="width: 105px;" class="linForms" type="password" name="linPassword" value="" id="linFormPassword" />' .
'<br /><br />';
if ($GLOBALS['linpha']->sql->config->value['sys_session_autologin']) {
$html_login .= '<label for="linFormCheckboxRemember">' .
- '<input type="checkbox" name="rememberme" value="true" id="linFormCheckboxRemember" />' .
+ '<input type="checkbox" name="linRememberme" value="true" id="linFormCheckboxRemember" />' .
i18n("Remember Me").'</label>';
}
- $html_login .= '<input type="hidden" name="cmd" value="login" />' .
+ $html_login .= '<input type="hidden" name="linCmd" value="login" />' .
'<input type="submit" name="submit" class="linButton" value="'.i18n("Login").'" /><br /><br />' .
'<div style="font-size: smaller; border: 0px;">'.i18n("You must have cookies enabled to log in.").'</div>';
}
@@ -115,8 +115,10 @@
echo '[';
reset($linTpl->menuFinal);
- list($key, $menuEntry) = each($linTpl->menuFinal);
$prevIsIcon = false;
+
+ /*list($key, $menuEntry) = each($linTpl->menuFinal);
+
if (isset( $menu[$key] )) {
echo $menu[$key];
} elseif (isset($linTpl->menuJSCook[$key])) {
@@ -125,16 +127,21 @@
echo '["'.linEscapeQuotes($menu[$key.'_img']).'", " ", "'.linEscapeQuotes($menuEntry['link']).'", null, null]';
$prevIsIcon = true;
} else {
- echo '[null, "'.linEscapeQuotes($menuEntry['name']).'", "'.linEscapeQuotes($menuEntry['link']).'", null, null]';
+ echo '[null, "'.linEscapeQuotes($menuEntry['name']).'", "'.linEscapeQuotes(linConvertAmp($menuEntry['link'])).'", null, null]';
}
+ */
+
for($i=1; list($key, $menuEntry) = each($linTpl->menuFinal); $i++)
{
- // separate icons
- if (isset( $menu[$key.'_img'] ) && $prevIsIcon) {
- echo ','."\n";
- } else {
- echo ',"_cmSplit",'."\n";
+ if ($i!=1)
+ {
+ // separate icons
+ if (isset( $menu[$key.'_img'] ) && $prevIsIcon) {
+ echo ','."\n";
+ } else {
+ echo ',"_cmSplit",'."\n";
+ }
}
$prevIsIcon = false;
Modified: trunk/linpha2/templates/default/search.html.php
===================================================================
--- trunk/linpha2/templates/default/search.html.php 2008-04-26 19:27:58 UTC (rev 4926)
+++ trunk/linpha2/templates/default/search.html.php 2008-04-26 19:28:25 UTC (rev 4927)
@@ -72,7 +72,7 @@
* get text fields
*/
$query = $GLOBALS['linpha']->db->Execute("SELECT id, name FROM ".LIN_PREFIX."meta_fields WHERE field_type = '1' AND (flags = '5' OR flags = '7')");
- while($data = $query->FetchRow())
+ while ($data = $query->FetchRow())
{
echo '<input type="checkbox" id="b_'.$data['id'].'" name="button[meta]['.$data['id'].']" value="1"'.(isset($_REQUEST['button']['meta'][$data['id']]) ? ' checked' : '').'>';
echo '<label for="b_'.$data['id'].'">'.$data['name'].'</label><br />';
@@ -83,21 +83,20 @@
/**
* Exif/Iptc/Xmp Informations
*/
- $array = Array('exif','iptc','xmp');
- foreach($array AS $meta_type)
+ $array = array('exif','iptc','xmp');
+ foreach ($array as $meta_type)
{
- if($GLOBALS['linpha']->sql->config->value['sys_image_'.$meta_type])
+ if ($GLOBALS['linpha']->sql->config->value['sys_image_'.$meta_type])
{
- $MetaData->setMetaFields($meta_type);
- $exif_count = $MetaData->defined_fields[$meta_type];
+ //$exif_count = $MetaData->defined_fields[$meta_type];
?>
<br /><b><?php echo i18n("Search").strtoupper($meta_type); ?></b><br />
<input type="checkbox" id="b_<?php echo $meta_type; ?>_all" name="button[<?php echo $meta_type; ?>][all]" value="1"<?php echo isset($_REQUEST['b_'.$meta_type.'_all']) ? ' checked' : ''; ?> onClick="check_all('b_<?php echo $meta_type; ?>_all','<?php echo $meta_type; ?>')"><label for="b_<?php echo $meta_type; ?>_all"><b><?php echo i18n("All"); ?></b></label>
<a href="javascript:div_expand('div_<?php echo $meta_type; ?>');"><img border="0" src="<?php echo $linTpl->themeFile('images/expand.gif'); ?>" /></a>
<br />
- <div id="div_<?php echo $meta_type; ?>" style="border: 1px solid black; width: 200px;">
+ <div id="div_<?php echo $meta_type; ?>" style="border: 1px solid black; width: 280px;">
<?php
- for($i=1; list($key,$value) = each($MetaData->defined_fields[$meta_type]); $i++)
+ for ($i=1; list($key,$value) = each(LinMetaData::$metaTags[$meta_type]); $i++)
{
echo '<input type="checkbox" id="b_'.$meta_type.'_'.$i.'" name="button['.$meta_type.']['.$key.']" value="1"';
echo isset($_REQUEST['button'][$meta_type][$key]) ? ' checked="checked">' : '>';
Modified: trunk/linpha2/templates/default/static.login.html.php
===================================================================
--- trunk/linpha2/templates/default/static.login.html.php 2008-04-26 19:27:58 UTC (rev 4926)
+++ trunk/linpha2/templates/default/static.login.html.php 2008-04-26 19:28:25 UTC (rev 4927)
@@ -7,7 +7,7 @@
echo i18n("Welcome").' '.$_SESSION['user_name'].' ('.$_SESSION['user_displayname'].')';
?>
<br />
- <input type="hidden" name="cmd" value="logout" />
+ <input type="hidden" name="linCmd" value="logout" />
<input type="submit" name="submit" class="linButton" value="<?php echo i18n("Logout"); ?>" />
<?php
@@ -15,25 +15,25 @@
?>
<br /><label for="linFormUsername" style="display: block; float: left; width: 80px;">
<?php echo i18n("Username"); ?>: </label>
- <input style="width: 105px;" class="linForms" type="text" name="username" value="" id="linFormUsername" />
+ <input style="width: 105px;" class="linForms" type="text" name="linUsername" value="" id="linFormUsername" />
<br /><label for="linFormPassword" style="display: block; float: left; width: 80px;">
<?php echo i18n("Password"); ?>: </label>
- <input style="width: 105px;" class="linForms" type="password" name="password" value="" id="linFormPassword" />
+ <input style="width: 105px;" class="linForms" type="password" name="linPassword" value="" id="linFormPassword" />
<br /><br />
<?php
if ($GLOBALS['linpha']->sql->config->value['sys_session_autologin']) {
?>
- <label for="linFormCheckboxRemember">
- <input type="checkbox" name="rememberme" value="true" id="linFormCheckboxRemember" />
+ <label for="linFormCheckboxRememberStatic">
+ <input type="checkbox" name="linRememberme" value="true" id="linFormCheckboxRememberStatic" />
<?php echo i18n("Remember Me"); ?>
</label>
<?php
}
?>
- <input type="hidden" name="cmd" value="login" />
+ <input type="hidden" name="linCmd" value="login" />
<input type="submit" name="submit" class="linButton" value="<?php echo i18n("Login"); ?>" /><br /><br />
<div style="font-size: smaller; border: 0px;"><?php echo i18n("You must have cookies enabled to log in."); ?></div>
<?php
Modified: trunk/linpha2/templates/default/viewer.head.php
===================================================================
--- trunk/linpha2/templates/default/viewer.head.php 2008-04-26 19:27:58 UTC (rev 4926)
+++ trunk/linpha2/templates/default/viewer.head.php 2008-04-26 19:28:25 UTC (rev 4927)
@@ -44,8 +44,8 @@
linYUILoader.require('tabview');
-linYUILoader.require('LinYUIGlobalJS');
-linYUILoader.require('LinYUIPageJS');
+//linYUILoader.require('LinYUIGlobalJS');
+//linYUILoader.require('LinYUIPageJS');
linYUILoader.require('LinYUIAlbumNavigationJS');
linYUILoader.require('LinYUIAlbumJS');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X