diff --git a/CL_brands.php b/CL_brands.php index 06b4258e..9ac8abca 100644 --- a/CL_brands.php +++ b/CL_brands.php @@ -59,11 +59,11 @@ function getBrandImg($brandID,$gliderName='',$glidetCat=0){ if ($brandID) { if (!isset($brandName) ) $brandName=$CONF['brands']['list'][$brandID]; if (is_file("$CONF_abs_path/img/brands/".sprintf("%03d",$brandID).".gif") ) - $gliderBrandImg="$brandName $gliderName"; + $gliderBrandImg="$brandName $gliderName"; else - $gliderBrandImg="$brandName $gliderName"; + $gliderBrandImg="$brandName $gliderName"; } else - $gliderBrandImg="$gliderName"; + $gliderBrandImg="$gliderName"; return $gliderBrandImg; } diff --git a/CL_flightData.php b/CL_flightData.php index 54dcae76..88deefcd 100644 --- a/CL_flightData.php +++ b/CL_flightData.php @@ -736,7 +736,8 @@ function getJsonFilename() { // Full url functions //---------------------------------------- function getFlightLinkURL() { - return "http://".$_SERVER['SERVER_NAME'].getRelMainFileName()."&op=show_flight&flightID=".$this->flightID; + return "http://".$_SERVER['SERVER_NAME']. + getLeonardoLink(array('op'=>'show_flight','flightID'=>$this->flightID)); } function getIGC_URL($saned=0) { @@ -3877,10 +3878,12 @@ function hideSameFlights() { $msg.= " Disabling "; $query="UPDATE $flightsTable SET private = private | 0x02 WHERE ID=".$fEntry['ID']; } - $msg.= " Flight ".$fEntry['ID']. - " from PILOT ". + $msg.= " 'show_flight','flightID'=>$fEntry['ID'])). + "'>Flight ".$fEntry['ID']. + " from 'pilot_profile','pilotIDview'=>$fEntry['userServerID'].'_'.$fEntry['userID'])). + "'>PILOT ". $fEntry['userServerID'].'_'.$fEntry['userID']."
\n"; $res= $db->sql_query($query); diff --git a/CL_gpsPoint.php b/CL_gpsPoint.php index 75d3013b..c95cfeb6 100644 --- a/CL_gpsPoint.php +++ b/CL_gpsPoint.php @@ -324,7 +324,10 @@ function exportXML($forceProtocol='') { if ($forceProtocol=='XML') $useJSON=0; else $useJSON=1; } - $link=htmlspecialchars ("http://".$_SERVER['SERVER_NAME'].getRelMainFileName()."&op=show_waypoint&waypointIDview=".$this->waypointID); + $link=htmlspecialchars ("http://".$_SERVER['SERVER_NAME']. + getLeonardoLink(array('op'=>'show_waypoint','waypointIDview'=>$this->waypointID)) + ); + if (!$useJSON) { return " diff --git a/EXT_flight.php b/EXT_flight.php index 9460519e..b8776228 100644 --- a/EXT_flight.php +++ b/EXT_flight.php @@ -61,7 +61,7 @@ $XML_str="\n"; $XML_str.=" Leonardo at ".$_SERVER['SERVER_NAME']." :: Flight list - http://".$_SERVER['SERVER_NAME'].getRelMainFileName()." + http://".$_SERVER['SERVER_NAME'].getLeonardoLink(array('op'=>'list_flights')) ." ". gmdate('D, d M Y H:i:s', time()) . " GMT "; @@ -90,7 +90,9 @@ // $nearestWaypoint->getFromDB(); $name=getPilotRealName($row["userID"],$row["userServerID"]); - $link=htmlspecialchars ("http://".$_SERVER['SERVER_NAME'].getRelMainFileName()."&op=show_flight&flightID=".$row['ID']); + $link=htmlspecialchars ("http://".$_SERVER['SERVER_NAME']. + getLeonardoLink(array('op'=>'show_flight','flightID'=>$row['ID'])) + ); $this_year=substr($row[DATE],0,4); $linkIGC=htmlspecialchars ("http://".$_SERVER['SERVER_NAME'].getRelMainDir().$flightsRelPath."/".$row[userID]."/flights/".$this_year."/".$row[filename] ); @@ -151,7 +153,10 @@ $nearestWaypoint->getFromDB(); $name=getPilotRealName($row["userID"],$row["userServerID"]); - $link=htmlspecialchars ("http://".$_SERVER['SERVER_NAME'].getRelMainFileName()."&op=show_flight&flightID=".$row['ID']); + $link=htmlspecialchars ("http://".$_SERVER['SERVER_NAME']. + getLeonardoLink(array('op'=>'show_flight','flightID'=>$row['ID'])) + ); + $this_year=substr($row[DATE],0,4); $linkIGC=htmlspecialchars ("http://".$_SERVER['SERVER_NAME'].getRelMainDir().$flightsRelPath."/".$row[userID]."/flights/".$this_year."/".$row[filename] ); @@ -203,7 +208,7 @@ $XML_str=" Leonardo at ".$_SERVER['SERVER_NAME']." :: Flight list - http://".$_SERVER['SERVER_NAME'].getRelMainFileName()." + http://".$_SERVER['SERVER_NAME']. getLeonardoLink(array('op'=>'list_flights'))." Leonardo at ".$_SERVER['SERVER_NAME']." :: Flight list ".$CONF_admin_email." ".$CONF_admin_email." @@ -215,7 +220,9 @@ $nearestWaypoint->getFromDB(); $name=getPilotRealName($row["userID"],$row["userServerID"]); - $link=htmlspecialchars ("http://".$_SERVER['SERVER_NAME'].getRelMainFileName()."&op=show_flight&flightID=".$row['ID']); + $link=htmlspecialchars ("http://".$_SERVER['SERVER_NAME']. + getLeonardoLink(array('op'=>'show_flight','flightID'=>$row['ID'])) + ); $this_year=substr($row[DATE],0,4); $linkIGC=htmlspecialchars ("http://".$_SERVER['SERVER_NAME'].getRelMainDir().$flightsRelPath."/".$row[userID]."/flights/".$this_year."/".$row[filename] ); diff --git a/EXT_google_maps.php b/EXT_google_maps.php index 9fdfb729..4ab5db88 100644 --- a/EXT_google_maps.php +++ b/EXT_google_maps.php @@ -64,9 +64,7 @@ function createMarker(point, id , description, iconUrl, shadowUrl ) { var marker = new GMarker(point); } // Show this marker's index in the info window when it is clicked - /* var html = "" + description + "
"; - // html+=" "; - */ + GEvent.addListener(marker, "click", function() { getAjax('EXT_takeoff.php?op=get_info&wpID='+id,null,openMarkerInfoWindow); diff --git a/EXT_google_maps_track.php b/EXT_google_maps_track.php index 791b298f..39ac2040 100644 --- a/EXT_google_maps_track.php +++ b/EXT_google_maps_track.php @@ -315,10 +315,6 @@ function createWaypoint(point, id , description, iconUrl, shadowUrl ) { } else { var marker = new GMarker(point); } - // Show this marker's index in the info window when it is clicked - /* var html = "" + description + "
"; - html+=" "; - */ GEvent.addListener(marker, "click", function() { getAjax('EXT_takeoff.php?op=get_info&wpID='+id,null,openMarkerInfoWindow); diff --git a/EXT_takeoff.php b/EXT_takeoff.php index 96269a98..5ab4703e 100644 --- a/EXT_takeoff.php +++ b/EXT_takeoff.php @@ -55,7 +55,9 @@ // echo "".$description."
"._SITE_INFO."
"; } else { - echo "".$description."
"._SITE_INFO."
"; + echo "".$description."
'show_waypoint','waypointIDview'=>$wpID)) + ."\'>"._SITE_INFO."
"; } diff --git a/EXT_takeoff_functions.php b/EXT_takeoff_functions.php index caa5b7fd..8edb7405 100644 --- a/EXT_takeoff_functions.php +++ b/EXT_takeoff_functions.php @@ -92,7 +92,9 @@ echo "error in query :$query"; } - echo "$description
"; + echo "'show_waypoint','waypointIDview'=>$wpID)) + ."'>$description
"; @@ -104,14 +106,17 @@ $flightNum=mysql_num_rows($res); if ($flightNum>0) { - echo " Flights[ ".$flightNum." ]
"; - echo ""._SITE_RECORD.":"; + echo "'list_flights','takeoffID'=>$wpID, + 'year'=>0,'month'=>'0','season'=>'0','pilotID'='0_0','country'=>'0','cat'=>'0' + ))."' target='_blank'> Flights[ ".$flightNum." ]
"; + echo ""._SITE_RECORD.":"; - $row = mysql_fetch_assoc($res); + $row = mysql_fetch_assoc($res); - echo ''. - formatDistance($row['record_km'],1).''; + echo ''show_flight','flightID'=>$row['ID'])).'\'>'. + formatDistance($row['record_km'],1).''; } else { echo " No flights from this location"; } diff --git a/FN_flight.php b/FN_flight.php index 491c5ee0..be6d20e3 100644 --- a/FN_flight.php +++ b/FN_flight.php @@ -510,7 +510,7 @@ function extractGlider($lines) { } function getAddFlightErrMsg($result,$flightID) { - $callingURL="http://".$_SERVER['SERVER_NAME'].getRelMainFileName(); + $callingURL="http://".$_SERVER['SERVER_NAME']; if (is_array($flightID) ) { $flightID=$flightID[0]['ID']; } @@ -529,16 +529,22 @@ function getAddFlightErrMsg($result,$flightID) { break; case ADD_FLIGHT_ERR_SAME_DATE_FLIGHT: $errMsg=_THERE_IS_SAME_DATE_FLIGHT."

"._IF_YOU_WANT_TO_SUBSTITUTE_IT." ". - ""._DELETE_THE_OLD_ONE.""; + "'show_flight','flightID'=>$flightID)). + "'>"._DELETE_THE_OLD_ONE.""; break; case ADD_FLIGHT_ERR_SAME_FILENAME_FLIGHT: $errMsg=_THERE_IS_SAME_FILENAME_FLIGHT."

"._IF_YOU_WANT_TO_SUBSTITUTE_IT." ". - ""._DELETE_THE_OLD_ONE."

". + "'show_flight','flightID'=>$flightID)). + "'>"._DELETE_THE_OLD_ONE."

". _CHANGE_THE_FILENAME; break; case ADD_FLIGHT_ERR_SAME_HASH_FLIGHT: $errMsg=_THERE_IS_SAME_DATE_FLIGHT." (HASH)

"._IF_YOU_WANT_TO_SUBSTITUTE_IT." ". - ""._DELETE_THE_OLD_ONE.""; + "'show_flight','flightID'=>$flightID)). + "'>"._DELETE_THE_OLD_ONE.""; break; case ADD_FLIGHT_ERR_DATE_IN_THE_FUTURE: $errMsg="The date of the flight is in the future
Please use the Year-month-day not the US Year-day-month format"; diff --git a/FN_waypoint.php b/FN_waypoint.php index 9d3201be..ffaccf94 100644 --- a/FN_waypoint.php +++ b/FN_waypoint.php @@ -305,12 +305,17 @@ function makeWaypointPlacemark($waypointID,$returnCountryCode=0) { $flightNum=mysql_num_rows($res); $row = $db->sql_fetchrow($res); - $siteRecordLink="". + $siteRecordLink="'show_flight','flightID'=>$row['ID']))."'>". formatDistance($row['record_km'],1).""; } else $siteRecordLink=""; - $pointFlightsLink=""._See_flights_near_this_point." [ ".$flightNum." ]"; - $countryFlightsLink="countryCode."'>".$countries[$wpInfo->countryCode].""; + $pointFlightsLink="'list_flights','takeoffID'=>$waypointID,'year'=>'0','season'=>'0')) + ."'>"._See_flights_near_this_point." [ ".$flightNum." ]"; + $countryFlightsLink="'list_flights','takeoffID'=>'0','year'=>'0','season'=>'0','country'=>$wpInfo->countryCode)) + ."'>".$countries[$wpInfo->countryCode].""; if ($wpInfo->link) $siteLink=''.formatURL($wpInfo->link).''; else $siteLink="-"; diff --git a/GUI_EXT_waypoint_details.php b/GUI_EXT_waypoint_details.php index c064682c..745efa79 100644 --- a/GUI_EXT_waypoint_details.php +++ b/GUI_EXT_waypoint_details.php @@ -129,14 +129,15 @@ $flightNum=mysql_num_rows($res); $row = mysql_fetch_assoc($res); - echo "". - formatDistance($row['record_km'],1).""; + echo "'show_flight','flightID'=>$row["ID"])) + ."'>".formatDistance($row['record_km'],1).""; } ?> -

". +

'list_flights','takeoffID'=>$waypointIDview,'year'=>'0','month'=>'0','season'=>'0','pilotID'=>'0','country'=>'0','cat'=>'0'))."'>". _See_flights_near_this_point." [ ".$flightNum." ]"; ?> diff --git a/GUI_EXT_waypoint_details_admin.php b/GUI_EXT_waypoint_details_admin.php index 5a47da5c..1513b56b 100644 --- a/GUI_EXT_waypoint_details_admin.php +++ b/GUI_EXT_waypoint_details_admin.php @@ -167,14 +167,17 @@ $flightNum=mysql_num_rows($res); $row = mysql_fetch_assoc($res); - echo "". + echo "'show_flight','flightID'=>$row["ID"])) ."'>". formatDistance($row['record_km'],1).""; } ?> -

". +

'list_flights','takeoffID'=>$waypointIDview,'year'=>'0','month'=>'0', + 'season'=>'0','pilotID'=>'0','country'=>'0','cat'=>'0' + ))."'>". _See_flights_near_this_point." [ ".$flightNum." ]"; ?> diff --git a/GUI_admin.php b/GUI_admin.php index 82a72882..4e55c0fd 100644 --- a/GUI_admin.php +++ b/GUI_admin.php @@ -342,7 +342,9 @@ function chmodDir($dir){ } $orgIgcURL= "http://".$server->data['url_base']."/download.php?type=igc&zip=0&flightID=".$row["original_ID"]; - echo "$i. Flight ID: ".$row["ID"]." [".$row["dateAdded"]."] "; + echo "$i. Flight ID: 'show_flight','flightID'=>$row["ID"])) + ."' target=_blank>".$row["ID"]." [".$row["dateAdded"]."] "; // echo " [ ".$row['filename']." ] "; echo " IGC "; @@ -467,7 +469,9 @@ function chmodDir($dir){ } if ($newfilename=='') { - echo "$j. Flight ID: ".$row["ID"]." "; + echo "$j. Flight ID: 'show_flight','flightID'=>$row["ID"])) + ."' target=_blank>".$row["ID"]." "; echo "Latin filename for [ ".$row['filename']." ] is NULL!!!!!
"; $j++; @@ -515,7 +519,9 @@ function chmodDir($dir){ $i++; $newfilename=safeFilename( $newfilename); - echo "$i. Flight ID: ".$row["ID"]." will rename [".$row["filename"]."] ( $oldFilename ) to [ $newfilename ]
"; + echo "$i. Flight ID: 'show_flight','flightID'=>$row["ID"])) + ."' target=_blank>".$row["ID"]." will rename [".$row["filename"]."] ( $oldFilename ) to [ $newfilename ]
"; if ( $latinAvailable && $newfilename ) { $flight=new flight(); @@ -545,7 +551,9 @@ function chmodDir($dir){ echo "FOUND UTF !!!!!! :

"; } $newfilename=toLatin1($row['filename']); - echo "$i. Flight ID: ".$row["ID"]." [ $newfilename ] [".$row["dateAdded"]."] $status
"; + echo "$i. Flight ID: 'show_flight','flightID'=>$row["ID"])) + ."' target=_blank>".$row["ID"]." [ $newfilename ] [".$row["dateAdded"]."] $status
"; echo "$filenameUTF
"; continue; } diff --git a/GUI_filter.php b/GUI_filter.php index 7ec3df9e..4a308c36 100644 --- a/GUI_filter.php +++ b/GUI_filter.php @@ -13,9 +13,8 @@ -$filterUrl="http://".$_SERVER['SERVER_NAME'].getRelMainFileName()."&op=filter&fl_url=1"; -$redirectUrl="http://".$_SERVER['SERVER_NAME'].getRelMainFileName()."&op=list_flights&sortOrder=DATE&year=0&month=0&pilotID=0"; - +$filterUrl="http://".$_SERVER['SERVER_NAME'].getLeonardoLink(array('op'=>'filter','fl_url'=>'1')); +$redirectUrl="http://".$_SERVER['SERVER_NAME'].getLeonardoLink(array('op'=>'list_flights')); require_once dirname(__FILE__).'/CL_dialogfilter.php'; $dlgfilters=array(); diff --git a/GUI_list_comp.php b/GUI_list_comp.php index efd0c290..a18c8779 100644 --- a/GUI_list_comp.php +++ b/GUI_list_comp.php @@ -314,7 +314,7 @@ function sortArrayBest($arrayName,$countHowMany) { $legendRight.=" [ ".($startNum+1)."-".$endNum." "._From." ".$itemsNum ." ]"; if ($itemsNum==0) $legendRight="[ 0 ]"; - echo "
$legend
$legendRight
" ; + // echo "
$legend
$legendRight
" ; require_once dirname(__FILE__)."/MENU_second_menu.php"; @@ -355,8 +355,16 @@ function sortArrayBest($arrayName,$countHowMany) { echo "
'competition','comp'=>$subcatID) )."'>$subcatTitle
"; } - echo "
"; - + + + echo "
"; + + echo "
+
+
+

$legend

+
$legendRight
+
"; listCategory($leagueCategories[$leagueCategory]['legend'],$leagueCategories[$leagueCategory]['header'], $leagueCategories[$leagueCategory]['arrayName'],$leagueCategories[$leagueCategory]['formatFunction']); @@ -387,14 +395,16 @@ function listCategory($legend,$header, $arrayName, $formatFunction="") { global $flights; $legendRight=""; // show all pilots up to $CONF_compItemsPerPage - if ($tabID == ($_GET['comp']+0) ) $defaultTabStr=" tabbertabdefault"; + +/* if ($tabID == ($_GET['comp']+0) ) $defaultTabStr=" tabbertabdefault"; else $defaultTabStr=""; $tabID++; echo "
"; + */ $legend.=" (".$countHowMany." "._N_BEST_FLIGHTS.")"; - echo "
+ echo "
"; ?> diff --git a/GUI_list_flights.php b/GUI_list_flights.php index 3aee8991..772a1fe4 100644 --- a/GUI_list_flights.php +++ b/GUI_list_flights.php @@ -235,12 +235,19 @@ function replace_spaces($str) { $legendRight.=" [ ".($startNum+1)."-".$endNum." "._From." ".$itemsNum ." ]"; if ($itemsNum==0) $legendRight="[ 0 ]"; - echo "
+ if (0)echo "
$legend
$legendRight
" ; - + require_once dirname(__FILE__)."/MENU_second_menu.php"; + + echo "
+
+
+

$legend

+
$legendRight
+
"; listFlights($res,$legend, $queryExtraArray,$sortOrder); diff --git a/GUI_list_pilots.php b/GUI_list_pilots.php index 2c763c41..bc1747f7 100644 --- a/GUI_list_pilots.php +++ b/GUI_list_pilots.php @@ -198,12 +198,22 @@ $legendRight.=" [ ".($startNum+1)."-".$endNum." "._From." ".$itemsNum ." ]"; if ($itemsNum==0) $legendRight="[ 0 ]"; - echo "
+ + require_once dirname(__FILE__)."/MENU_second_menu.php"; + + if (0) echo "
$legend
$legendRight
" ; - require_once dirname(__FILE__)."/MENU_second_menu.php"; - + + + echo "
+
+
+

$legend

+
$legendRight
+
"; + listPilots($res,$legend,$queryExtraArray,$sortOrder,$is_comp); function printHeaderPilotsTotals($width,$sortOrder,$fieldName,$fieldDesc,$queryExtraArray,$is_comp) { diff --git a/GUI_list_takeoffs.php b/GUI_list_takeoffs.php index d0b8cc91..d89c8c05 100644 --- a/GUI_list_takeoffs.php +++ b/GUI_list_takeoffs.php @@ -109,12 +109,19 @@ return ; } $legendRight=""; - echo "
+ if (0) echo "
$legend
$legendRight
" ; require_once dirname(__FILE__)."/MENU_second_menu.php"; + echo "
+
+
+

$legend

+
$legendRight
+
"; + listTakeoffs($res,$legend,$queryExtraArray,$sortOrder); ?> diff --git a/GUI_waypoint_show.php b/GUI_waypoint_show.php index fa4a04d4..9eb1c25f 100644 --- a/GUI_waypoint_show.php +++ b/GUI_waypoint_show.php @@ -66,7 +66,8 @@ $flightNum=mysql_num_rows($res); $row = mysql_fetch_assoc($res); - echo "". + echo "'show_flight','flightID'=>$row['ID']))."'>". formatDistance($row['record_km'],1).""; } diff --git a/MENU_dates.php b/MENU_dates.php index 2c1a204b..9788a0f6 100644 --- a/MENU_dates.php +++ b/MENU_dates.php @@ -135,14 +135,12 @@
- - - + diff --git a/MENU_filter_menu.php b/MENU_filter_menu.php index b8de1166..9c7e4034 100644 --- a/MENU_filter_menu.php +++ b/MENU_filter_menu.php @@ -48,7 +48,7 @@ // but if we have a club or nac club -> do display! if ($clubID || ($showNacClubSelection && $nacid && $nacclubid) ) $displayFilterMenu|=0x04; - if ($op=='comp')$displayFilterMenu&=~0x04; + if ($op=='comp' || $op=='competition' ) $displayFilterMenu&=~(0x04|0x02|0x01); if ( ! $displayFilterMenu) return; @@ -56,7 +56,7 @@ $allCatDisplay=0; ?> -
+
diff --git a/MENU_second_menu.php b/MENU_second_menu.php index bcab3187..1365ea26 100644 --- a/MENU_second_menu.php +++ b/MENU_second_menu.php @@ -86,7 +86,6 @@ ?> -
-
-
-
-
-
- - -
-
- - - -
- - -
-
-
-
- -
-
- - -
-
+ - + - -
$legend
+ + + + + +
+ 'useCurrent','takeoffID'=>($takeoffID+0), + 'pilotID'=>$pilotID?($serverID+0).'_'.($pilotID+0):'0' ) ); + ?> + +
+ + + + + +
+
+
+ + + +
+
+ + + +
+ + +
+
+
+ + +
+
+
+ 10 ) { +?> +
- \n
  • 'useCurrent','brandID'=>'0'))."'>"._All_Brands."
    • "; - foreach($brandsListFilter as $brandNameFilter=>$brandIDfilter) { - echo "
  • 'useCurrent','brandID'=>$brandIDfilter)). - "'>$brandNameFilter
    • "; - } - echo "\n"; - } - ?> - - -
    - - - - -
    - 'useCurrent','takeoffID'=>($takeoffID+0), - 'pilotID'=>$pilotID?($serverID+0).'_'.($pilotID+0):'0' ) ); - ?> - + } else { + echo "\n"; + } +?>
    - \ No newline at end of file +?> + +
    \ No newline at end of file diff --git a/MENU_top_menu.php b/MENU_top_menu.php index a8ce26f8..e9c67ca4 100644 --- a/MENU_top_menu.php +++ b/MENU_top_menu.php @@ -271,6 +271,7 @@
    • diff --git a/OP_flight.php b/OP_flight.php index 1a82b48a..f8bbe33d 100644 --- a/OP_flight.php +++ b/OP_flight.php @@ -92,7 +92,9 @@ function flights_find($arg) { $i=0; while ($row = mysql_fetch_assoc($res)) { $name=getPilotRealName($row["userID"],$row["serverID"]); - $link=htmlspecialchars ("http://".$_SERVER['SERVER_NAME'].getRelMainFileName()."&op=show_flight&flightID=".$row['ID']); + $link=htmlspecialchars ("http://".$_SERVER['SERVER_NAME']. + getLeonardoLink(array('op'=>'show_flight','flightID'=>$row['ID'])) + ); $this_year=substr($row['DATE'],0,4); $linkIGC=htmlspecialchars ("http://".$_SERVER['SERVER_NAME'].getRelMainDir().$flightsRelPath."/".$row[userID]."/flights/".$this_year."/".$row[filename] ); diff --git a/flight_submit.php b/flight_submit.php index 76f043f4..f6724e27 100644 --- a/flight_submit.php +++ b/flight_submit.php @@ -113,7 +113,9 @@ echo getAddFlightErrMsg($errCode,$flightID); } else { // echo "response=$flightID
    "; - echo _YOUR_FLIGHT_HAS_BEEN_SUBMITTED."

    "._PRESS_HERE_TO_VIEW_IT.''; + echo _YOUR_FLIGHT_HAS_BEEN_SUBMITTED."

    'show_flight','flightID'=>$flightID)). + "'>"._PRESS_HERE_TO_VIEW_IT.''; } // DEBUG_END(); diff --git a/img/list_header_c.gif b/img/list_header_c.gif new file mode 100644 index 00000000..02d5c467 Binary files /dev/null and b/img/list_header_c.gif differ diff --git a/img/list_header_l.gif b/img/list_header_l.gif new file mode 100644 index 00000000..dfcf77f0 Binary files /dev/null and b/img/list_header_l.gif differ diff --git a/img/list_header_r.gif b/img/list_header_r.gif new file mode 100644 index 00000000..15738519 Binary files /dev/null and b/img/list_header_r.gif differ diff --git a/img/toppanel_bg2.png b/img/toppanel_bg2.png new file mode 100644 index 00000000..70c1e06f Binary files /dev/null and b/img/toppanel_bg2.png differ diff --git a/img/toppanel_bg3.png b/img/toppanel_bg3.png new file mode 100644 index 00000000..f8fd9e33 Binary files /dev/null and b/img/toppanel_bg3.png differ diff --git a/rss.php b/rss.php index ce57b2d2..651015ed 100644 --- a/rss.php +++ b/rss.php @@ -68,7 +68,7 @@ http://leonardo.thenet.gr Leonardo at ".$_SERVER['SERVER_NAME']." :: Latest flights - http://".$_SERVER['SERVER_NAME'].getRelMainFileName()." + http://".$_SERVER['SERVER_NAME'].getLeonardoLink(array('op'=>'list_flights'))." el Leonardo at ".$_SERVER['SERVER_NAME']." :: Latest flights ".$CONF_admin_email." @@ -97,7 +97,7 @@ $link=htmlspecialchars ("http://".$_SERVER['SERVER_NAME']. getLeonardoLink(array('op'=>'show_flight','flightID'=>$row['flightID'])) ); -// getRelMainFileName()."&op=show_flight&flightID=".$row['flightID']); + if ($row['takeoffVinicity'] > $takeoffRadious ) $location=getWaypointName($row['takeoffID'])." [~".sprintf("%.1f",$row['takeoffVinicity']/1000)." km]"; diff --git a/templates/basic/style.css b/templates/basic/style.css index 55b19783..d242cecc 100644 --- a/templates/basic/style.css +++ b/templates/basic/style.css @@ -187,11 +187,18 @@ html>body .mainBox { .pagesDiv { float:right; - width:auto; - padding-right:5px; - margin:0px 0px 0px 0px; + width:auto; + margin:12px 0px 0px 0px; text-align:right; padding:3px; + padding-top:0; + overflow:visible; + + float:none; + display:block; + position:absolute; + bottom:2px; + right:10px; } .flightOpDiv { @@ -398,7 +405,7 @@ table.listTable tr:hover , table.listTable tr.sfhover { /* listTable for tabber needs to be 15 px less*/ .listTableTabber { -width:745px; +width:760px; } @@ -687,3 +694,9 @@ table.dropDownBox td { margin-bottom:0px; } + +.brandImageDiv { + height:16px; + overflow:visible; + display:inline; +} \ No newline at end of file