[Linpha-cvs] SF.net SVN: linpha: [4927] trunk/linpha2/templates/default
Status: Inactive
Brought to you by:
bzrudi
Menu
▾
▴
[Linpha-cvs] SF.net SVN: linpha: [4927] trunk/linpha2/templates/default
|
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.
|
![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}