From bf93473de529fc20ecb774e4f1ef5ca521f6a3b0 Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Tue, 22 Sep 2009 06:56:28 -0700 Subject: Revert "Change the exif module to respond to the gallery_ready event and check to see if gettext is installed. The 3rd party library used in the exif module expects gettext to be available. Rather than doing all the time use the gallery ready event to only do it when it might be needed. Fixes ticket #672" This reverts commit 33690a32bcf132e5ab470ff77ba23c073ac26271. --- modules/exif/helpers/exif_event.php | 8 -------- 1 file changed, 8 deletions(-) (limited to 'modules/exif') diff --git a/modules/exif/helpers/exif_event.php b/modules/exif/helpers/exif_event.php index 81ac5f44..826ec959 100644 --- a/modules/exif/helpers/exif_event.php +++ b/modules/exif/helpers/exif_event.php @@ -18,14 +18,6 @@ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ class exif_event_Core { - static function gallery_ready() { - if (!function_exists("gettext")) { - function gettext($message) { - return (string) t($message); - } - } - } - static function item_created($item) { if (!$item->is_album()) { exif::extract($item); -- cgit v1.2.3 From 1e7a2f58088cfef97be067d5b307ba95a170209b Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Tue, 22 Sep 2009 11:09:04 -0700 Subject: Implement the updated version of gallery3-vendor/exifer which has gettext replaced with calls to the gallery t method to provide translation. Fixes ticket 672. --- modules/exif/lib/exif.php | 202 ++++++++++++++--------------- modules/exif/lib/makers/canon.php | 234 +++++++++++++++++----------------- modules/exif/lib/makers/fujifilm.php | 118 ++++++++--------- modules/exif/lib/makers/nikon.php | 76 +++++------ modules/exif/lib/makers/olympus.php | 4 +- modules/exif/lib/makers/panasonic.php | 168 ++++++++++++------------ modules/exif/lib/makers/sanyo.php | 12 +- 7 files changed, 407 insertions(+), 407 deletions(-) (limited to 'modules/exif') diff --git a/modules/exif/lib/exif.php b/modules/exif/lib/exif.php index bd72f237..a7b0d13a 100644 --- a/modules/exif/lib/exif.php +++ b/modules/exif/lib/exif.php @@ -414,125 +414,125 @@ function formatData($type,$tag,$intel,$data) { if ($tag == '0112') { // Orientation // Example of how all of these tag formatters should be... switch ($data) { - case 1 : $data = gettext('1: Normal (0 deg)'); break; - case 2 : $data = gettext('2: Mirrored'); break; - case 3 : $data = gettext('3: Upsidedown'); break; - case 4 : $data = gettext('4: Upsidedown Mirrored'); break; - case 5 : $data = gettext('5: 90 deg CW Mirrored'); break; - case 6 : $data = gettext('6: 90 deg CCW'); break; - case 7 : $data = gettext('7: 90 deg CCW Mirrored'); break; - case 8 : $data = gettext('8: 90 deg CW'); break; - default : $data = gettext('Unknown').': '.$data; + case 1 : $data = (string) t('1: Normal (0 deg)'); break; + case 2 : $data = (string) t('2: Mirrored'); break; + case 3 : $data = (string) t('3: Upsidedown'); break; + case 4 : $data = (string) t('4: Upsidedown Mirrored'); break; + case 5 : $data = (string) t('5: 90 deg CW Mirrored'); break; + case 6 : $data = (string) t('6: 90 deg CCW'); break; + case 7 : $data = (string) t('7: 90 deg CCW Mirrored'); break; + case 8 : $data = (string) t('8: 90 deg CW'); break; + default : $data = (string) t('Unknown').': '.$data; } } else if ($tag == '0128' || $tag == 'a210' || $tag == '0128') { // ResolutionUnit and FocalPlaneResolutionUnit and ThumbnailResolutionUnit - if ($data == 1) $data = gettext('No Unit'); - else if ($data == 2) $data = gettext('Inch'); - else if ($data == 3) $data = gettext('Centimeter'); + if ($data == 1) $data = (string) t('No Unit'); + else if ($data == 2) $data = (string) t('Inch'); + else if ($data == 3) $data = (string) t('Centimeter'); } else if ($tag == '0213') { // YCbCrPositioning - if ($data == 1) $data = gettext('Center of Pixel Array'); - else if ($data == 2) $data = gettext('Datum Point'); + if ($data == 1) $data = (string) t('Center of Pixel Array'); + else if ($data == 2) $data = (string) t('Datum Point'); } else if ($tag == '8822') { // ExposureProgram - if ($data == 1) $data = gettext('Manual'); - else if ($data == 2) $data = gettext('Program'); - else if ($data == 3) $data = gettext('Aperture Priority'); - else if ($data == 4) $data = gettext('Shutter Priority'); - else if ($data == 5) $data = gettext('Program Creative'); - else if ($data == 6) $data = gettext('Program Action'); - else if ($data == 7) $data = gettext('Portrat'); - else if ($data == 8) $data = gettext('Landscape'); - else $data = gettext('Unknown').': '.$data; + if ($data == 1) $data = (string) t('Manual'); + else if ($data == 2) $data = (string) t('Program'); + else if ($data == 3) $data = (string) t('Aperture Priority'); + else if ($data == 4) $data = (string) t('Shutter Priority'); + else if ($data == 5) $data = (string) t('Program Creative'); + else if ($data == 6) $data = (string) t('Program Action'); + else if ($data == 7) $data = (string) t('Portrat'); + else if ($data == 8) $data = (string) t('Landscape'); + else $data = (string) t('Unknown').': '.$data; } else if ($tag == '9207') { // MeteringMode - if ($data == 0) $data = gettext('Unknown'); - else if ($data == 1) $data = gettext('Average'); - else if ($data == 2) $data = gettext('Center Weighted Average'); - else if ($data == 3) $data = gettext('Spot'); - else if ($data == 4) $data = gettext('Multi-Spot'); - else if ($data == 5) $data = gettext('Multi-Segment'); - else if ($data == 6) $data = gettext('Partial'); - else if ($data == 255) $data = gettext('Other'); - else $data = gettext('Unknown').': '.$data; + if ($data == 0) $data = (string) t('Unknown'); + else if ($data == 1) $data = (string) t('Average'); + else if ($data == 2) $data = (string) t('Center Weighted Average'); + else if ($data == 3) $data = (string) t('Spot'); + else if ($data == 4) $data = (string) t('Multi-Spot'); + else if ($data == 5) $data = (string) t('Multi-Segment'); + else if ($data == 6) $data = (string) t('Partial'); + else if ($data == 255) $data = (string) t('Other'); + else $data = (string) t('Unknown').': '.$data; } else if ($tag == '9208') { // LightSource - if ($data == 0) $data = gettext('Unknown or Auto'); - else if ($data == 1) $data = gettext('Daylight'); - else if ($data == 2) $data = gettext('Flourescent'); - else if ($data == 3) $data = gettext('Tungsten'); // 3 Tungsten (Incandescent light) + if ($data == 0) $data = (string) t('Unknown or Auto'); + else if ($data == 1) $data = (string) t('Daylight'); + else if ($data == 2) $data = (string) t('Flourescent'); + else if ($data == 3) $data = (string) t('Tungsten'); // 3 Tungsten (Incandescent light) // 4 Flash // 9 Fine Weather - else if ($data == 10) $data = gettext('Flash'); // 10 Cloudy Weather + else if ($data == 10) $data = (string) t('Flash'); // 10 Cloudy Weather // 11 Shade // 12 Daylight Fluorescent (D 5700 - 7100K) // 13 Day White Fluorescent (N 4600 - 5400K) // 14 Cool White Fluorescent (W 3900 -4500K) // 15 White Fluorescent (WW 3200 - 3700K) // 10 Flash - else if ($data == 17) $data = gettext('Standard Light A'); - else if ($data == 18) $data = gettext('Standard Light B'); - else if ($data == 19) $data = gettext('Standard Light C'); - else if ($data == 20) $data = gettext('D55'); - else if ($data == 21) $data = gettext('D65'); - else if ($data == 22) $data = gettext('D75'); - else if ($data == 23) $data = gettext('D50'); - else if ($data == 24) $data = gettext('ISO Studio Tungsten'); - else if ($data == 255) $data = gettext('Other'); - else $data = gettext('Unknown').': '.$data; + else if ($data == 17) $data = (string) t('Standard Light A'); + else if ($data == 18) $data = (string) t('Standard Light B'); + else if ($data == 19) $data = (string) t('Standard Light C'); + else if ($data == 20) $data = (string) t('D55'); + else if ($data == 21) $data = (string) t('D65'); + else if ($data == 22) $data = (string) t('D75'); + else if ($data == 23) $data = (string) t('D50'); + else if ($data == 24) $data = (string) t('ISO Studio Tungsten'); + else if ($data == 255) $data = (string) t('Other'); + else $data = (string) t('Unknown').': '.$data; } else if ($tag == '9209') { // Flash - if ($data == 0) $data = gettext('No Flash'); - else if ($data == 1) $data = gettext('Flash'); - else if ($data == 5) $data = gettext('Flash, strobe return light not detected'); - else if ($data == 7) $data = gettext('Flash, strobe return light detected'); - else if ($data == 9) $data = gettext('Compulsory Flash'); - else if ($data == 13) $data = gettext('Compulsory Flash, Return light not detected'); - else if ($data == 15) $data = gettext('Compulsory Flash, Return light detected'); - else if ($data == 16) $data = gettext('No Flash'); - else if ($data == 24) $data = gettext('No Flash'); - else if ($data == 25) $data = gettext('Flash, Auto-Mode'); - else if ($data == 29) $data = gettext('Flash, Auto-Mode, Return light not detected'); - else if ($data == 31) $data = gettext('Flash, Auto-Mode, Return light detected'); - else if ($data == 32) $data = gettext('No Flash'); - else if ($data == 65) $data = gettext('Red Eye'); - else if ($data == 69) $data = gettext('Red Eye, Return light not detected'); - else if ($data == 71) $data = gettext('Red Eye, Return light detected'); - else if ($data == 73) $data = gettext('Red Eye, Compulsory Flash'); - else if ($data == 77) $data = gettext('Red Eye, Compulsory Flash, Return light not detected'); - else if ($data == 79) $data = gettext('Red Eye, Compulsory Flash, Return light detected'); - else if ($data == 89) $data = gettext('Red Eye, Auto-Mode'); - else if ($data == 93) $data = gettext('Red Eye, Auto-Mode, Return light not detected'); - else if ($data == 95) $data = gettext('Red Eye, Auto-Mode, Return light detected'); - else $data = gettext('Unknown').': '.$data; + if ($data == 0) $data = (string) t('No Flash'); + else if ($data == 1) $data = (string) t('Flash'); + else if ($data == 5) $data = (string) t('Flash, strobe return light not detected'); + else if ($data == 7) $data = (string) t('Flash, strobe return light detected'); + else if ($data == 9) $data = (string) t('Compulsory Flash'); + else if ($data == 13) $data = (string) t('Compulsory Flash, Return light not detected'); + else if ($data == 15) $data = (string) t('Compulsory Flash, Return light detected'); + else if ($data == 16) $data = (string) t('No Flash'); + else if ($data == 24) $data = (string) t('No Flash'); + else if ($data == 25) $data = (string) t('Flash, Auto-Mode'); + else if ($data == 29) $data = (string) t('Flash, Auto-Mode, Return light not detected'); + else if ($data == 31) $data = (string) t('Flash, Auto-Mode, Return light detected'); + else if ($data == 32) $data = (string) t('No Flash'); + else if ($data == 65) $data = (string) t('Red Eye'); + else if ($data == 69) $data = (string) t('Red Eye, Return light not detected'); + else if ($data == 71) $data = (string) t('Red Eye, Return light detected'); + else if ($data == 73) $data = (string) t('Red Eye, Compulsory Flash'); + else if ($data == 77) $data = (string) t('Red Eye, Compulsory Flash, Return light not detected'); + else if ($data == 79) $data = (string) t('Red Eye, Compulsory Flash, Return light detected'); + else if ($data == 89) $data = (string) t('Red Eye, Auto-Mode'); + else if ($data == 93) $data = (string) t('Red Eye, Auto-Mode, Return light not detected'); + else if ($data == 95) $data = (string) t('Red Eye, Auto-Mode, Return light detected'); + else $data = (string) t('Unknown').': '.$data; } else if ($tag == 'a001') { // ColorSpace - if ($data == 1) $data = gettext('sRGB'); - else $data = gettext('Uncalibrated'); + if ($data == 1) $data = (string) t('sRGB'); + else $data = (string) t('Uncalibrated'); } else if ($tag == 'a002' || $tag == 'a003') { // ExifImageWidth/Height - $data = $data. ' '.gettext('pixels'); + $data = $data. ' '.(string) t('pixels'); } else if ($tag == '0103') { // Compression - if ($data == 1) $data = gettext('No Compression'); - else if ($data == 6) $data = gettext('Jpeg Compression'); - else $data = gettext('Unknown').': '.$data; + if ($data == 1) $data = (string) t('No Compression'); + else if ($data == 6) $data = (string) t('Jpeg Compression'); + else $data = (string) t('Unknown').': '.$data; } else if ($tag == 'a217') { // SensingMethod - if ($data == 1) $data = gettext('Not defined'); - if ($data == 2) $data = gettext('One Chip Color Area Sensor'); - if ($data == 3) $data = gettext('Two Chip Color Area Sensor'); - if ($data == 4) $data = gettext('Three Chip Color Area Sensor'); - if ($data == 5) $data = gettext('Color Sequential Area Sensor'); - if ($data == 7) $data = gettext('Trilinear Sensor'); - if ($data == 8) $data = gettext('Color Sequential Linear Sensor'); - else $data = gettext('Unknown').': '.$data; + if ($data == 1) $data = (string) t('Not defined'); + if ($data == 2) $data = (string) t('One Chip Color Area Sensor'); + if ($data == 3) $data = (string) t('Two Chip Color Area Sensor'); + if ($data == 4) $data = (string) t('Three Chip Color Area Sensor'); + if ($data == 5) $data = (string) t('Color Sequential Area Sensor'); + if ($data == 7) $data = (string) t('Trilinear Sensor'); + if ($data == 8) $data = (string) t('Color Sequential Linear Sensor'); + else $data = (string) t('Unknown').': '.$data; } else if ($tag == '0106') { // PhotometricInterpretation - if ($data == 1) $data = gettext('Monochrome'); - else if ($data == 2) $data = gettext('RGB'); - else if ($data == 6) $data = gettext('YCbCr'); - else $data = gettext('Unknown').': '.$data; + if ($data == 1) $data = (string) t('Monochrome'); + else if ($data == 2) $data = (string) t('RGB'); + else if ($data == 6) $data = (string) t('YCbCr'); + else $data = (string) t('Unknown').': '.$data; } //} else if($tag=="a408" || $tag=="a40a") { // Contrast, Sharpness // switch($data) { @@ -559,17 +559,17 @@ function formatData($type,$tag,$intel,$data) { } else if ($type == 'UNDEFINED') { if ($tag == '9000' || $tag == 'a000' || $tag == '0002') { // ExifVersion,FlashPixVersion,InteroperabilityVersion - $data=gettext('version').' '.$data/100; + $data=(string) t('version').' '.$data/100; } if ($tag == 'a300') { // FileSource $data = bin2hex($data); $data = str_replace('00','',$data); - $data = str_replace('03',gettext('Digital Still Camera'),$data); + $data = str_replace('03',(string) t('Digital Still Camera'),$data); } if ($tag == 'a301') { // SceneType $data = bin2hex($data); $data = str_replace('00','',$data); - $data = str_replace('01',gettext('Directly Photographed'),$data); + $data = str_replace('01',(string) t('Directly Photographed'),$data); } if ($tag == '9101') { // ComponentsConfiguration $data = bin2hex($data); @@ -596,14 +596,14 @@ function formatData($type,$tag,$intel,$data) { function formatExposure($data) { if ($data > 0) { if ($data > 1) { - return round($data, 2).' '.gettext('sec'); + return round($data, 2).' '.(string) t('sec'); } else { $n=0; $d=0; ConvertToFraction($data, $n, $d); - return $n.'/'.$d.' '.gettext('sec'); + return $n.'/'.$d.' '.(string) t('sec'); } } else { - return gettext('Bulb'); + return (string) t('Bulb'); } } @@ -740,7 +740,7 @@ function read_exif_data_raw($path,$verbose) { if (!$in || !$seek) { // if the path was invalid, this error will catch it $result['Errors'] = 1; - $result['Error'][$result['Errors']] = gettext('The file could not be found.'); + $result['Error'][$result['Errors']] = (string) t('The file could not be found.'); return $result; } @@ -907,7 +907,7 @@ if ($result['ValidJpeg'] == 1) { $v = fseek($in,$globalOffset+$ExitOffset); if ($v == -1) { $result['Errors'] = $result['Errors']+1; - $result['Error'][$result['Errors']] = gettext('Couldnt Find SubIFD'); + $result['Error'][$result['Errors']] = (string) t('Couldnt Find SubIFD'); } //=========================================================== @@ -923,7 +923,7 @@ if ($result['ValidJpeg'] == 1) { } } else { $result['Errors'] = $result['Errors']+1; - $result['Error'][$result['Errors']] = gettext('Illegal size for SubIFD'); + $result['Error'][$result['Errors']] = (string) t('Illegal size for SubIFD'); } // Add the 35mm equivalent focal length: @@ -939,7 +939,7 @@ if ($result['ValidJpeg'] == 1) { $v = fseek($in,$globalOffset+$result['IFD1Offset']); if ($v == -1) { $result['Errors'] = $result['Errors']+1; - $result['Error'][$result['Errors']] = gettext('Couldnt Find IFD1'); + $result['Error'][$result['Errors']] = (string) t('Couldnt Find IFD1'); } //=========================================================== @@ -955,7 +955,7 @@ if ($result['ValidJpeg'] == 1) { } } else { $result['Errors'] = $result['Errors']+1; - $result['Error'][$result['Errors']] = gettext('Illegal size for IFD1'); + $result['Error'][$result['Errors']] = (string) t('Illegal size for IFD1'); } // If verbose output is on, include the thumbnail raw data... if ($result['VerboseOutput'] == 1 && $result['IFD1']['JpegIFOffset']>0 && $result['IFD1']['JpegIFByteCount']>0) { @@ -979,7 +979,7 @@ if ($result['ValidJpeg'] == 1) { $v = fseek($in,$globalOffset+$result['SubIFD']['ExifInteroperabilityOffset']); if ($v == -1) { $result['Errors'] = $result['Errors']+1; - $result['Error'][$result['Errors']] = gettext('Couldnt Find InteroperabilityIFD'); + $result['Error'][$result['Errors']] = (string) t('Couldnt Find InteroperabilityIFD'); } //=========================================================== @@ -995,7 +995,7 @@ if ($result['ValidJpeg'] == 1) { } } else { $result['Errors'] = $result['Errors']+1; - $result['Error'][$result['Errors']] = gettext('Illegal size for InteroperabilityIFD'); + $result['Error'][$result['Errors']] = (string) t('Illegal size for InteroperabilityIFD'); } fclose($in); fclose($seek); diff --git a/modules/exif/lib/makers/canon.php b/modules/exif/lib/makers/canon.php index 2470568b..75cf0b7b 100644 --- a/modules/exif/lib/makers/canon.php +++ b/modules/exif/lib/makers/canon.php @@ -79,151 +79,151 @@ function formatCanonData($type,$tag,$intel,$data,$exif,&$result) { if ($result['Bytes'] != strlen($data) / 2) return $result; //Bad chunk $result['Macro']=hexdec(intel2Moto(substr($data,$place,4)));$place+=4;//1 switch($result['Macro']) { - case 1: $result['Macro'] = gettext("Macro"); break; - case 2: $result['Macro'] = gettext("Normal"); break; - default: $result['Macro'] = gettext("Unknown"); + case 1: $result['Macro'] = (string) t("Macro"); break; + case 2: $result['Macro'] = (string) t("Normal"); break; + default: $result['Macro'] = (string) t("Unknown"); } $result['SelfTimer']=hexdec(intel2Moto(substr($data,$place,4)));$place+=4;//2 switch($result['SelfTimer']) { - case 0: $result['SelfTimer'] = gettext("Off"); break; - default: $result['SelfTimer'] .= gettext("/10s"); + case 0: $result['SelfTimer'] = (string) t("Off"); break; + default: $result['SelfTimer'] .= (string) t("/10s"); } $result['Quality']=hexdec(intel2Moto(substr($data,$place,4)));$place+=4;//3 switch($result['Quality']) { - case 2: $result['Quality'] = gettext("Normal"); break; - case 3: $result['Quality'] = gettext("Fine"); break; - case 5: $result['Quality'] = gettext("Superfine"); break; - default: $result['Quality'] = gettext("Unknown"); + case 2: $result['Quality'] = (string) t("Normal"); break; + case 3: $result['Quality'] = (string) t("Fine"); break; + case 5: $result['Quality'] = (string) t("Superfine"); break; + default: $result['Quality'] = (string) t("Unknown"); } $result['Flash']=hexdec(intel2Moto(substr($data,$place,4)));$place+=4;//4 switch($result['Flash']) { - case 0: $result['Flash'] = gettext("Off"); break; - case 1: $result['Flash'] = gettext("Auto"); break; - case 2: $result['Flash'] = gettext("On"); break; - case 3: $result['Flash'] = gettext("Red Eye Reduction"); break; - case 4: $result['Flash'] = gettext("Slow Synchro"); break; - case 5: $result['Flash'] = gettext("Auto + Red Eye Reduction"); break; - case 6: $result['Flash'] = gettext("On + Red Eye Reduction"); break; - case 16: $result['Flash'] = gettext("External Flash"); break; - default: $result['Flash'] = gettext("Unknown"); + case 0: $result['Flash'] = (string) t("Off"); break; + case 1: $result['Flash'] = (string) t("Auto"); break; + case 2: $result['Flash'] = (string) t("On"); break; + case 3: $result['Flash'] = (string) t("Red Eye Reduction"); break; + case 4: $result['Flash'] = (string) t("Slow Synchro"); break; + case 5: $result['Flash'] = (string) t("Auto + Red Eye Reduction"); break; + case 6: $result['Flash'] = (string) t("On + Red Eye Reduction"); break; + case 16: $result['Flash'] = (string) t("External Flash"); break; + default: $result['Flash'] = (string) t("Unknown"); } $result['DriveMode']=hexdec(intel2Moto(substr($data,$place,4)));$place+=4;//5 switch($result['DriveMode']) { - case 0: $result['DriveMode'] = gettext("Single/Timer"); break; - case 1: $result['DriveMode'] = gettext("Continuous"); break; - default: $result['DriveMode'] = gettext("Unknown"); + case 0: $result['DriveMode'] = (string) t("Single/Timer"); break; + case 1: $result['DriveMode'] = (string) t("Continuous"); break; + default: $result['DriveMode'] = (string) t("Unknown"); } $result['Unknown']=hexdec(intel2Moto(substr($data,$place,4)));$place+=4;//6 $result['FocusMode']=hexdec(intel2Moto(substr($data,$place,4)));$place+=4;//7 switch($result['FocusMode']) { - case 0: $result['FocusMode'] = gettext("One-Shot"); break; - case 1: $result['FocusMode'] = gettext("AI Servo"); break; - case 2: $result['FocusMode'] = gettext("AI Focus"); break; - case 3: $result['FocusMode'] = gettext("Manual Focus"); break; - case 4: $result['FocusMode'] = gettext("Single"); break; - case 5: $result['FocusMode'] = gettext("Continuous"); break; - case 6: $result['FocusMode'] = gettext("Manual Focus"); break; - default: $result['FocusMode'] = gettext("Unknown"); + case 0: $result['FocusMode'] = (string) t("One-Shot"); break; + case 1: $result['FocusMode'] = (string) t("AI Servo"); break; + case 2: $result['FocusMode'] = (string) t("AI Focus"); break; + case 3: $result['FocusMode'] = (string) t("Manual Focus"); break; + case 4: $result['FocusMode'] = (string) t("Single"); break; + case 5: $result['FocusMode'] = (string) t("Continuous"); break; + case 6: $result['FocusMode'] = (string) t("Manual Focus"); break; + default: $result['FocusMode'] = (string) t("Unknown"); } $result['Unknown']=hexdec(intel2Moto(substr($data,$place,4)));$place+=4;//8 $result['Unknown']=hexdec(intel2Moto(substr($data,$place,4)));$place+=4;//9 $result['ImageSize']=hexdec(intel2Moto(substr($data,$place,4)));$place+=4;//10 switch($result['ImageSize']) { - case 0: $result['ImageSize'] = gettext("Large"); break; - case 1: $result['ImageSize'] = gettext("Medium"); break; - case 2: $result['ImageSize'] = gettext("Small"); break; - default: $result['ImageSize'] = gettext("Unknown"); + case 0: $result['ImageSize'] = (string) t("Large"); break; + case 1: $result['ImageSize'] = (string) t("Medium"); break; + case 2: $result['ImageSize'] = (string) t("Small"); break; + default: $result['ImageSize'] = (string) t("Unknown"); } $result['EasyShooting']=hexdec(intel2Moto(substr($data,$place,4)));$place+=4;//11 switch($result['EasyShooting']) { - case 0: $result['EasyShooting'] = gettext("Full Auto"); break; - case 1: $result['EasyShooting'] = gettext("Manual"); break; - case 2: $result['EasyShooting'] = gettext("Landscape"); break; - case 3: $result['EasyShooting'] = gettext("Fast Shutter"); break; - case 4: $result['EasyShooting'] = gettext("Slow Shutter"); break; - case 5: $result['EasyShooting'] = gettext("Night"); break; - case 6: $result['EasyShooting'] = gettext("Black & White"); break; - case 7: $result['EasyShooting'] = gettext("Sepia"); break; - case 8: $result['EasyShooting'] = gettext("Portrait"); break; - case 9: $result['EasyShooting'] = gettext("Sport"); break; - case 10: $result['EasyShooting'] = gettext("Macro/Close-Up"); break; - case 11: $result['EasyShooting'] = gettext("Pan Focus"); break; - default: $result['EasyShooting'] = gettext("Unknown"); + case 0: $result['EasyShooting'] = (string) t("Full Auto"); break; + case 1: $result['EasyShooting'] = (string) t("Manual"); break; + case 2: $result['EasyShooting'] = (string) t("Landscape"); break; + case 3: $result['EasyShooting'] = (string) t("Fast Shutter"); break; + case 4: $result['EasyShooting'] = (string) t("Slow Shutter"); break; + case 5: $result['EasyShooting'] = (string) t("Night"); break; + case 6: $result['EasyShooting'] = (string) t("Black & White"); break; + case 7: $result['EasyShooting'] = (string) t("Sepia"); break; + case 8: $result['EasyShooting'] = (string) t("Portrait"); break; + case 9: $result['EasyShooting'] = (string) t("Sport"); break; + case 10: $result['EasyShooting'] = (string) t("Macro/Close-Up"); break; + case 11: $result['EasyShooting'] = (string) t("Pan Focus"); break; + default: $result['EasyShooting'] = (string) t("Unknown"); } $result['DigitalZoom']=hexdec(intel2Moto(substr($data,$place,4)));$place+=4;//12 switch($result['DigitalZoom']) { case 0: - case 65535: $result['DigitalZoom'] = gettext("None"); break; - case 1: $result['DigitalZoom'] = gettext("2x"); break; - case 2: $result['DigitalZoom'] = gettext("4x"); break; - default: $result['DigitalZoom'] = gettext("Unknown"); + case 65535: $result['DigitalZoom'] = (string) t("None"); break; + case 1: $result['DigitalZoom'] = (string) t("2x"); break; + case 2: $result['DigitalZoom'] = (string) t("4x"); break; + default: $result['DigitalZoom'] = (string) t("Unknown"); } $result['Contrast']=hexdec(intel2Moto(substr($data,$place,4)));$place+=4;//13 switch($result['Contrast']) { - case 0: $result['Contrast'] = gettext("Normal"); break; - case 1: $result['Contrast'] = gettext("High"); break; - case 65535: $result['Contrast'] = gettext("Low"); break; - default: $result['Contrast'] = gettext("Unknown"); + case 0: $result['Contrast'] = (string) t("Normal"); break; + case 1: $result['Contrast'] = (string) t("High"); break; + case 65535: $result['Contrast'] = (string) t("Low"); break; + default: $result['Contrast'] = (string) t("Unknown"); } $result['Saturation']=hexdec(intel2Moto(substr($data,$place,4)));$place+=4;//14 switch($result['Saturation']) { - case 0: $result['Saturation'] = gettext("Normal"); break; - case 1: $result['Saturation'] = gettext("High"); break; - case 65535: $result['Saturation'] = gettext("Low"); break; - default: $result['Saturation'] = gettext("Unknown"); + case 0: $result['Saturation'] = (string) t("Normal"); break; + case 1: $result['Saturation'] = (string) t("High"); break; + case 65535: $result['Saturation'] = (string) t("Low"); break; + default: $result['Saturation'] = (string) t("Unknown"); } $result['Sharpness']=hexdec(intel2Moto(substr($data,$place,4)));$place+=4;//15 switch($result['Sharpness']) { - case 0: $result['Sharpness'] = gettext("Normal"); break; - case 1: $result['Sharpness'] = gettext("High"); break; - case 65535: $result['Sharpness'] = gettext("Low"); break; - default: $result['Sharpness'] = gettext("Unknown"); + case 0: $result['Sharpness'] = (string) t("Normal"); break; + case 1: $result['Sharpness'] = (string) t("High"); break; + case 65535: $result['Sharpness'] = (string) t("Low"); break; + default: $result['Sharpness'] = (string) t("Unknown"); } $result['ISO']=hexdec(intel2Moto(substr($data,$place,4)));$place+=4;//16 switch($result['ISO']) { case 32767: case 0: $result['ISO'] = isset($exif['SubIFD']['ISOSpeedRatings']) ? $exif['SubIFD']['ISOSpeedRatings'] : 'Unknown'; break; - case 15: $result['ISO'] = gettext("Auto"); break; - case 16: $result['ISO'] = gettext("50"); break; - case 17: $result['ISO'] = gettext("100"); break; - case 18: $result['ISO'] = gettext("200"); break; - case 19: $result['ISO'] = gettext("400"); break; - default: $result['ISO'] = gettext("Unknown"); + case 15: $result['ISO'] = (string) t("Auto"); break; + case 16: $result['ISO'] = (string) t("50"); break; + case 17: $result['ISO'] = (string) t("100"); break; + case 18: $result['ISO'] = (string) t("200"); break; + case 19: $result['ISO'] = (string) t("400"); break; + default: $result['ISO'] = (string) t("Unknown"); } $result['MeteringMode']=hexdec(intel2Moto(substr($data,$place,4)));$place+=4;//17 switch($result['MeteringMode']) { - case 3: $result['MeteringMode'] = gettext("Evaluative"); break; - case 4: $result['MeteringMode'] = gettext("Partial"); break; - case 5: $result['MeteringMode'] = gettext("Center-weighted"); break; - default: $result['MeteringMode'] = gettext("Unknown"); + case 3: $result['MeteringMode'] = (string) t("Evaluative"); break; + case 4: $result['MeteringMode'] = (string) t("Partial"); break; + case 5: $result['MeteringMode'] = (string) t("Center-weighted"); break; + default: $result['MeteringMode'] = (string) t("Unknown"); } $result['FocusType']=hexdec(intel2Moto(substr($data,$place,4)));$place+=4;//18 switch($result['FocusType']) { - case 0: $result['FocusType'] = gettext("Manual"); break; - case 1: $result['FocusType'] = gettext("Auto"); break; - case 3: $result['FocusType'] = gettext("Close-up (Macro)"); break; - case 8: $result['FocusType'] = gettext("Locked (Pan Mode)"); break; - default: $result['FocusType'] = gettext("Unknown"); + case 0: $result['FocusType'] = (string) t("Manual"); break; + case 1: $result['FocusType'] = (string) t("Auto"); break; + case 3: $result['FocusType'] = (string) t("Close-up (Macro)"); break; + case 8: $result['FocusType'] = (string) t("Locked (Pan Mode)"); break; + default: $result['FocusType'] = (string) t("Unknown"); } $result['AFPointSelected']=hexdec(intel2Moto(substr($data,$place,4)));$place+=4;//19 switch($result['AFPointSelected']) { - case 12288: $result['AFPointSelected'] = gettext("Manual Focus"); break; - case 12289: $result['AFPointSelected'] = gettext("Auto Selected"); break; - case 12290: $result['AFPointSelected'] = gettext("Right"); break; - case 12291: $result['AFPointSelected'] = gettext("Center"); break; - case 12292: $result['AFPointSelected'] = gettext("Left"); break; - default: $result['AFPointSelected'] = gettext("Unknown"); + case 12288: $result['AFPointSelected'] = (string) t("Manual Focus"); break; + case 12289: $result['AFPointSelected'] = (string) t("Auto Selected"); break; + case 12290: $result['AFPointSelected'] = (string) t("Right"); break; + case 12291: $result['AFPointSelected'] = (string) t("Center"); break; + case 12292: $result['AFPointSelected'] = (string) t("Left"); break; + default: $result['AFPointSelected'] = (string) t("Unknown"); } $result['ExposureMode']=hexdec(intel2Moto(substr($data,$place,4)));$place+=4;//20 switch($result['ExposureMode']) { - case 0: $result['ExposureMode'] = gettext("EasyShoot"); break; - case 1: $result['ExposureMode'] = gettext("Program"); break; - case 2: $result['ExposureMode'] = gettext("Tv"); break; - case 3: $result['ExposureMode'] = gettext("Av"); break; - case 4: $result['ExposureMode'] = gettext("Manual"); break; - case 5: $result['ExposureMode'] = gettext("Auto-DEP"); break; - default: $result['ExposureMode'] = gettext("Unknown"); + case 0: $result['ExposureMode'] = (string) t("EasyShoot"); break; + case 1: $result['ExposureMode'] = (string) t("Program"); break; + case 2: $result['ExposureMode'] = (string) t("Tv"); break; + case 3: $result['ExposureMode'] = (string) t("Av"); break; + case 4: $result['ExposureMode'] = (string) t("Manual"); break; + case 5: $result['ExposureMode'] = (string) t("Auto-DEP"); break; + default: $result['ExposureMode'] = (string) t("Unknown"); } $result['Unknown']=hexdec(intel2Moto(substr($data,$place,4)));$place+=4;//21 $result['Unknown']=hexdec(intel2Moto(substr($data,$place,4)));$place+=4;//22 @@ -237,26 +237,26 @@ function formatCanonData($type,$tag,$intel,$data,$exif,&$result) { $result['Unknown']=hexdec(intel2Moto(substr($data,$place,4)));$place+=4;//27 $result['FlashActivity']=hexdec(intel2Moto(substr($data,$place,4)));$place+=4;//28 switch($result['FlashActivity']) { - case 0: $result['FlashActivity'] = gettext("Flash Did Not Fire"); break; - case 1: $result['FlashActivity'] = gettext("Flash Fired"); break; - default: $result['FlashActivity'] = gettext("Unknown"); + case 0: $result['FlashActivity'] = (string) t("Flash Did Not Fire"); break; + case 1: $result['FlashActivity'] = (string) t("Flash Fired"); break; + default: $result['FlashActivity'] = (string) t("Unknown"); } $result['FlashDetails']=str_pad(base_convert(intel2Moto(substr($data,$place,4)), 16, 2), 16, "0", STR_PAD_LEFT);$place+=4;//29 $flashDetails = array(); - if (substr($result['FlashDetails'], 1, 1) == 1) { $flashDetails[] = gettext('External E-TTL'); } - if (substr($result['FlashDetails'], 2, 1) == 1) { $flashDetails[] = gettext('Internal Flash'); } - if (substr($result['FlashDetails'], 4, 1) == 1) { $flashDetails[] = gettext('FP sync used'); } - if (substr($result['FlashDetails'], 8, 1) == 1) { $flashDetails[] = gettext('2nd(rear)-curtain sync used'); } - if (substr($result['FlashDetails'], 12, 1) == 1) { $flashDetails[] = gettext('1st curtain sync'); } + if (substr($result['FlashDetails'], 1, 1) == 1) { $flashDetails[] = (string) t('External E-TTL'); } + if (substr($result['FlashDetails'], 2, 1) == 1) { $flashDetails[] = (string) t('Internal Flash'); } + if (substr($result['FlashDetails'], 4, 1) == 1) { $flashDetails[] = (string) t('FP sync used'); } + if (substr($result['FlashDetails'], 8, 1) == 1) { $flashDetails[] = (string) t('2nd(rear)-curtain sync used'); } + if (substr($result['FlashDetails'], 12, 1) == 1) { $flashDetails[] = (string) t('1st curtain sync'); } $result['FlashDetails']=implode(",", $flashDetails); $result['Unknown']=hexdec(intel2Moto(substr($data,$place,4)));$place+=4;//30 $result['Unknown']=hexdec(intel2Moto(substr($data,$place,4)));$place+=4;//31 $anotherFocusMode=hexdec(intel2Moto(substr($data,$place,4)));$place+=4;//32 if(strpos(strtoupper($exif['IFD0']['Model']), "G1") !== false) { switch($anotherFocusMode) { - case 0: $result['FocusMode'] = gettext("Single"); break; - case 1: $result['FocusMode'] = gettext("Continuous"); break; - default: $result['FocusMode'] = gettext("Unknown"); + case 0: $result['FocusMode'] = (string) t("Single"); break; + case 1: $result['FocusMode'] = (string) t("Continuous"); break; + default: $result['FocusMode'] = (string) t("Unknown"); } } @@ -271,14 +271,14 @@ function formatCanonData($type,$tag,$intel,$data,$exif,&$result) { $result['Unknown']=hexdec(intel2Moto(substr($data,$place,4)));$place+=4;//6 $result['WhiteBalance']=hexdec(intel2Moto(substr($data,$place,4)));$place+=4;//7 switch($result['WhiteBalance']) { - case 0: $result['WhiteBalance'] = gettext("Auto"); break; - case 1: $result['WhiteBalance'] = gettext("Sunny"); break; - case 2: $result['WhiteBalance'] = gettext("Cloudy"); break; - case 3: $result['WhiteBalance'] = gettext("Tungsten"); break; - case 4: $result['WhiteBalance'] = gettext("Fluorescent"); break; - case 5: $result['WhiteBalance'] = gettext("Flash"); break; - case 6: $result['WhiteBalance'] = gettext("Custom"); break; - default: $result['WhiteBalance'] = gettext("Unknown"); + case 0: $result['WhiteBalance'] = (string) t("Auto"); break; + case 1: $result['WhiteBalance'] = (string) t("Sunny"); break; + case 2: $result['WhiteBalance'] = (string) t("Cloudy"); break; + case 3: $result['WhiteBalance'] = (string) t("Tungsten"); break; + case 4: $result['WhiteBalance'] = (string) t("Fluorescent"); break; + case 5: $result['WhiteBalance'] = (string) t("Flash"); break; + case 6: $result['WhiteBalance'] = (string) t("Custom"); break; + default: $result['WhiteBalance'] = (string) t("Unknown"); } $result['Unknown']=hexdec(intel2Moto(substr($data,$place,4)));$place+=4;//8 $result['SequenceNumber']=hexdec(intel2Moto(substr($data,$place,4)));$place+=4;//9 @@ -288,13 +288,13 @@ function formatCanonData($type,$tag,$intel,$data,$exif,&$result) { $result['Unknown']=hexdec(intel2Moto(substr($data,$place,4)));$place+=4;//13 $result['AFPointUsed']=hexdec(intel2Moto(substr($data,$place,4)));$place+=4;//14 $afPointUsed = array(); - if ($result['AFPointUsed'] & 0x0001) $afPointUsed[] = gettext("Right"); //bit 0 - if ($result['AFPointUsed'] & 0x0002) $afPointUsed[] = gettext("Center"); //bit 1 - if ($result['AFPointUsed'] & 0x0004) $afPointUsed[] = gettext("Left"); //bit 2 - if ($result['AFPointUsed'] & 0x0800) $afPointUsed[] = gettext("12"); //bit 12 - if ($result['AFPointUsed'] & 0x1000) $afPointUsed[] = gettext("13"); //bit 13 - if ($result['AFPointUsed'] & 0x2000) $afPointUsed[] = gettext("14"); //bit 14 - if ($result['AFPointUsed'] & 0x4000) $afPointUsed[] = gettext("15"); //bit 15 + if ($result['AFPointUsed'] & 0x0001) $afPointUsed[] = (string) t("Right"); //bit 0 + if ($result['AFPointUsed'] & 0x0002) $afPointUsed[] = (string) t("Center"); //bit 1 + if ($result['AFPointUsed'] & 0x0004) $afPointUsed[] = (string) t("Left"); //bit 2 + if ($result['AFPointUsed'] & 0x0800) $afPointUsed[] = (string) t("12"); //bit 12 + if ($result['AFPointUsed'] & 0x1000) $afPointUsed[] = (string) t("13"); //bit 13 + if ($result['AFPointUsed'] & 0x2000) $afPointUsed[] = (string) t("14"); //bit 14 + if ($result['AFPointUsed'] & 0x4000) $afPointUsed[] = (string) t("15"); //bit 15 $result['AFPointUsed'] = implode(",", $afPointUsed); $result['FlashBias']=intel2Moto(substr($data,$place,4));$place+=4;//15 switch($result['FlashBias']) { @@ -315,7 +315,7 @@ function formatCanonData($type,$tag,$intel,$data,$exif,&$result) { case '0030': $result['FlashBias'] = "1.5 EV"; break; case '0034': $result['FlashBias'] = "1.67 EV"; break; case '0040': $result['FlashBias'] = "2 EV"; break; - default: $result['FlashBias'] = gettext("Unknown"); + default: $result['FlashBias'] = (string) t("Unknown"); } $result['Unknown']=hexdec(intel2Moto(substr($data,$place,4)));$place+=4;//16 $result['Unknown']=hexdec(intel2Moto(substr($data,$place,4)));$place+=4;//17 diff --git a/modules/exif/lib/makers/fujifilm.php b/modules/exif/lib/makers/fujifilm.php index 53f8dfb7..a88e51c3 100644 --- a/modules/exif/lib/makers/fujifilm.php +++ b/modules/exif/lib/makers/fujifilm.php @@ -84,89 +84,89 @@ function formatFujifilmData($type,$tag,$intel,$data) { $data=hexdec($data); if($tag=="1001") { //Sharpness - if($data == 1) $data = gettext("Soft"); - else if($data == 2) $data = gettext("Soft"); - else if($data == 3) $data = gettext("Normal"); - else if($data == 4) $data = gettext("Hard"); - else if($data == 5) $data = gettext("Hard"); - else $data = gettext("Unknown").": ".$data; + if($data == 1) $data = (string) t("Soft"); + else if($data == 2) $data = (string) t("Soft"); + else if($data == 3) $data = (string) t("Normal"); + else if($data == 4) $data = (string) t("Hard"); + else if($data == 5) $data = (string) t("Hard"); + else $data = (string) t("Unknown").": ".$data; } if($tag=="1002") { //WhiteBalance - if($data == 0) $data = gettext("Auto"); - else if($data == 256) $data = gettext("Daylight"); - else if($data == 512) $data = gettext("Cloudy"); - else if($data == 768) $data = gettext("DaylightColor-fluorescence"); - else if($data == 769) $data = gettext("DaywhiteColor-fluorescence"); - else if($data == 770) $data = gettext("White-fluorescence"); - else if($data == 1024) $data = gettext("Incandescence"); - else if($data == 3840) $data = gettext("Custom"); - else $data = gettext("Unknown").": ".$data; + if($data == 0) $data = (string) t("Auto"); + else if($data == 256) $data = (string) t("Daylight"); + else if($data == 512) $data = (string) t("Cloudy"); + else if($data == 768) $data = (string) t("DaylightColor-fluorescence"); + else if($data == 769) $data = (string) t("DaywhiteColor-fluorescence"); + else if($data == 770) $data = (string) t("White-fluorescence"); + else if($data == 1024) $data = (string) t("Incandescence"); + else if($data == 3840) $data = (string) t("Custom"); + else $data = (string) t("Unknown").": ".$data; } if($tag=="1003") { //Color - if($data == 0) $data = gettext("Chroma Saturation Normal(STD)"); - else if($data == 256) $data = gettext("Chroma Saturation High"); - else if($data == 512) $data = gettext("Chroma Saturation Low(ORG)"); - else $data = gettext("Unknown: ").$data; + if($data == 0) $data = (string) t("Chroma Saturation Normal(STD)"); + else if($data == 256) $data = (string) t("Chroma Saturation High"); + else if($data == 512) $data = (string) t("Chroma Saturation Low(ORG)"); + else $data = (string) t("Unknown: ").$data; } if($tag=="1004") { //Tone - if($data == 0) $data = gettext("Contrast Normal(STD)"); - else if($data == 256) $data = gettext("Contrast High(HARD)"); - else if($data == 512) $data = gettext("Contrast Low(ORG)"); - else $data = gettext("Unknown: ").$data; + if($data == 0) $data = (string) t("Contrast Normal(STD)"); + else if($data == 256) $data = (string) t("Contrast High(HARD)"); + else if($data == 512) $data = (string) t("Contrast Low(ORG)"); + else $data = (string) t("Unknown: ").$data; } if($tag=="1010") { //FlashMode - if($data == 0) $data = gettext("Auto"); - else if($data == 1) $data = gettext("On"); - else if($data == 2) $data = gettext("Off"); - else if($data == 3) $data = gettext("Red-Eye Reduction"); - else $data = gettext("Unknown: ").$data; + if($data == 0) $data = (string) t("Auto"); + else if($data == 1) $data = (string) t("On"); + else if($data == 2) $data = (string) t("Off"); + else if($data == 3) $data = (string) t("Red-Eye Reduction"); + else $data = (string) t("Unknown: ").$data; } if($tag=="1020") { //Macro - if($data == 0) $data = gettext("Off"); - else if($data == 1) $data = gettext("On"); - else $data = gettext("Unknown: ").$data; + if($data == 0) $data = (string) t("Off"); + else if($data == 1) $data = (string) t("On"); + else $data = (string) t("Unknown: ").$data; } if($tag=="1021") { //FocusMode - if($data == 0) $data = gettext("Auto"); - else if($data == 1) $data = gettext("Manual"); - else $data = gettext("Unknown: ").$data; + if($data == 0) $data = (string) t("Auto"); + else if($data == 1) $data = (string) t("Manual"); + else $data = (string) t("Unknown: ").$data; } if($tag=="1030") { //SlowSync - if($data == 0) $data = gettext("Off"); - else if($data == 1) $data = gettext("On"); - else $data = gettext("Unknown: ").$data; + if($data == 0) $data = (string) t("Off"); + else if($data == 1) $data = (string) t("On"); + else $data = (string) t("Unknown: ").$data; } if($tag=="1031") { //PictureMode - if($data == 0) $data = gettext("Auto"); - else if($data == 1) $data = gettext("Portrait"); - else if($data == 2) $data = gettext("Landscape"); - else if($data == 4) $data = gettext("Sports"); - else if($data == 5) $data = gettext("Night"); - else if($data == 6) $data = gettext("Program AE"); - else if($data == 256) $data = gettext("Aperture Priority AE"); - else if($data == 512) $data = gettext("Shutter Priority"); - else if($data == 768) $data = gettext("Manual Exposure"); - else $data = gettext("Unknown: ").$data; + if($data == 0) $data = (string) t("Auto"); + else if($data == 1) $data = (string) t("Portrait"); + else if($data == 2) $data = (string) t("Landscape"); + else if($data == 4) $data = (string) t("Sports"); + else if($data == 5) $data = (string) t("Night"); + else if($data == 6) $data = (string) t("Program AE"); + else if($data == 256) $data = (string) t("Aperture Priority AE"); + else if($data == 512) $data = (string) t("Shutter Priority"); + else if($data == 768) $data = (string) t("Manual Exposure"); + else $data = (string) t("Unknown: ").$data; } if($tag=="1100") { //ContinuousTakingBracket - if($data == 0) $data = gettext("Off"); - else if($data == 1) $data = gettext("On"); - else $data = gettext("Unknown: ").$data; + if($data == 0) $data = (string) t("Off"); + else if($data == 1) $data = (string) t("On"); + else $data = (string) t("Unknown: ").$data; } if($tag=="1300") { //BlurWarning - if($data == 0) $data = gettext("No Warning"); - else if($data == 1) $data = gettext("Warning"); - else $data = gettext("Unknown: ").$data; + if($data == 0) $data = (string) t("No Warning"); + else if($data == 1) $data = (string) t("Warning"); + else $data = (string) t("Unknown: ").$data; } if($tag=="1301") { //FocusWarning - if($data == 0) $data = gettext("Auto Focus Good"); - else if($data == 1) $data = gettext("Out of Focus"); - else $data = gettext("Unknown: ").$data; + if($data == 0) $data = (string) t("Auto Focus Good"); + else if($data == 1) $data = (string) t("Out of Focus"); + else $data = (string) t("Unknown: ").$data; } if($tag=="1302") { //AEWarning - if($data == 0) $data = gettext("AE Good"); - else if($data == 1) $data = gettext("Over Exposure"); - else $data = gettext("Unknown: ").$data; + if($data == 0) $data = (string) t("AE Good"); + else if($data == 1) $data = (string) t("Over Exposure"); + else $data = (string) t("Unknown: ").$data; } } else if($type=="UNDEFINED") { diff --git a/modules/exif/lib/makers/nikon.php b/modules/exif/lib/makers/nikon.php index c7d706db..ebc2af7c 100644 --- a/modules/exif/lib/makers/nikon.php +++ b/modules/exif/lib/makers/nikon.php @@ -42,7 +42,7 @@ function lookup_Nikon_tag($tag,$model) { case "0008": $tag = "Focus";break; case "0009": $tag = "Unknown2";break; case "000a": $tag = "DigitalZoom";break; - case "000b": $tag = gettext("Converter");break; + case "000b": $tag = (string) t("Converter");break; default: $tag = "unknown:".$tag;break; } @@ -113,48 +113,48 @@ function formatNikonData($type,$tag,$intel,$model,$data) { $data=hexdec($data); if($tag=="0003" && $model==0) { //Quality - if($data == 1) $data = gettext("VGA Basic"); - else if($data == 2) $data = gettext("VGA Normal"); - else if($data == 3) $data = gettext("VGA Fine"); - else if($data == 4) $data = gettext("SXGA Basic"); - else if($data == 5) $data = gettext("SXGA Normal"); - else if($data == 6) $data = gettext("SXGA Fine"); - else $data = gettext("Unknown").": ".$data; + if($data == 1) $data = (string) t("VGA Basic"); + else if($data == 2) $data = (string) t("VGA Normal"); + else if($data == 3) $data = (string) t("VGA Fine"); + else if($data == 4) $data = (string) t("SXGA Basic"); + else if($data == 5) $data = (string) t("SXGA Normal"); + else if($data == 6) $data = (string) t("SXGA Fine"); + else $data = (string) t("Unknown").": ".$data; } if($tag=="0004" && $model==0) { //Color - if($data == 1) $data = gettext("Color"); - else if($data == 2) $data = gettext("Monochrome"); - else $data = gettext("Unknown").": ".$data; + if($data == 1) $data = (string) t("Color"); + else if($data == 2) $data = (string) t("Monochrome"); + else $data = (string) t("Unknown").": ".$data; } if($tag=="0005" && $model==0) { //Image Adjustment - if($data == 0) $data = gettext("Normal"); - else if($data == 1) $data = gettext("Bright+"); - else if($data == 2) $data = gettext("Bright-"); - else if($data == 3) $data = gettext("Contrast+"); - else if($data == 4) $data = gettext("Contrast-"); - else $data = gettext("Unknown").": ".$data; + if($data == 0) $data = (string) t("Normal"); + else if($data == 1) $data = (string) t("Bright+"); + else if($data == 2) $data = (string) t("Bright-"); + else if($data == 3) $data = (string) t("Contrast+"); + else if($data == 4) $data = (string) t("Contrast-"); + else $data = (string) t("Unknown").": ".$data; } if($tag=="0006" && $model==0) { //CCD Sensitivity if($data == 0) $data = "ISO-80"; else if($data == 2) $data = "ISO-160"; else if($data == 4) $data = "ISO-320"; else if($data == 5) $data = "ISO-100"; - else $data = gettext("Unknown").": ".$data; + else $data = (string) t("Unknown").": ".$data; } if($tag=="0007" && $model==0) { //White Balance - if($data == 0) $data = gettext("Auto"); - else if($data == 1) $data = gettext("Preset"); - else if($data == 2) $data = gettext("Daylight"); - else if($data == 3) $data = gettext("Incandescense"); - else if($data == 4) $data = gettext("Flourescence"); - else if($data == 5) $data = gettext("Cloudy"); - else if($data == 6) $data = gettext("SpeedLight"); - else $data = gettext("Unknown").": ".$data; + if($data == 0) $data = (string) t("Auto"); + else if($data == 1) $data = (string) t("Preset"); + else if($data == 2) $data = (string) t("Daylight"); + else if($data == 3) $data = (string) t("Incandescense"); + else if($data == 4) $data = (string) t("Flourescence"); + else if($data == 5) $data = (string) t("Cloudy"); + else if($data == 6) $data = (string) t("SpeedLight"); + else $data = (string) t("Unknown").": ".$data; } if($tag=="000b" && $model==0) { //Converter - if($data == 0) $data = gettext("None"); - else if($data == 1) $data = gettext("Fisheye"); - else $data = gettext("Unknown").": ".$data; + if($data == 0) $data = (string) t("None"); + else if($data == 1) $data = (string) t("Fisheye"); + else $data = (string) t("Unknown").": ".$data; } } else if($type=="UNDEFINED") { @@ -162,7 +162,7 @@ function formatNikonData($type,$tag,$intel,$model,$data) { $data=$data/100; } if($tag=="0088" && $model==1) { //AF Focus Position - $temp = gettext("Center"); + $temp = (string) t("Center"); $data = bin2hex($data); $data = str_replace("01","Top",$data); $data = str_replace("02","Bottom",$data); @@ -178,20 +178,20 @@ function formatNikonData($type,$tag,$intel,$model,$data) { if($tag=="0083" && $model==1) { //Lens Type $data = hexdec(substr($data,0,2)); - if($data == 0) $data = gettext("AF non D"); - else if($data == 1) $data = gettext("Manual"); + if($data == 0) $data = (string) t("AF non D"); + else if($data == 1) $data = (string) t("Manual"); else if($data == 2) $data = "AF-D or AF-S"; else if($data == 6) $data = "AF-D G"; else if($data == 10) $data = "AF-D VR"; - else $data = gettext("Unknown").": ".$data; + else $data = (string) t("Unknown").": ".$data; } if($tag=="0087" && $model==1) { //Flash type $data = hexdec(substr($data,0,2)); - if($data == 0) $data = gettext("Did Not Fire"); - else if($data == 4) $data = gettext("Unknown"); - else if($data == 7) $data = gettext("External"); - else if($data == 9) $data = gettext("On Camera"); - else $data = gettext("Unknown").": ".$data; + if($data == 0) $data = (string) t("Did Not Fire"); + else if($data == 4) $data = (string) t("Unknown"); + else if($data == 7) $data = (string) t("External"); + else if($data == 9) $data = (string) t("On Camera"); + else $data = (string) t("Unknown").": ".$data; } } diff --git a/modules/exif/lib/makers/olympus.php b/modules/exif/lib/makers/olympus.php index 3f254570..17334bd8 100644 --- a/modules/exif/lib/makers/olympus.php +++ b/modules/exif/lib/makers/olympus.php @@ -80,12 +80,12 @@ function formatOlympusData($type,$tag,$intel,$data) { if($data == 1) $data = "SQ"; else if($data == 2) $data = "HQ"; else if($data == 3) $data = "SHQ"; - else $data = gettext("Unknown").": ".$data; + else $data = (string) t("Unknown").": ".$data; } if($tag=="0202") { //Macro if($data == 0) $data = "Normal"; else if($data == 1) $data = "Macro"; - else $data = gettext("Unknown").": ".$data; + else $data = (string) t("Unknown").": ".$data; } } else if($type=="UNDEFINED") { diff --git a/modules/exif/lib/makers/panasonic.php b/modules/exif/lib/makers/panasonic.php index c56707e6..d82d374d 100644 --- a/modules/exif/lib/makers/panasonic.php +++ b/modules/exif/lib/makers/panasonic.php @@ -77,10 +77,10 @@ function formatPanasonicData($type,$tag,$intel,$data) { if($tag=="000f") { //AFMode if($data == 256) $data = "9-area-focusing"; else if($data == 16) $data = "1-area-focusing"; - else if($data == 4096) $data = gettext("3-area-focusing (High speed)"); - else if($data == 4112) $data = gettext("1-area-focusing (High speed)"); - else if($data == 16) $data = gettext("1-area-focusing"); - else if($data == 1) $data = gettext("Spot-focusing"); + else if($data == 4096) $data = (string) t("3-area-focusing (High speed)"); + else if($data == 4112) $data = (string) t("1-area-focusing (High speed)"); + else if($data == 16) $data = (string) t("1-area-focusing"); + else if($data == 1) $data = (string) t("Spot-focusing"); else $data = "Unknown (".$data.")"; } @@ -99,69 +99,69 @@ function formatPanasonicData($type,$tag,$intel,$data) { $data=hexdec($data); if($tag=="0001") { //Image Quality - if($data == 2) $data = gettext("High"); - else if($data == 3) $data = gettext("Standard"); - else if($data == 6) $data = gettext("Very High"); - else if($data == 7) $data = gettext("RAW"); - else $data = gettext("Unknown")." (".$data.")"; + if($data == 2) $data = (string) t("High"); + else if($data == 3) $data = (string) t("Standard"); + else if($data == 6) $data = (string) t("Very High"); + else if($data == 7) $data = (string) t("RAW"); + else $data = (string) t("Unknown")." (".$data.")"; } if($tag=="0003") { //White Balance - if($data == 1) $data = gettext("Auto"); - else if($data == 2) $data = gettext("Daylight"); - else if($data == 3) $data = gettext("Cloudy"); - else if($data == 4) $data = gettext("Halogen"); - else if($data == 5) $data = gettext("Manual"); - else if($data == 8) $data = gettext("Flash"); - else if($data == 10) $data = gettext("Black and White"); - else if($data == 11) $data = gettext("Manual"); - else $data = gettext("Unknown")." (".$data.")"; + if($data == 1) $data = (string) t("Auto"); + else if($data == 2) $data = (string) t("Daylight"); + else if($data == 3) $data = (string) t("Cloudy"); + else if($data == 4) $data = (string) t("Halogen"); + else if($data == 5) $data = (string) t("Manual"); + else if($data == 8) $data = (string) t("Flash"); + else if($data == 10) $data = (string) t("Black and White"); + else if($data == 11) $data = (string) t("Manual"); + else $data = (string) t("Unknown")." (".$data.")"; } if($tag=="0007") { //Focus Mode - if($data == 1) $data = gettext("Auto"); - else if($data == 2) $data = gettext("Manual"); - else if($data == 4) $data = gettext("Auto, Focus button"); - else if($data == 5) $data = gettext("Auto, Continuous"); - else $data = gettext("Unknown")." (".$data.")"; + if($data == 1) $data = (string) t("Auto"); + else if($data == 2) $data = (string) t("Manual"); + else if($data == 4) $data = (string) t("Auto, Focus button"); + else if($data == 5) $data = (string) t("Auto, Continuous"); + else $data = (string) t("Unknown")." (".$data.")"; } if($tag=="001a") { //Image Stabilizer - if($data == 2) $data = gettext("Mode 1"); - else if($data == 3) $data = gettext("Off"); - else if($data == 4) $data = gettext("Mode 2"); - else $data = gettext("Unknown")." (".$data.")"; + if($data == 2) $data = (string) t("Mode 1"); + else if($data == 3) $data = (string) t("Off"); + else if($data == 4) $data = (string) t("Mode 2"); + else $data = (string) t("Unknown")." (".$data.")"; } if($tag=="001c") { //Macro mode - if($data == 1) $data = gettext("On"); - else if($data == 2) $data = gettext("Off"); - else $data = gettext("Unknown")." (".$data.")"; + if($data == 1) $data = (string) t("On"); + else if($data == 2) $data = (string) t("Off"); + else $data = (string) t("Unknown")." (".$data.")"; } if($tag=="001f") { //Shooting Mode - if($data == 1) $data = gettext("Normal"); - else if($data == 2) $data = gettext("Portrait"); - else if($data == 3) $data = gettext("Scenery"); - else if($data == 4) $data = gettext("Sports"); - else if($data == 5) $data = gettext("Night Portrait"); - else if($data == 6) $data = gettext("Program"); - else if($data == 7) $data = gettext("Aperture Priority"); - else if($data == 8) $data = gettext("Shutter Priority"); - else if($data == 9) $data = gettext("Macro"); - else if($data == 11) $data = gettext("Manual"); - else if($data == 13) $data = gettext("Panning"); - else if($data == 14) $data = gettext("Simple"); - else if($data == 18) $data = gettext("Fireworks"); - else if($data == 19) $data = gettext("Party"); - else if($data == 20) $data = gettext("Snow"); - else if($data == 21) $data = gettext("Night Scenery"); - else if($data == 22) $data = gettext("Food"); - else if($data == 23) $data = gettext("Baby"); - else if($data == 27) $data = gettext("High Sensitivity"); - else if($data == 29) $data = gettext("Underwater"); - else if($data == 33) $data = gettext("Pet"); - else $data = gettext("Unknown")." (".$data.")"; + if($data == 1) $data = (string) t("Normal"); + else if($data == 2) $data = (string) t("Portrait"); + else if($data == 3) $data = (string) t("Scenery"); + else if($data == 4) $data = (string) t("Sports"); + else if($data == 5) $data = (string) t("Night Portrait"); + else if($data == 6) $data = (string) t("Program"); + else if($data == 7) $data = (string) t("Aperture Priority"); + else if($data == 8) $data = (string) t("Shutter Priority"); + else if($data == 9) $data = (string) t("Macro"); + else if($data == 11) $data = (string) t("Manual"); + else if($data == 13) $data = (string) t("Panning"); + else if($data == 14) $data = (string) t("Simple"); + else if($data == 18) $data = (string) t("Fireworks"); + else if($data == 19) $data = (string) t("Party"); + else if($data == 20) $data = (string) t("Snow"); + else if($data == 21) $data = (string) t("Night Scenery"); + else if($data == 22) $data = (string) t("Food"); + else if($data == 23) $data = (string) t("Baby"); + else if($data == 27) $data = (string) t("High Sensitivity"); + else if($data == 29) $data = (string) t("Underwater"); + else if($data == 33) $data = (string) t("Pet"); + else $data = (string) t("Unknown")." (".$data.")"; } if($tag=="0020") { //Audio - if($data == 1) $data = gettext("Yes"); - else if($data == 2) $data = gettext("No"); - else $data = gettext("Unknown")." (".$data.")"; + if($data == 1) $data = (string) t("Yes"); + else if($data == 2) $data = (string) t("No"); + else $data = (string) t("Unknown")." (".$data.")"; } if($tag=="0023") { //White Balance Bias $data=$data." EV"; @@ -170,47 +170,47 @@ function formatPanasonicData($type,$tag,$intel,$data) { $data = $data; } if($tag=="0028") { //Colour Effect - if($data == 1) $data = gettext("Off"); - else if($data == 2) $data = gettext("Warm"); - else if($data == 3) $data = gettext("Cool"); - else if($data == 4) $data = gettext("Black and White"); - else if($data == 5) $data = gettext("Sepia"); - else $data = gettext("Unknown")." (".$data.")"; + if($data == 1) $data = (string) t("Off"); + else if($data == 2) $data = (string) t("Warm"); + else if($data == 3) $data = (string) t("Cool"); + else if($data == 4) $data = (string) t("Black and White"); + else if($data == 5) $data = (string) t("Sepia"); + else $data = (string) t("Unknown")." (".$data.")"; } if($tag=="002a") { //Burst Mode - if($data == 0) $data = gettext("Off"); - else if($data == 1) $data = gettext("Low/High Quality"); - else if($data == 2) $data = gettext("Infinite"); - else $data = gettext("Unknown")." (".$data.")"; + if($data == 0) $data = (string) t("Off"); + else if($data == 1) $data = (string) t("Low/High Quality"); + else if($data == 2) $data = (string) t("Infinite"); + else $data = (string) t("Unknown")." (".$data.")"; } if($tag=="002c") { //Contrast - if($data == 0) $data = gettext("Standard"); - else if($data == 1) $data = gettext("Low"); - else if($data == 2) $data = gettext("High"); - else $data = gettext("Unknown")." (".$data.")"; + if($data == 0) $data = (string) t("Standard"); + else if($data == 1) $data = (string) t("Low"); + else if($data == 2) $data = (string) t("High"); + else $data = (string) t("Unknown")." (".$data.")"; } if($tag=="002d") { //Noise Reduction - if($data == 0) $data = gettext("Standard"); - else if($data == 1) $data = gettext("Low"); - else if($data == 2) $data = gettext("High"); - else $data = gettext("Unknown")." (".$data.")"; + if($data == 0) $data = (string) t("Standard"); + else if($data == 1) $data = (string) t("Low"); + else if($data == 2) $data = (string) t("High"); + else $data = (string) t("Unknown")." (".$data.")"; } if($tag=="002e") { //Self Timer - if($data == 1) $data = gettext("Off"); - else if($data == 2) $data = gettext("10s"); - else if($data == 3) $data = gettext("2s"); - else $data = gettext("Unknown")." (".$data.")"; + if($data == 1) $data = (string) t("Off"); + else if($data == 2) $data = (string) t("10s"); + else if($data == 3) $data = (string) t("2s"); + else $data = (string) t("Unknown")." (".$data.")"; } if($tag=="0030") { //Rotation - if($data == 1) $data = gettext("Horizontal (normal)"); - else if($data == 6) $data = gettext("Rotate 90 CW"); - else if($data == 8) $data = gettext("Rotate 270 CW"); - else $data = gettext("Unknown")." (".$data.")"; + if($data == 1) $data = (string) t("Horizontal (normal)"); + else if($data == 6) $data = (string) t("Rotate 90 CW"); + else if($data == 8) $data = (string) t("Rotate 270 CW"); + else $data = (string) t("Unknown")." (".$data.")"; } if($tag=="0032") { //Color Mode - if($data == 0) $data = gettext("Normal"); - else if($data == 1) $data = gettext("Natural"); - else $data = gettext("Unknown")." (".$data.")"; + if($data == 0) $data = (string) t("Normal"); + else if($data == 1) $data = (string) t("Natural"); + else $data = (string) t("Unknown")." (".$data.")"; } if($tag=="0036") { //Travel Day $data=$data; diff --git a/modules/exif/lib/makers/sanyo.php b/modules/exif/lib/makers/sanyo.php index f8887970..661741dd 100644 --- a/modules/exif/lib/makers/sanyo.php +++ b/modules/exif/lib/makers/sanyo.php @@ -69,16 +69,16 @@ function formatSanyoData($type,$tag,$intel,$data) { $data=hexdec($data); if($tag=="0200") { //SpecialMode - if($data == 0) $data = gettext("Normal"); - else $data = gettext("Unknown").": ".$data; + if($data == 0) $data = (string) t("Normal"); + else $data = (string) t("Unknown").": ".$data; } if($tag=="0201") { //Quality - if($data == 2) $data = gettext("High"); - else $data = gettext("Unknown").": ".$data; + if($data == 2) $data = (string) t("High"); + else $data = (string) t("Unknown").": ".$data; } if($tag=="0202") { //Macro - if($data == 0) $data = gettext("Normal"); - else $data = gettext("Unknown").": ".$data; + if($data == 0) $data = (string) t("Normal"); + else $data = (string) t("Unknown").": ".$data; } } else if($type=="UNDEFINED") { -- cgit v1.2.3 From 1dc3f375bf2f0d035d2c6b90449f248e348d7290 Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Tue, 22 Sep 2009 12:35:40 -0700 Subject: Updated to Exifer r4477. Fixes ticket #763. --- modules/exif/lib/exif.php | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'modules/exif') diff --git a/modules/exif/lib/exif.php b/modules/exif/lib/exif.php index a7b0d13a..189f61b5 100644 --- a/modules/exif/lib/exif.php +++ b/modules/exif/lib/exif.php @@ -158,10 +158,15 @@ function intel2Moto($intel) { return $cache[$intel]; } - $len = strlen($intel); $cache[$intel] = ''; - for($i = 0; $i <= $len; $i += 2) { - $cache[$intel] .= substr($intel, $len-$i, 2); + $len = strlen($intel); + if ($len > 1000) { + debugLogBacktrace('intel2Moto called with unreasonable data string: length='.$len); + trigger_error(sprintf((string) t('intel2Moto called with unreasonable data string: length=%s. See debug log for details. (Setting DEBUG_EXIF to true might help locate problem images.)'),$len)); + } else { + for($i = 0; $i <= $len; $i += 2) { + $cache[$intel] .= substr($intel, $len-$i, 2); + } } return $cache[$intel]; } @@ -1059,4 +1064,10 @@ function get35mmEquivFocalLength(&$result) { return null; } +if (!function_exists('debugLogBacktrace')) { + // define this function for stand-alone uses if exifier + function debugLogBacktrace($msg) { + } +} + ?> -- cgit v1.2.3 From 72672bda39b76dae698805c3e0e6efdbdcf21105 Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Wed, 30 Sep 2009 08:04:49 -0600 Subject: Replaced gButtonLink with g-button. --- lib/gallery.common.css | 12 +++++++++++ modules/comment/views/admin_comments.html.php | 12 +++++------ modules/comment/views/comments.html.php | 2 +- modules/exif/views/exif_sidebar.html.php | 2 +- modules/g2_import/views/admin_g2_import.html.php | 2 +- modules/gallery/views/admin_graphics_gd.html.php | 4 ++-- .../views/admin_graphics_graphicsmagick.html.php | 2 +- .../views/admin_graphics_imagemagick.html.php | 2 +- modules/gallery/views/admin_languages.html.php | 2 +- modules/gallery/views/admin_maintenance.html.php | 18 ++++++++-------- modules/gallery/views/l10n_client.html.php | 2 +- modules/gallery/views/welcome_message.html.php | 2 +- modules/organize/views/organize_dialog.html.php | 2 +- modules/tag/views/admin_tags.html.php | 2 +- modules/user/views/admin_users.html.php | 10 ++++----- modules/user/views/admin_users_group.html.php | 6 +++--- modules/watermark/views/admin_watermarks.html.php | 6 +++--- themes/admin_wind/css/screen.css | 25 ++++++++-------------- themes/admin_wind/js/ui.init.js | 2 +- themes/admin_wind/views/pager.html.php | 16 +++++++------- themes/wind/css/screen.css | 15 ++++--------- themes/wind/js/ui.init.js | 2 +- themes/wind/views/movie.html.php | 8 +++---- themes/wind/views/pager.html.php | 16 +++++++------- themes/wind/views/photo.html.php | 8 +++---- 25 files changed, 89 insertions(+), 91 deletions(-) (limited to 'modules/exif') diff --git a/lib/gallery.common.css b/lib/gallery.common.css index 0aa9cc29..d57e95fc 100644 --- a/lib/gallery.common.css +++ b/lib/gallery.common.css @@ -138,6 +138,18 @@ form .g-error { } .g-button { + display: inline-block; + margin: 0 4px 0 0; + padding: .2em .4em; +} + +.g-button, +.g-button:hover, +.g-button:active { + cursor: pointer !important; + outline: 0; + text-decoration: none; + -moz-outline-style: none; } .g-progressbar { diff --git a/modules/comment/views/admin_comments.html.php b/modules/comment/views/admin_comments.html.php index 5e9ffb1a..ec5ad7b2 100644 --- a/modules/comment/views/admin_comments.html.php +++ b/modules/comment/views/admin_comments.html.php @@ -139,7 +139,7 @@ state != "unpublished"): ?>
  • + class="g-button ui-state-default ui-icon-left"> @@ -148,7 +148,7 @@ state != "published"): ?>
  • + class="g-button ui-state-default ui-icon-left"> @@ -157,7 +157,7 @@ state != "spam"): ?>
  • + class="g-button ui-state-default ui-icon-left"> @@ -166,14 +166,14 @@
  • + class="g-button ui-state-default ui-icon-left"> diff --git a/modules/comment/views/comments.html.php b/modules/comment/views/comments.html.php index dd706a23..ee4a8ad6 100644 --- a/modules/comment/views/comments.html.php +++ b/modules/comment/views/comments.html.php @@ -1,6 +1,6 @@ id})") ?>" id="gAddCommentButton" - class="gButtonLink ui-corner-all ui-icon-left ui-state-default right"> + class="g-button ui-corner-all ui-icon-left ui-state-default right"> diff --git a/modules/exif/views/exif_sidebar.html.php b/modules/exif/views/exif_sidebar.html.php index 60c0e1d4..23ecab03 100644 --- a/modules/exif/views/exif_sidebar.html.php +++ b/modules/exif/views/exif_sidebar.html.php @@ -1,6 +1,6 @@ id}") ?>" title="for_html_attr() ?>" - class="gDialogLink gButtonLink ui-icon-left ui-state-default ui-corner-all"> + class="gDialogLink g-button ui-icon-left ui-state-default ui-corner-all"> diff --git a/modules/g2_import/views/admin_g2_import.html.php b/modules/g2_import/views/admin_g2_import.html.php index 23ff27a8..91b723ad 100644 --- a/modules/g2_import/views/admin_g2_import.html.php +++ b/modules/g2_import/views/admin_g2_import.html.php @@ -84,7 +84,7 @@

    - "> diff --git a/modules/gallery/views/admin_graphics_gd.html.php b/modules/gallery/views/admin_graphics_gd.html.php index 010a31b4..08c19234 100644 --- a/modules/gallery/views/admin_graphics_gd.html.php +++ b/modules/gallery/views/admin_graphics_gd.html.php @@ -11,7 +11,7 @@ $tk->version)) ?>

    - +

    installed): ?> error): ?> @@ -20,7 +20,7 @@

    - +

    diff --git a/modules/gallery/views/admin_graphics_graphicsmagick.html.php b/modules/gallery/views/admin_graphics_graphicsmagick.html.php index 97624850..6ee15bc3 100644 --- a/modules/gallery/views/admin_graphics_graphicsmagick.html.php +++ b/modules/gallery/views/admin_graphics_graphicsmagick.html.php @@ -11,7 +11,7 @@ $tk->version, "dir" => $tk->dir)) ?>

    - +

    diff --git a/modules/gallery/views/admin_graphics_imagemagick.html.php b/modules/gallery/views/admin_graphics_imagemagick.html.php index cdff7c2c..aeef4919 100644 --- a/modules/gallery/views/admin_graphics_imagemagick.html.php +++ b/modules/gallery/views/admin_graphics_imagemagick.html.php @@ -11,7 +11,7 @@ $tk->version, "dir" => $tk->dir)) ?>

    - +

    error): ?>
    diff --git a/modules/gallery/views/admin_languages.html.php b/modules/gallery/views/admin_languages.html.php index fb30c7ba..d6f50516 100644 --- a/modules/gallery/views/admin_languages.html.php +++ b/modules/gallery/views/admin_languages.html.php @@ -88,7 +88,7 @@

    Step 3: Start the translation mode and the translation interface will appear at the bottom of each Gallery page.") ?>

    + class="g-button ui-state-default ui-corner-all ui-icon-left"> get("l10n_mode", false)): ?> diff --git a/modules/gallery/views/admin_maintenance.html.php b/modules/gallery/views/admin_maintenance.html.php index 00ba5199..8c3917b6 100644 --- a/modules/gallery/views/admin_maintenance.html.php +++ b/modules/gallery/views/admin_maintenance.html.php @@ -30,7 +30,7 @@ callback?csrf=$csrf") ?>" - class="gDialogLink gButtonLink ui-icon-left ui-state-default ui-corner-all"> + class="gDialogLink g-button ui-icon-left ui-state-default ui-corner-all"> @@ -62,7 +62,7 @@ " - class="gButtonLink g-right ui-icon-left ui-state-default ui-corner-all"> + class="g-button g-right ui-icon-left ui-state-default ui-corner-all"> @@ -96,11 +96,11 @@ id?csrf=$csrf") ?>" - class="gButtonLink g-right ui-icon-left ui-state-default ui-corner-all"> + class="g-button g-right ui-icon-left ui-state-default ui-corner-all"> state == "stalled"): ?> - id?csrf=$csrf") ?>"> @@ -135,7 +135,7 @@ " - class="gButtonLink g-right ui-icon-left ui-state-default ui-corner-all"> + class="g-button g-right ui-icon-left ui-state-default ui-corner-all"> @@ -166,19 +166,19 @@ done): ?> - id?csrf=$csrf") ?>" class="gButtonLink ui-state-default ui-corner-all"> + id?csrf=$csrf") ?>" class="g-button ui-state-default ui-corner-all"> get_log()): ?> - id?csrf=$csrf") ?>" class="gDialogLink gButtonLink ui-state-default ui-corner-all"> + id?csrf=$csrf") ?>" class="gDialogLink g-button ui-state-default ui-corner-all"> - id?csrf=$csrf") ?>" class="gDialogLink gButtonLink" ui-state-default ui-corner-all> + id?csrf=$csrf") ?>" class="gDialogLink g-button" ui-state-default ui-corner-all> - id?csrf=$csrf") ?>" class="gButtonLink ui-state-default ui-corner-all"> + id?csrf=$csrf") ?>" class="g-button ui-state-default ui-corner-all"> diff --git a/modules/gallery/views/l10n_client.html.php b/modules/gallery/views/l10n_client.html.php index b0f424be..a7f001aa 100644 --- a/modules/gallery/views/l10n_client.html.php +++ b/modules/gallery/views/l10n_client.html.php @@ -68,7 +68,7 @@
    for_html_attr() ?>"/> + class="g-button ui-state-default ui-corner-all"> diff --git a/modules/gallery/views/welcome_message.html.php b/modules/gallery/views/welcome_message.html.php index 5515c3dc..021e5772 100644 --- a/modules/gallery/views/welcome_message.html.php +++ b/modules/gallery/views/welcome_message.html.php @@ -18,7 +18,7 @@ id}") ?>" title="for_html_attr() ?>" id="gAfterInstallChangePasswordLink" - class="gButtonLink ui-state-default ui-corners-all"> + class="g-button ui-state-default ui-corners-all">
    " - class="gDialogLink gButtonLink g-right ui-icon-left ui-state-default ui-corner-all" + class="gDialogLink g-button g-right ui-icon-left ui-state-default ui-corner-all" title="for_html_attr() ?>"> @@ -85,15 +85,15 @@ id") ?>" open_text="" - class="gPanelLink gButtonLink ui-state-default ui-corner-all ui-icon-left"> + class="gPanelLink g-button ui-state-default ui-corner-all ui-icon-left"> id != $user->id && !$user->guest): ?> id") ?>" - class="gDialogLink gButtonLink ui-state-default ui-corner-all ui-icon-left"> + class="gDialogLink g-button ui-state-default ui-corner-all ui-icon-left"> for_html_attr() ?>" - class="gButtonLink ui-state-disabled ui-corner-all ui-icon-left"> + class="g-button ui-state-disabled ui-corner-all ui-icon-left"> @@ -105,7 +105,7 @@
    " - class="gDialogLink gButtonLink right ui-icon-left ui-state-default ui-corner-all" + class="gDialogLink g-button right ui-icon-left ui-state-default ui-corner-all" title="for_html_attr() ?>"> diff --git a/modules/user/views/admin_users_group.html.php b/modules/user/views/admin_users_group.html.php index 476e0817..6f2496f8 100644 --- a/modules/user/views/admin_users_group.html.php +++ b/modules/user/views/admin_users_group.html.php @@ -4,11 +4,11 @@ special): ?> id") ?>" title=" $group->name))->for_html_attr() ?>" - class="gDialogLink gButtonLink ui-state-default ui-corner-all"> + class="gDialogLink g-button ui-state-default ui-corner-all"> for_html_attr() ?>" - class="gDialogLink gButtonLink ui-state-disabled ui-corner-all ui-icon-left"> + class="gDialogLink g-button ui-state-disabled ui-corner-all ui-icon-left"> @@ -20,7 +20,7 @@ name) ?> special): ?> $user->name, "group" => $group->name))->for_html_attr() ?>"> diff --git a/modules/watermark/views/admin_watermarks.html.php b/modules/watermark/views/admin_watermarks.html.php index ac69d21d..3790030d 100644 --- a/modules/watermark/views/admin_watermarks.html.php +++ b/modules/watermark/views/admin_watermarks.html.php @@ -8,7 +8,7 @@ " title="for_html_attr() ?>" - class="gDialogLink gButtonLink ui-icon-left ui-state-default ui-corner-all"> + class="gDialogLink g-button ui-icon-left ui-state-default ui-corner-all">

    @@ -27,10 +27,10 @@

    " title="for_html_attr() ?>" - class="gDialogLink gButtonLink ui-icon-left ui-state-default ui-corner-all"> + class="gDialogLink g-button ui-icon-left ui-state-default ui-corner-all"> " title="for_html_attr() ?>" - class="gDialogLink gButtonLink ui-icon-left ui-state-default ui-corner-all"> + class="gDialogLink g-button ui-icon-left ui-state-default ui-corner-all">
    diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css index d006463d..737c5939 100644 --- a/themes/admin_wind/css/screen.css +++ b/themes/admin_wind/css/screen.css @@ -68,9 +68,9 @@ h3 { a, .gMenu a, #gDialog a, -.gButtonLink, -.gButtonLink:hover, -.gButtonLink:active, +.g-button, +.g-button:hover, +.g-button:active, a.ui-state-hover, input.ui-state-hover, button.ui-state-hover { @@ -283,11 +283,11 @@ li.gError select { background: #eee; } -.gAvailable .gButtonLink { +.gAvailable .g-button { width: 96%; } -.gSelected .gButtonLink { +.gSelected .g-button { display: none; } @@ -627,7 +627,7 @@ li.gGroup h4 { border-bottom: 1px dashed #ccc; padding: .5em 0 .5em .5em; } -li.gGroup .gButtonLink { +li.gGroup .g-button { padding: 0; } li.gGroup ul, li.gGroup div { @@ -644,7 +644,7 @@ li.gGroup div p { li.gGroup .gUser { padding: .2em 0 0 .5em; } -li.gGroup .gUser .gButtonLink { +li.gGroup .gUser .g-button { vertical-align: middle; } @@ -838,13 +838,6 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser { /* jQuery UI ThemeRoller buttons */ -.gButtonLink { - display: inline-block; - margin: 0 4px 0 0; - padding: .2em .4em; - outline: 0; -} - .gButtonSet { padding-left: 1px; } @@ -853,7 +846,7 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser { float: left; } -.gButtonSet .gButtonLink { +.gButtonSet .g-button { margin: 0; } @@ -1106,7 +1099,7 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser { clear: both; } -#gTranslations .gButtonLink { +#gTranslations .g-button { padding: .5em; } diff --git a/themes/admin_wind/js/ui.init.js b/themes/admin_wind/js/ui.init.js index c6379c09..d9b011bd 100644 --- a/themes/admin_wind/js/ui.init.js +++ b/themes/admin_wind/js/ui.init.js @@ -37,7 +37,7 @@ $(document).ready(function(){ if ($("#gAdminCommentsMenu").length) { $("#gAdminCommentsMenu ul").removeClass("gMenu").removeClass("sf-menu"); $("#gAdminCommentsMenu").addClass("gButtonSet"); - $("#gAdminCommentsMenu a").addClass("gButtonLink ui-state-default"); + $("#gAdminCommentsMenu a").addClass("g-button ui-state-default"); $("#gAdminCommentsMenu ul li:first a").addClass("ui-corner-left"); $("#gAdminCommentsMenu ul li:last a").addClass("ui-corner-right"); } diff --git a/themes/admin_wind/views/pager.html.php b/themes/admin_wind/views/pager.html.php index 90c71446..29b9f9d0 100644 --- a/themes/admin_wind/views/pager.html.php +++ b/themes/admin_wind/views/pager.html.php @@ -10,34 +10,34 @@ "count" => $total_items)) ?>
  • - + - + - + - +
  • - + - + - + - +
    • diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css index 9f3a53e6..6d955481 100644 --- a/themes/wind/css/screen.css +++ b/themes/wind/css/screen.css @@ -68,9 +68,9 @@ h3 { a, .gMenu a, #gDialog a, -.gButtonLink, -.gButtonLink:hover, -.gButtonLink:active, +.g-button, +.g-button:hover, +.g-button:active, a.ui-state-hover, input.ui-state-hover, button.ui-state-hover { @@ -884,13 +884,6 @@ form .gError, /* jQuery UI ThemeRoller buttons */ -.gButtonLink { - display: inline-block; - margin: 0 4px 0 0; - padding: .2em .4em; - outline: 0; -} - .gButtonSet { padding-left: 1px; } @@ -899,7 +892,7 @@ form .gError, float: left; } -.gButtonSet .gButtonLink { +.gButtonSet .g-button { margin: 0; } diff --git a/themes/wind/js/ui.init.js b/themes/wind/js/ui.init.js index c79e91bd..4a1962c0 100644 --- a/themes/wind/js/ui.init.js +++ b/themes/wind/js/ui.init.js @@ -49,7 +49,7 @@ $(document).ready(function() { // Apply styles and icon classes to gContextMenu if ($(".gContextMenu").length) { $(".gContextMenu li").addClass("ui-state-default"); - $(".gContextMenu a").addClass("gButtonLink ui-icon-left"); + $(".gContextMenu a").addClass("g-button ui-icon-left"); $(".gContextMenu a").prepend(""); $(".gContextMenu a span").each(function() { var iconClass = $(this).parent().attr("class").match(/ui-icon-.[^\s]+/).toString(); diff --git a/themes/wind/views/movie.html.php b/themes/wind/views/movie.html.php index 8b8e43a8..cf7c9b7f 100644 --- a/themes/wind/views/movie.html.php +++ b/themes/wind/views/movie.html.php @@ -5,20 +5,20 @@
    • - + - +
    • $position, "total" => $sibling_count)) ?>
    • - + - +
      • diff --git a/themes/wind/views/pager.html.php b/themes/wind/views/pager.html.php index b57e0c9d..155c8d16 100644 --- a/themes/wind/views/pager.html.php +++ b/themes/wind/views/pager.html.php @@ -10,34 +10,34 @@ "count" => $total_items)) ?>
    • - + - + - + - +
    • - + - + - + - +
      • diff --git a/themes/wind/views/photo.html.php b/themes/wind/views/photo.html.php index 25e1ad39..def3d8b7 100644 --- a/themes/wind/views/photo.html.php +++ b/themes/wind/views/photo.html.php @@ -18,20 +18,20 @@
      • - + - +
      • $position, "total" => $sibling_count)) ?>
      • - + - +
        • -- cgit v1.2.3 From e1e8904e4a82792effd721fc0b4c028d86cf177a Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Wed, 30 Sep 2009 22:49:36 -0600 Subject: Convert gDialog and gCancel over to g-dialog and g-cancel. Refactor CSS id's and classes in the login/reset password dialog. --- lib/gallery.common.css | 56 ++++++++++++++--- lib/gallery.common.js | 4 +- lib/gallery.dialog.js | 72 +++++++++++----------- modules/exif/helpers/exif.php | 2 +- modules/exif/views/exif_sidebar.html.php | 2 +- modules/g2_import/views/admin_g2_import.html.php | 2 +- modules/gallery/helpers/graphics.php | 2 +- modules/gallery/libraries/Menu.php | 2 +- .../gallery/views/admin_advanced_settings.html.php | 2 +- modules/gallery/views/admin_maintenance.html.php | 8 +-- .../views/admin_maintenance_show_log.html.php | 2 +- modules/gallery/views/admin_themes.html.php | 4 +- modules/organize/js/organize.js | 16 ++--- modules/organize/views/organize_dialog.html.php | 2 +- modules/search/helpers/search.php | 2 +- modules/server_add/js/server_add.js | 4 +- modules/tag/js/tag.js | 2 +- modules/tag/views/admin_tags.html.php | 2 +- modules/user/helpers/group.php | 1 + modules/user/helpers/user.php | 3 + modules/user/views/admin_users.html.php | 8 +-- modules/user/views/admin_users_group.html.php | 4 +- modules/user/views/login.html.php | 2 +- modules/user/views/login_ajax.html.php | 24 ++++---- modules/watermark/views/admin_watermarks.html.php | 6 +- themes/admin_wind/css/screen.css | 55 ++--------------- themes/admin_wind/js/ui.init.js | 2 +- themes/wind/css/fix-ie.css | 2 +- themes/wind/css/screen.css | 63 +++---------------- themes/wind/js/ui.init.js | 4 +- themes/wind/views/album.html.php | 2 +- 31 files changed, 158 insertions(+), 204 deletions(-) (limited to 'modules/exif') diff --git a/lib/gallery.common.css b/lib/gallery.common.css index 601f6609..54453012 100644 --- a/lib/gallery.common.css +++ b/lib/gallery.common.css @@ -3,9 +3,10 @@ * * Sheet organization: * 1) Text - * 2) States and interactions - * 3) Positioning and order - * 4) Reusable containers/widgets + * 2) Dimension and scale + * 3) States and interactions + * 4) Positioning and order + * 5) Containers/widgets */ /** ******************************************************************* @@ -24,8 +25,16 @@ text-align: right; } + +/** ******************************************************************* + * 2) Dimension and scale + **********************************************************************/ + +.g-narrow { +} + /** ******************************************************************* - * 2) States and interactions + * 3) States and interactions **********************************************************************/ .g-active, @@ -105,7 +114,7 @@ form .g-error { } /** ******************************************************************* - * 3) Positioning and order + * 4) Positioning and order **********************************************************************/ .g-left { @@ -131,10 +140,43 @@ form .g-error { } /** ******************************************************************* - * 4) Reusable containers/widgets + * 5) Containers/widgets **********************************************************************/ -.g-dialog { +#g-dialog { + text-align: left; +} + +#g-dialog .g-narrow { + margin: 0 auto; + width: 270px; +} + +#g-dialog fieldset { + border: none; +} + +#g-dialog legend { + display: none; +} + +#g-dialog form input[type="text"], +#g-dialog form input[type="password"] { + width: 100%; +} + +#g-dialog p { + margin: 0; +} + +#g-dialog li { + padding-left: 0; +} + +#g-dialog .g-cancel { + clear: none; + float: left; + margin: .3em 1em; } .g-button { diff --git a/lib/gallery.common.js b/lib/gallery.common.js index a91f021e..59482b22 100644 --- a/lib/gallery.common.js +++ b/lib/gallery.common.js @@ -53,7 +53,7 @@ return this.each(function(i){ var size; switch ($(this).attr("id")) { - case "#gDialog": + case "#g-dialog": case "#gPanel": size = "Large"; break; @@ -133,7 +133,7 @@ function() { if (in_progress == 0) { $(this).find("ul").slideDown("fast", function() { in_progress = 1; }); - $(this).find(".gDialogLink").gallery_dialog(); + $(this).find(".g-dialogLink").gallery_dialog(); $(this).find(".gAjaxLink").gallery_ajax(); } }, diff --git a/lib/gallery.dialog.js b/lib/gallery.dialog.js index 39c451e3..a70200f9 100644 --- a/lib/gallery.dialog.js +++ b/lib/gallery.dialog.js @@ -15,75 +15,75 @@ _show: function(sHref) { var self = this; - var eDialog = '
        '; + var eDialog = '
        '; $("body").append(eDialog); if (!self.options.close) { self.options.close = self.close_dialog; } - $("#gDialog").dialog(self.options); + $("#g-dialog").dialog(self.options); - $("#gDialog").gallery_show_loading(); + $("#g-dialog").gallery_show_loading(); $.get(sHref, function(data) { - $("#gDialog").html(data).gallery_show_loading(); + $("#g-dialog").html(data).gallery_show_loading(); - if ($("#gDialog form").length) { - self.form_loaded(null, $("#gDialog form")); + if ($("#g-dialog form").length) { + self.form_loaded(null, $("#g-dialog form")); } self._layout(); - $("#gDialog").dialog("open"); + $("#g-dialog").dialog("open"); // Remove titlebar for progress dialogs or set title - if ($("#gDialog #gProgress").length) { + if ($("#g-dialog #gProgress").length) { $(".ui-dialog-titlebar").remove(); - } else if ($("#gDialog h1").length) { - $("#gDialog").dialog('option', 'title', $("#gDialog h1:eq(0)").html()); - } else if ($("#gDialog fieldset legend").length) { - $("#gDialog").dialog('option', 'title', $("#gDialog fieldset legend:eq(0)").html()); + } else if ($("#g-dialog h1").length) { + $("#g-dialog").dialog('option', 'title', $("#g-dialog h1:eq(0)").html()); + } else if ($("#g-dialog fieldset legend").length) { + $("#g-dialog").dialog('option', 'title', $("#g-dialog fieldset legend:eq(0)").html()); } - if ($("#gDialog form").length) { + if ($("#g-dialog form").length) { self._ajaxify_dialog(); } }); - $("#gDialog").dialog("option", "self", self); + $("#g-dialog").dialog("option", "self", self); }, _layout: function() { var dialogWidth; - var dialogHeight = $("#gDialog").height(); - var cssWidth = new String($("#gDialog form").css("width")); + var dialogHeight = $("#g-dialog").height(); + var cssWidth = new String($("#g-dialog form").css("width")); var childWidth = cssWidth.replace(/[^0-9]/g,""); var size = $.gallery_get_viewport_size(); - if ($("#gDialog iframe").length) { + if ($("#g-dialog iframe").length) { dialogWidth = size.width() - 100; // Set the iframe width and height - $("#gDialog iframe").width("100%").height(size.height() - 100); - } else if ($("#gDialog .gDialogPanel").length) { + $("#g-dialog iframe").width("100%").height(size.height() - 100); + } else if ($("#g-dialog .g-dialogPanel").length) { dialogWidth = size.width() - 100; - $("#gDialog").dialog("option", "height", size.height() - 100); + $("#g-dialog").dialog("option", "height", size.height() - 100); } else if (childWidth == "" || childWidth > 300) { dialogWidth = 500; } - $("#gDialog").dialog('option', 'width', dialogWidth); + $("#g-dialog").dialog('option', 'width', dialogWidth); }, form_loaded: function(event, ui) { // Should be defined (and localized) in the theme MSG_CANCEL = MSG_CANCEL || 'Cancel'; - var eCancel = '' + MSG_CANCEL + ''; - if ($("#gDialog .submit").length) { - $("#gDialog .submit").addClass("ui-state-default ui-corner-all"); + var eCancel = '' + MSG_CANCEL + ''; + if ($("#g-dialog .submit").length) { + $("#g-dialog .submit").addClass("ui-state-default ui-corner-all"); $.fn.gallery_hover_init(); - $("#gDialog .submit").parent().append(eCancel); - $("#gDialog .gCancel").click(function(event) { - $("#gDialog").dialog("close"); + $("#g-dialog .submit").parent().append(eCancel); + $("#g-dialog .g-cancel").click(function(event) { + $("#g-dialog").dialog("close"); event.preventDefault(); }); } - $("#gDialog .ui-state-default").hover( + $("#g-dialog .ui-state-default").hover( function() { $(this).addClass("ui-state-hover"); }, @@ -94,23 +94,23 @@ }, close_dialog: function(event, ui) { - var self = $("#gDialog").dialog("option", "self"); - if ($("#gDialog form").length) { - self._trigger("form_closing", null, $("#gDialog form")); + var self = $("#g-dialog").dialog("option", "self"); + if ($("#g-dialog form").length) { + self._trigger("form_closing", null, $("#g-dialog form")); } - self._trigger("dialog_closing", null, $("#gDialog")); - $("#gDialog").dialog("destroy").remove(); + self._trigger("dialog_closing", null, $("#g-dialog")); + $("#g-dialog").dialog("destroy").remove(); }, _ajaxify_dialog: function() { var self = this; - $("#gDialog form").ajaxForm({ + $("#g-dialog form").ajaxForm({ dataType: "json", success: function(data) { if (data.form) { - $("#gDialog form").replaceWith(data.form); + $("#g-dialog form").replaceWith(data.form); self._ajaxify_dialog(); - self.form_loaded(null, $("#gDialog form")); + self.form_loaded(null, $("#g-dialog form")); if (typeof data.reset == 'function') { eval(data.reset + '()'); } diff --git a/modules/exif/helpers/exif.php b/modules/exif/helpers/exif.php index 83540622..453690ea 100644 --- a/modules/exif/helpers/exif.php +++ b/modules/exif/helpers/exif.php @@ -163,7 +163,7 @@ class exif_Core { list ($remaining) = exif::stats(); if ($remaining) { site_status::warning( - t('Your Exif index needs to be updated. Fix this now', + t('Your Exif index needs to be updated. Fix this now', array("url" => html::mark_clean(url::site("admin/maintenance/start/exif_task::update_index?csrf=__CSRF__")))), "exif_index_out_of_date"); } diff --git a/modules/exif/views/exif_sidebar.html.php b/modules/exif/views/exif_sidebar.html.php index 23ecab03..3c7bb517 100644 --- a/modules/exif/views/exif_sidebar.html.php +++ b/modules/exif/views/exif_sidebar.html.php @@ -1,6 +1,6 @@ id}") ?>" title="for_html_attr() ?>" - class="gDialogLink g-button ui-icon-left ui-state-default ui-corner-all"> + class="g-dialogLink g-button ui-icon-left ui-state-default ui-corner-all"> diff --git a/modules/g2_import/views/admin_g2_import.html.php b/modules/g2_import/views/admin_g2_import.html.php index 91b723ad..314f030b 100644 --- a/modules/g2_import/views/admin_g2_import.html.php +++ b/modules/g2_import/views/admin_g2_import.html.php @@ -84,7 +84,7 @@

        - "> diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php index 0e32022f..f9b88638 100644 --- a/modules/gallery/helpers/graphics.php +++ b/modules/gallery/helpers/graphics.php @@ -249,7 +249,7 @@ class graphics_Core { "%count of your photos are out of date. Click here to fix them", $count, array("attrs" => html::mark_clean(sprintf( - 'href="%s" class="gDialogLink"', + 'href="%s" class="g-dialogLink"', url::site("admin/maintenance/start/gallery_task::rebuild_dirty_images?csrf=__CSRF__"))))), "graphics_dirty"); } diff --git a/modules/gallery/libraries/Menu.php b/modules/gallery/libraries/Menu.php index 07b2b2b8..4be374a2 100644 --- a/modules/gallery/libraries/Menu.php +++ b/modules/gallery/libraries/Menu.php @@ -142,7 +142,7 @@ class Menu_Element_Dialog extends Menu_Element { } else { $css_class = ""; } - return "

      • url\" " . + return "
      • url\" " . "title=\"$this->label\">$this->label
        • "; } } diff --git a/modules/gallery/views/admin_advanced_settings.html.php b/modules/gallery/views/admin_advanced_settings.html.php index c3595da5..6ad265ac 100644 --- a/modules/gallery/views/admin_advanced_settings.html.php +++ b/modules/gallery/views/admin_advanced_settings.html.php @@ -23,7 +23,7 @@ name) ?> module_name/" . html::clean($var->name)) ?>" - class="gDialogLink" + class="g-dialogLink" title=" $var->name, "module_name" => $var->module_name))->for_html_attr() ?>"> value): ?> value) ?> diff --git a/modules/gallery/views/admin_maintenance.html.php b/modules/gallery/views/admin_maintenance.html.php index 8c3917b6..977ba75b 100644 --- a/modules/gallery/views/admin_maintenance.html.php +++ b/modules/gallery/views/admin_maintenance.html.php @@ -30,7 +30,7 @@ callback?csrf=$csrf") ?>" - class="gDialogLink g-button ui-icon-left ui-state-default ui-corner-all"> + class="g-dialogLink g-button ui-icon-left ui-state-default ui-corner-all"> @@ -100,7 +100,7 @@ state == "stalled"): ?> - id?csrf=$csrf") ?>"> @@ -170,12 +170,12 @@ get_log()): ?> - id?csrf=$csrf") ?>" class="gDialogLink g-button ui-state-default ui-corner-all"> + id?csrf=$csrf") ?>" class="g-dialogLink g-button ui-state-default ui-corner-all"> - id?csrf=$csrf") ?>" class="gDialogLink g-button" ui-state-default ui-corner-all> + id?csrf=$csrf") ?>" class="g-dialogLink g-button" ui-state-default ui-corner-all> id?csrf=$csrf") ?>" class="g-button ui-state-default ui-corner-all"> diff --git a/modules/gallery/views/admin_maintenance_show_log.html.php b/modules/gallery/views/admin_maintenance_show_log.html.php index 2dfef90f..c61db871 100644 --- a/modules/gallery/views/admin_maintenance_show_log.html.php +++ b/modules/gallery/views/admin_maintenance_show_log.html.php @@ -9,7 +9,7 @@ appendTo('body').submit().remove(); }; -
        +

        name ?> 

        get_log()) ?>
        diff --git a/modules/gallery/views/admin_themes.html.php b/modules/gallery/views/admin_themes.html.php index 0aac4717..d0ffc414 100644 --- a/modules/gallery/views/admin_themes.html.php +++ b/modules/gallery/views/admin_themes.html.php @@ -30,7 +30,7 @@ site) continue ?>
        - " class="gDialogLink" title=" $info->name))->for_html_attr() ?>"> + " class="g-dialogLink" title=" $info->name))->for_html_attr() ?>"> " alt="name) ?>" />

        name ?>

        @@ -68,7 +68,7 @@ admin) continue ?>
        - " class="gDialogLink" title=" $info->name))->for_html_attr() ?>"> + " class="g-dialogLink" title=" $info->name))->for_html_attr() ?>"> " alt="name) ?>" />

        name ?>

        diff --git a/modules/organize/js/organize.js b/modules/organize/js/organize.js index cfaff01c..bee42a22 100644 --- a/modules/organize/js/organize.js +++ b/modules/organize/js/organize.js @@ -138,19 +138,19 @@ var self = this; // Deal with ui.jquery bug: http://dev.jqueryui.com/ticket/4475 (target 1.8?) $(".sf-menu li.sfHover ul").css("z-index", 68); - $("#gDialog").dialog("option", "zIndex", 70); - $("#gDialog").bind("dialogopen", function(event, ui) { - $("#gOrganize").height($("#gDialog").innerHeight() - 20); - $("#gOrganizeMicroThumbPanel").height($("#gDialog").innerHeight() - 90); - $("#gOrganizeTreeContainer").height($("#gDialog").innerHeight() - 59); + $("#g-dialog").dialog("option", "zIndex", 70); + $("#g-dialog").bind("dialogopen", function(event, ui) { + $("#gOrganize").height($("#g-dialog").innerHeight() - 20); + $("#gOrganizeMicroThumbPanel").height($("#g-dialog").innerHeight() - 90); + $("#gOrganizeTreeContainer").height($("#g-dialog").innerHeight() - 59); }); - $("#gDialog").bind("dialogclose", function(event, ui) { + $("#g-dialog").bind("dialogclose", function(event, ui) { window.location.reload(); }); - $("#gDialog #gOrganizeClose").click(function(event) { - $("#gDialog").dialog("close"); + $("#g-dialog #gOrganizeClose").click(function(event) { + $("#g-dialog").dialog("close"); }); $("#gOrganizeSortColumn,#gOrganizeSortOrder").change(function(event) { diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php index 87f12be9..09720fe4 100644 --- a/modules/organize/views/organize_dialog.html.php +++ b/modules/organize/views/organize_dialog.html.php @@ -5,7 +5,7 @@ var sort_order_url = ""; var tree_url = ""; -
        +

        html::purify($album->title))) ?>

        diff --git a/modules/search/helpers/search.php b/modules/search/helpers/search.php index 0080b4ce..c73eda08 100644 --- a/modules/search/helpers/search.php +++ b/modules/search/helpers/search.php @@ -57,7 +57,7 @@ class search_Core { list ($remaining) = search::stats(); if ($remaining) { site_status::warning( - t('Your search index needs to be updated. Fix this now', + t('Your search index needs to be updated. Fix this now', array("url" => html::mark_clean(url::site("admin/maintenance/start/search_task::update_index?csrf=__CSRF__")))), "search_index_out_of_date"); } diff --git a/modules/server_add/js/server_add.js b/modules/server_add/js/server_add.js index 50a8c36b..86bff079 100644 --- a/modules/server_add/js/server_add.js +++ b/modules/server_add/js/server_add.js @@ -21,7 +21,7 @@ self.run_add(); }); $("#gServerAddCloseButton", this.element).click(function(event) { - $("#gDialog").dialog("close"); + $("#g-dialog").dialog("close"); window.location.reload(); }); $("#gServerAddTree span.gDirectory", this.element).dblclick(function(event) { @@ -33,7 +33,7 @@ $("#gServerAddTree span.gDirectory", this.element).dblclick(function(event) { self.open_dir(event); }); - $("#gDialog").bind("dialogclose", function(event, ui) { + $("#g-dialog").bind("dialogclose", function(event, ui) { window.location.reload(); }); }, diff --git a/modules/tag/js/tag.js b/modules/tag/js/tag.js index 52c695c6..ab3691a6 100644 --- a/modules/tag/js/tag.js +++ b/modules/tag/js/tag.js @@ -24,7 +24,7 @@ function closeEditInPlaceForms() { $("#gRenameTagForm").parent().html($("#gRenameTagForm").parent().data("revert")); li.height(""); $(".gEditable", li).bind("click", editInPlace); - $(".gDialogLink", li).gallery_dialog(); + $(".g-dialogLink", li).gallery_dialog(); } } diff --git a/modules/tag/views/admin_tags.html.php b/modules/tag/views/admin_tags.html.php index b7344cda..a4bd5d8f 100644 --- a/modules/tag/views/admin_tags.html.php +++ b/modules/tag/views/admin_tags.html.php @@ -50,7 +50,7 @@ name) ?> (count ?>) id") ?>" - class="gDialogLink delete-link g-button"> + class="g-dialogLink delete-link g-button"> diff --git a/modules/user/helpers/group.php b/modules/user/helpers/group.php index 04e6efd6..e0dfac8e 100644 --- a/modules/user/helpers/group.php +++ b/modules/user/helpers/group.php @@ -86,6 +86,7 @@ class group_Core { static function get_add_form_admin() { $form = new Forge("admin/users/add_group", "", "post", array("id" => "gAddGroupForm")); + $form->set_attr('class', "g-narrow"); $form_group = $form->group("add_group")->label(t("Add Group")); $form_group->input("name")->label(t("Name"))->id("gName"); $form_group->inputs["name"]->error_messages( diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php index b9162b92..93c385a3 100644 --- a/modules/user/helpers/user.php +++ b/modules/user/helpers/user.php @@ -26,6 +26,7 @@ class user_Core { static function get_edit_form($user) { $form = new Forge("users/$user->id?_method=put", "", "post", array("id" => "gEditUserForm")); + $form->set_attr("class", "g-narrow"); $group = $form->group("edit_user")->label(t("Edit User: %name", array("name" => $user->name))); $group->input("full_name")->label(t("Full Name"))->id("gFullName")->value($user->full_name); self::_add_locale_dropdown($group, $user); @@ -66,6 +67,7 @@ class user_Core { static function get_add_form_admin() { $form = new Forge("admin/users/add_user", "", "post", array("id" => "gAddUserForm")); + $form->set_attr('class', "g-narrow"); $group = $form->group("add_user")->label(t("Add User")); $group->input("name")->label(t("Username"))->id("gUsername") ->error_messages("in_use", t("There is already a user with that username")); @@ -112,6 +114,7 @@ class user_Core { static function get_login_form($url) { $form = new Forge($url, "", "post", array("id" => "gLoginForm")); + $form->set_attr('class', "g-narrow"); $group = $form->group("login")->label(t("Login")); $group->input("name")->label(t("Username"))->id("gUsername")->class(null); $group->password("password")->label(t("Password"))->id("gPassword")->class(null); diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php index 0741a932..a46e402f 100644 --- a/modules/user/views/admin_users.html.php +++ b/modules/user/views/admin_users.html.php @@ -28,7 +28,7 @@ {}, function(data) { $("#group-" + group_id).html(data); - $("#group-" + group_id + " .gDialogLink").gallery_dialog(); + $("#group-" + group_id + " .g-dialogLink").gallery_dialog(); }); } @@ -43,7 +43,7 @@
        " - class="gDialogLink g-button g-right ui-icon-left ui-state-default ui-corner-all" + class="g-dialogLink g-button g-right ui-icon-left ui-state-default ui-corner-all" title="for_html_attr() ?>"> @@ -89,7 +89,7 @@ id != $user->id && !$user->guest): ?> id") ?>" - class="gDialogLink g-button ui-state-default ui-corner-all ui-icon-left"> + class="g-dialogLink g-button ui-state-default ui-corner-all ui-icon-left"> for_html_attr() ?>" @@ -105,7 +105,7 @@
        " - class="gDialogLink g-button g-right ui-icon-left ui-state-default ui-corner-all" + class="g-dialogLink g-button g-right ui-icon-left ui-state-default ui-corner-all" title="for_html_attr() ?>"> diff --git a/modules/user/views/admin_users_group.html.php b/modules/user/views/admin_users_group.html.php index 6f2496f8..e5c9fcee 100644 --- a/modules/user/views/admin_users_group.html.php +++ b/modules/user/views/admin_users_group.html.php @@ -4,11 +4,11 @@ special): ?> id") ?>" title=" $group->name))->for_html_attr() ?>" - class="gDialogLink g-button ui-state-default ui-corner-all"> + class="g-dialogLink g-button ui-state-default ui-corner-all"> for_html_attr() ?>" - class="gDialogLink g-button ui-state-disabled ui-corner-all ui-icon-left"> + class="g-dialogLink g-button ui-state-disabled ui-corner-all ui-icon-left"> diff --git a/modules/user/views/login.html.php b/modules/user/views/login.html.php index bb670d51..c814bbfa 100644 --- a/modules/user/views/login.html.php +++ b/modules/user/views/login.html.php @@ -11,7 +11,7 @@ html::mark_clean( 'id}") . '" title="' . t("Edit Your Profile")->for_html_attr() . - '" id="gUserProfileLink" class="gDialogLink">' . + '" id="gUserProfileLink" class="g-dialogLink">' . html::clean($user->display_name()) . ''))) ?>
      • diff --git a/modules/user/views/login_ajax.html.php b/modules/user/views/login_ajax.html.php index a7530134..d3364b46 100644 --- a/modules/user/views/login_ajax.html.php +++ b/modules/user/views/login_ajax.html.php @@ -1,12 +1,12 @@ -
        +
          -
        • -
          - -
          +
        • +
        • - +
        diff --git a/modules/watermark/views/admin_watermarks.html.php b/modules/watermark/views/admin_watermarks.html.php index 3790030d..285f6407 100644 --- a/modules/watermark/views/admin_watermarks.html.php +++ b/modules/watermark/views/admin_watermarks.html.php @@ -8,7 +8,7 @@ " title="for_html_attr() ?>" - class="gDialogLink g-button ui-icon-left ui-state-default ui-corner-all"> + class="g-dialogLink g-button ui-icon-left ui-state-default ui-corner-all">

        @@ -27,10 +27,10 @@

        " title="for_html_attr() ?>" - class="gDialogLink g-button ui-icon-left ui-state-default ui-corner-all"> + class="g-dialogLink g-button ui-icon-left ui-state-default ui-corner-all"> " title="for_html_attr() ?>" - class="gDialogLink g-button ui-icon-left ui-state-default ui-corner-all"> + class="g-dialogLink g-button ui-icon-left ui-state-default ui-corner-all">
        diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css index 2679386b..24c63756 100644 --- a/themes/admin_wind/css/screen.css +++ b/themes/admin_wind/css/screen.css @@ -67,7 +67,7 @@ h3 { a, .gMenu a, -#gDialog a, +#g-dialog a, .g-button, .g-button:hover, .g-button:active, @@ -80,7 +80,7 @@ button.ui-state-hover { } a:hover, -#gDialog a:hover { +#g-dialog a:hover { text-decoration: underline; } @@ -88,21 +88,6 @@ a:hover, text-decoration: none; } -#gDialog .gCancel { - clear: none; - float: left; - margin: .3em 1em; -} - -#gForgotPasswordLink { - float: right; - font-size: .9em; -} - -#gDialog .gCancel { - float: left; -} - /* Tables ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ table { @@ -782,7 +767,7 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser { font-size: 0; } -.gDialogLoadingLarge { +.g-dialogLoadingLarge { background: url('../../../lib/images/loading-large.gif') no-repeat center center !important; font-size: 0; } @@ -836,34 +821,6 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser { opacity: .7; } -#gDialog { - text-align: left; -} - -#gDialog li { - padding-left: 0; -} - -#gDialog form input[type="text"], -#gDialog form input[type="password"] { - width: 100%; -} - -#gDialog #gLoginForm, -#gDialog #gAddUserForm, -#gDialog #gAddGroupForm { - margin: 0 auto; - width: 270px; -} - -#gDialog fieldset { - border: none; -} - -#gDialog legend { - display: none; -} - /* jQuery UI ThemeRoller buttons */ .gButtonSet { @@ -1056,7 +1013,7 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser { float: right; } -#gTaskLogDialog h1 { +#gTaskLog-dialog h1 { font-size: 1.1em; } @@ -1143,7 +1100,7 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser { .rtl caption, .rtl th, -.rtl #gDialog { +.rtl #g-dialog { text-align: right; } @@ -1159,7 +1116,7 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser { float: left; } -.rtl #gDialog .gCancel, +.rtl #g-dialog .g-cancel, .rtl form ul ul li, .rtl input[type="submit"], .rtl input[type="reset"], diff --git a/themes/admin_wind/js/ui.init.js b/themes/admin_wind/js/ui.init.js index d9b011bd..a603f87f 100644 --- a/themes/admin_wind/js/ui.init.js +++ b/themes/admin_wind/js/ui.init.js @@ -17,7 +17,7 @@ $(document).ready(function(){ $("#gMessage li").gallery_show_message(); // Initialize modal dialogs - $(".gDialogLink").gallery_dialog(); + $(".g-dialogLink").gallery_dialog(); // Initialize ajax links $(".gAjaxLink").gallery_ajax(); diff --git a/themes/wind/css/fix-ie.css b/themes/wind/css/fix-ie.css index 4c13764f..8899ec59 100644 --- a/themes/wind/css/fix-ie.css +++ b/themes/wind/css/fix-ie.css @@ -23,7 +23,7 @@ input.submit { width: 110px; } -#gDialog a.gCancel { +#g-dialog a.g-cancel { display: inline-block !important; float: none !important; } diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css index 8f17e310..ec75d310 100644 --- a/themes/wind/css/screen.css +++ b/themes/wind/css/screen.css @@ -67,7 +67,7 @@ h3 { a, .gMenu a, -#gDialog a, +#g-dialog a, .g-button, .g-button:hover, .g-button:active, @@ -81,7 +81,7 @@ button.ui-state-hover { } a:hover, -#gDialog a:hover { +#g-dialog a:hover { text-decoration: underline; } @@ -89,22 +89,7 @@ a:hover, text-decoration: none; } -#gDialog .gCancel { - clear: none; - float: left; - margin: .3em 1em; -} - -#gForgotPasswordLink { - float: right; - font-size: .9em; -} - -#gDialog .gCancel { - float: left; -} - -#gDialog #gMessage li { +#g-dialog #gMessage li { width: 400px; white-space: normal; padding-left: 32px; @@ -685,13 +670,13 @@ form .gError, font-weight: bold; } -#gDialog ul.gBreadcrumbs { +#g-dialog ul.gBreadcrumbs { clear: both; margin-left: 0; padding-left: 0; } -#gDialog .gBreadcrumbs li { +#g-dialog .gBreadcrumbs li { font-size: .9em; } @@ -822,7 +807,7 @@ form .gError, font-size: 0; } -.gDialogLoadingLarge { +.g-dialogLoadingLarge { background: url('../../../lib/images/loading-large.gif') no-repeat center center !important; font-size: 0; } @@ -850,38 +835,6 @@ form .gError, opacity: .7; } -#gDialog { - text-align: left; -} - -#gDialog li { - padding-left: 0; -} - -#gDialog form input[type="text"], -#gDialog form input[type="password"] { - width: 100%; -} - -#gDialog #gLoginForm, -#gDialog #gAddUserForm, -#gDialog #gAddGroupForm { - margin: 0 auto; - width: 270px; -} - -#gDialog fieldset { - border: none; -} - -#gDialog legend { - display: none; -} - -#gDialog p { - margin: 0; -} - /* jQuery UI ThemeRoller buttons */ .gButtonSet { @@ -1097,7 +1050,7 @@ form .gError, .rtl caption, .rtl th, -.rtl #gDialog { +.rtl #g-dialog { text-align: right; } @@ -1109,7 +1062,7 @@ form .gError, float: left; } -.rtl #gDialog .gCancel, +.rtl #g-dialog .g-cancel, .rtl form ul ul li, .rtl input[type="submit"], .rtl input[type="reset"], diff --git a/themes/wind/js/ui.init.js b/themes/wind/js/ui.init.js index 4a1962c0..4b3b4306 100644 --- a/themes/wind/js/ui.init.js +++ b/themes/wind/js/ui.init.js @@ -26,8 +26,8 @@ $(document).ready(function() { $("#gMessage li").gallery_show_message(); // Initialize dialogs - $("#gLoginLink").addClass("gDialogLink"); - $(".gDialogLink").gallery_dialog(); + $("#gLoginLink").addClass("g-dialogLink"); + $(".g-dialogLink").gallery_dialog(); // Initialize view menu if ($("#gViewMenu").length) { diff --git a/themes/wind/views/album.html.php b/themes/wind/views/album.html.php index 01f7be50..fd647f81 100644 --- a/themes/wind/views/album.html.php +++ b/themes/wind/views/album.html.php @@ -30,7 +30,7 @@ admin || access::can("add", $item)): ?> id") ?>
      • Add some.", - array("attrs" => html::mark_clean("href=\"$addurl\" class=\"gDialogLink\""))) ?>
        • + array("attrs" => html::mark_clean("href=\"$addurl\" class=\"g-dialogLink\""))) ?>
        • -- cgit v1.2.3 From 3e6ba7acc3291f2268cbe9c9bef0a492b557babb Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sun, 4 Oct 2009 00:27:22 -0600 Subject: Renamed most, if not all css selectors from gName to g-name. Moved a few shared images from wind to lib. Deleted unused images in the admin_wind. This will likely break a few ajax features. --- lib/gallery.common.css | 57 ++- lib/gallery.common.js | 24 +- lib/gallery.dialog.js | 4 +- lib/gallery.panel.js | 24 +- lib/gallery.show_full_size.js | 20 +- lib/images/ico-separator.gif | Bin 0 -> 106 bytes modules/akismet/helpers/akismet.php | 2 +- modules/akismet/views/admin_akismet.html.php | 4 +- modules/akismet/views/admin_akismet_stats.html.php | 6 +- modules/comment/helpers/comment.php | 20 +- modules/comment/helpers/comment_block.php | 2 +- modules/comment/helpers/comment_event.php | 2 +- modules/comment/helpers/comment_theme.php | 2 +- modules/comment/js/comment.js | 26 +- .../views/admin_block_recent_comments.html.php | 4 +- modules/comment/views/admin_comments.html.php | 20 +- modules/comment/views/comment.html.php | 6 +- modules/comment/views/comments.html.php | 14 +- modules/digibug/helpers/digibug_event.php | 7 +- modules/digibug/js/digibug.js | 7 +- modules/digibug/views/admin_digibug.html.php | 8 +- modules/exif/helpers/exif.php | 2 +- modules/exif/views/exif_dialog.html.php | 22 +- modules/exif/views/exif_sidebar.html.php | 5 +- modules/g2_import/controllers/admin_g2_import.php | 2 +- modules/g2_import/helpers/g2_import.php | 6 +- modules/g2_import/views/admin_g2_import.html.php | 18 +- modules/gallery/controllers/admin_dashboard.php | 2 +- modules/gallery/controllers/admin_languages.php | 2 +- modules/gallery/controllers/l10n_client.php | 4 +- modules/gallery/css/debug.css | 8 +- modules/gallery/css/l10n_client.css | 28 +- modules/gallery/helpers/album.php | 10 +- modules/gallery/helpers/gallery_block.php | 16 +- modules/gallery/helpers/gallery_event.php | 2 +- modules/gallery/helpers/graphics.php | 2 +- modules/gallery/helpers/item.php | 2 +- modules/gallery/helpers/log.php | 8 +- modules/gallery/helpers/message.php | 10 +- modules/gallery/helpers/movie.php | 2 +- modules/gallery/helpers/photo.php | 4 +- modules/gallery/helpers/site_status.php | 10 +- modules/gallery/helpers/theme.php | 14 +- modules/gallery/js/albums_form_add.js | 20 +- modules/gallery/js/l10n_client.js | 44 +- modules/gallery/libraries/Admin_View.php | 2 +- modules/gallery/libraries/Menu.php | 8 +- modules/gallery/libraries/Theme_View.php | 6 +- modules/gallery/models/item.php | 2 +- modules/gallery/tests/DrawForm_Test.php | 12 +- modules/gallery/tests/selenium/Add_Comment.html | 8 +- modules/gallery/tests/selenium/Login.html | 8 +- modules/gallery/tests/xss_data.txt | 62 +-- .../gallery/views/admin_advanced_settings.html.php | 8 +- .../views/admin_block_photo_stream.html.php | 2 +- modules/gallery/views/admin_dashboard.html.php | 22 +- modules/gallery/views/admin_graphics.html.php | 10 +- modules/gallery/views/admin_graphics_gd.html.php | 8 +- .../views/admin_graphics_graphicsmagick.html.php | 6 +- .../views/admin_graphics_imagemagick.html.php | 6 +- modules/gallery/views/admin_graphics_none.html.php | 2 +- modules/gallery/views/admin_languages.html.php | 12 +- modules/gallery/views/admin_maintenance.html.php | 26 +- .../views/admin_maintenance_show_log.html.php | 8 +- .../gallery/views/admin_maintenance_task.html.php | 24 +- modules/gallery/views/admin_modules.html.php | 4 +- modules/gallery/views/admin_sidebar.html.php | 24 +- .../gallery/views/admin_sidebar_blocks.html.php | 2 +- modules/gallery/views/admin_theme_options.html.php | 2 +- modules/gallery/views/admin_themes.html.php | 20 +- modules/gallery/views/form.html.php | 4 +- modules/gallery/views/l10n_client.html.php | 6 +- modules/gallery/views/move_browse.html.php | 14 +- modules/gallery/views/permissions_browse.html.php | 14 +- modules/gallery/views/permissions_form.html.php | 10 +- modules/gallery/views/simple_uploader.html.php | 28 +- modules/gallery/views/welcome_message.html.php | 6 +- .../gallery/views/welcome_message_loader.html.php | 4 +- modules/image_block/helpers/image_block_block.php | 2 +- .../image_block/views/image_block_block.html.php | 4 +- modules/info/helpers/info_block.php | 2 +- modules/info/views/info_block.html.php | 2 +- .../notification/helpers/notification_event.php | 2 +- modules/organize/css/organize.css | 50 +-- modules/organize/helpers/organize_event.php | 4 +- modules/organize/js/organize.js | 84 ++-- modules/organize/views/organize_dialog.html.php | 28 +- .../organize/views/organize_thumb_grid.html.php | 10 +- modules/organize/views/organize_tree.html.php | 8 +- modules/recaptcha/helpers/recaptcha.php | 2 +- modules/recaptcha/helpers/recaptcha_event.php | 2 +- modules/recaptcha/views/admin_recaptcha.html.php | 8 +- modules/recaptcha/views/form_recaptcha.html.php | 4 +- modules/rss/helpers/rss_block.php | 2 +- modules/rss/views/rss_block.html.php | 2 +- modules/search/helpers/search.php | 2 +- modules/search/helpers/search_installer.php | 2 +- modules/search/views/search.html.php | 12 +- modules/search/views/search_link.html.php | 6 +- .../server_add/controllers/admin_server_add.php | 2 +- modules/server_add/js/admin.js | 2 +- modules/server_add/js/server_add.js | 58 +-- modules/server_add/views/admin_server_add.html.php | 10 +- modules/server_add/views/server_add_tree.html.php | 6 +- .../views/server_add_tree_dialog.html.php | 26 +- modules/slideshow/helpers/slideshow_event.php | 6 +- modules/tag/helpers/tag.php | 6 +- modules/tag/helpers/tag_block.php | 2 +- modules/tag/js/tag.js | 38 +- modules/tag/views/admin_tags.html.php | 14 +- modules/tag/views/tag_block.html.php | 10 +- modules/user/controllers/password.php | 10 +- modules/user/helpers/group.php | 10 +- modules/user/helpers/user.php | 52 +-- modules/user/helpers/user_block.php | 2 +- modules/user/views/admin_users.html.php | 36 +- modules/user/views/admin_users_group.html.php | 6 +- modules/user/views/login.html.php | 8 +- modules/user/views/user_languages_block.html.php | 4 +- modules/watermark/helpers/watermark.php | 6 +- modules/watermark/views/admin_watermarks.html.php | 8 +- themes/admin_wind/css/fix-ie.css | 12 +- themes/admin_wind/css/screen.css | 453 ++++++++++----------- themes/admin_wind/images/avatar.jpg | Bin 914 -> 0 bytes themes/admin_wind/images/ico-album.png | Bin 397 -> 0 bytes themes/admin_wind/images/ico-print.png | Bin 989 -> 0 bytes themes/admin_wind/images/ico-separator.gif | Bin 106 -> 0 bytes themes/admin_wind/images/ico-view-comments.png | Bin 768 -> 0 bytes themes/admin_wind/images/ico-view-fullsize.png | Bin 1046 -> 0 bytes themes/admin_wind/images/ico-view-hybrid.png | Bin 494 -> 0 bytes themes/admin_wind/images/ico-view-slideshow.png | Bin 960 -> 0 bytes themes/admin_wind/js/ui.init.js | 38 +- themes/admin_wind/views/admin.html.php | 20 +- themes/admin_wind/views/block.html.php | 6 +- themes/admin_wind/views/pager.html.php | 4 +- themes/wind/css/fix-ie.css | 18 +- themes/wind/css/screen.css | 432 +++++++++----------- themes/wind/images/ico-separator.gif | Bin 106 -> 0 bytes themes/wind/images/ico-view-hybrid.png | Bin 494 -> 0 bytes themes/wind/js/ui.init.js | 72 ++-- themes/wind/views/album.html.php | 20 +- themes/wind/views/block.html.php | 4 +- themes/wind/views/dynamic.html.php | 12 +- themes/wind/views/movie.html.php | 12 +- themes/wind/views/no_sidebar.html.php | 2 +- themes/wind/views/page.html.php | 22 +- themes/wind/views/pager.html.php | 4 +- themes/wind/views/photo.html.php | 18 +- themes/wind/views/sidebar.html.php | 4 +- 149 files changed, 1278 insertions(+), 1317 deletions(-) create mode 100644 lib/images/ico-separator.gif delete mode 100644 themes/admin_wind/images/avatar.jpg delete mode 100644 themes/admin_wind/images/ico-album.png delete mode 100644 themes/admin_wind/images/ico-print.png delete mode 100644 themes/admin_wind/images/ico-separator.gif delete mode 100644 themes/admin_wind/images/ico-view-comments.png delete mode 100644 themes/admin_wind/images/ico-view-fullsize.png delete mode 100644 themes/admin_wind/images/ico-view-hybrid.png delete mode 100644 themes/admin_wind/images/ico-view-slideshow.png delete mode 100644 themes/wind/images/ico-separator.gif delete mode 100644 themes/wind/images/ico-view-hybrid.png (limited to 'modules/exif') diff --git a/lib/gallery.common.css b/lib/gallery.common.css index 5768e1cf..c422fe6e 100644 --- a/lib/gallery.common.css +++ b/lib/gallery.common.css @@ -133,11 +133,11 @@ form .g-error { .g-last { } -.g-even-row { +.g-even { background-color: #fff; } -.g-odd-row { +.g-odd { background-color: #eee; } @@ -211,7 +211,60 @@ form .g-error { margin-bottom: .4em; } +/* Breadcrumbs ~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ + +.g-breadcrumbs { + padding: 0 20px; +} + +.g-breadcrumbs li { + background: transparent url('images/ico-separator.gif') no-repeat scroll left center; + float: left; + padding: 10px 6px 10px 16px !important; +} + +.g-breadcrumbs li.root { + background: transparent; +} + +.g-breadcrumbs li a, +.g-breadcrumbs li span { + display: block; +} + +.g-breadcrumbs li.active, +.g-breadcrumbs li.active span { + font-weight: bold; +} + +#g-dialog ul.g-breadcrumbs { + clear: both; + margin-left: 0; + padding-left: 0; +} + +#g-dialog .g-breadcrumbs li { + font-size: .9em; +} + +/* Pagination ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ + .g-pager { + clear: both; + margin: 0; + padding: 5px 0 !important; + width: 100%; +} + +.g-pager li { + float: left; + margin: 0; + width: 30%; +} + +.g-pager .g-info { + text-align: center; + width: 40%; } .g-list-horizontal { diff --git a/lib/gallery.common.js b/lib/gallery.common.js index 59482b22..f2de74ad 100644 --- a/lib/gallery.common.js +++ b/lib/gallery.common.js @@ -24,8 +24,8 @@ if (container == null) { container = 'div'; } - $(this).html("<" + container + " class=\"gValign\">" + $(this).html() + ""); - var el = $(this).children(container + ".gValign"); + $(this).html("<" + container + " class=\"g-valign\">" + $(this).html() + ""); + var el = $(this).children(container + ".g-valign"); var elh = $(el).height(); var ph = $(this).height(); var nh = (ph - elh) / 2; @@ -47,21 +47,21 @@ /** * Toggle the processing indicator, both large and small - * @param elementID Target ID, including #, to apply .gLoadingSize + * @param elementID Target ID, including #, to apply .g-loading-size */ $.fn.gallery_show_loading = function() { return this.each(function(i){ var size; switch ($(this).attr("id")) { case "#g-dialog": - case "#gPanel": - size = "Large"; + case "#g-panel": + size = "large"; break; default: - size = "Small"; + size = "small"; break; } - $(this).toggleClass("gLoading" + size); + $(this).toggleClass("g-loading" + size); }); }; @@ -89,7 +89,7 @@ */ $.fn.gallery_get_photo = function() { var photo = $(this).find("img").filter(function() { - return this.id.match(/gPhotoId-\d+/); + return this.id.match(/g-photoId-\d+/); }); return photo; }; @@ -124,8 +124,8 @@ }; $.fn.gallery_context_menu = function() { - if ($(".gContextMenu li").length) { - var hover_target = ".gContextMenu"; + if ($(".g-context-menu li").length) { + var hover_target = ".g-context-menu"; var in_progress = 0; $(hover_target + " *").removeAttr('title'); $(hover_target + " ul").hide(); @@ -133,8 +133,8 @@ function() { if (in_progress == 0) { $(this).find("ul").slideDown("fast", function() { in_progress = 1; }); - $(this).find(".g-dialogLink").gallery_dialog(); - $(this).find(".gAjaxLink").gallery_ajax(); + $(this).find(".g-dialog-link").gallery_dialog(); + $(this).find(".g-ajax-link").gallery_ajax(); } }, function() { diff --git a/lib/gallery.dialog.js b/lib/gallery.dialog.js index a70200f9..c162ab2a 100644 --- a/lib/gallery.dialog.js +++ b/lib/gallery.dialog.js @@ -36,7 +36,7 @@ $("#g-dialog").dialog("open"); // Remove titlebar for progress dialogs or set title - if ($("#g-dialog #gProgress").length) { + if ($("#g-dialog #g-progress").length) { $(".ui-dialog-titlebar").remove(); } else if ($("#g-dialog h1").length) { $("#g-dialog").dialog('option', 'title', $("#g-dialog h1:eq(0)").html()); @@ -61,7 +61,7 @@ dialogWidth = size.width() - 100; // Set the iframe width and height $("#g-dialog iframe").width("100%").height(size.height() - 100); - } else if ($("#g-dialog .g-dialogPanel").length) { + } else if ($("#g-dialog .g-dialog-panel").length) { dialogWidth = size.width() - 100; $("#g-dialog").dialog("option", "height", size.height() - 100); } else if (childWidth == "" || childWidth > 300) { diff --git a/lib/gallery.panel.js b/lib/gallery.panel.js index 6115297d..8530dd9f 100644 --- a/lib/gallery.panel.js +++ b/lib/gallery.panel.js @@ -8,7 +8,7 @@ var parent = $(element).parent().parent(); var sHref = $(element).attr("href"); var parentClass = $(parent).attr("class"); - var ePanel = ""; + var ePanel = ""; // We keep track of the open vs. closed state by looking to see if there' // an orig_text attr. If that attr is missing, then the panel is closed @@ -16,12 +16,12 @@ var should_open = !$(element).attr("orig_text"); // Close any open panels and reset their button text - if ($("#gPanel").length) { - $("#gPanel").slideUp("slow").remove(); - $.each($(".gPanelLink"), + if ($("#g-panel").length) { + $("#g-panel").slideUp("slow").remove(); + $.each($(".g-panel-link"), function() { if ($(this).attr("orig_text")) { - $(this).children(".gButtonText").text($(this).attr("orig_text")); + $(this).children(".g-button-text").text($(this).attr("orig_text")); $(this).attr("orig_text", ""); } } @@ -30,15 +30,15 @@ if (should_open) { $(parent).after(ePanel); - $("#gPanel td").html(sHref); + $("#g-panel td").html(sHref); $.get(sHref, function(data) { - $("#gPanel td").html(data); + $("#g-panel td").html(data); self._ajaxify_panel(); if ($(element).attr("open_text")) { - $(element).attr("orig_text", $(element).children(".gButtonText").text()); - $(element).children(".gButtonText").text($(element).attr("open_text")); + $(element).attr("orig_text", $(element).children(".g-button-text").text()); + $(element).children(".g-button-text").text($(element).attr("open_text")); } - $("#gPanel").addClass(parentClass).show().slideDown("slow"); + $("#g-panel").addClass(parentClass).show().slideDown("slow"); }); } @@ -48,11 +48,11 @@ _ajaxify_panel: function () { var self = this; - $("#gPanel td form").ajaxForm({ + $("#g-panel td form").ajaxForm({ dataType: "json", success: function(data) { if (data.form) { - $("#gPanel td form").replaceWith(data.form); + $("#g-panel td form").replaceWith(data.form); self._ajaxify_panel(); } if (data.result == "success") { diff --git a/lib/gallery.show_full_size.js b/lib/gallery.show_full_size.js index 360ecdc2..49dc620a 100644 --- a/lib/gallery.show_full_size.js +++ b/lib/gallery.show_full_size.js @@ -7,7 +7,7 @@ var height = $(document).height(); var size = $.gallery_get_viewport_size(); - $("body").append('
        ' + - '
        '); $().click(function() { - $("#gFullsizeOverlay*").remove(); - $("#gFullsize").remove(); + $("#g-fullsize-overlay*").remove(); + $("#g-fullsize").remove(); }); $().bind("keypress", function() { - $("#gFullsizeOverlay*").remove(); - $("#gFullsize").remove(); + $("#g-fullsize-overlay*").remove(); + $("#g-fullsize").remove(); }); $(window).resize(function() { - $("#gFullsizeOverlay").width($(document).width()).height($(document).height()); + $("#g-fullsize-overlay").width($(document).width()).height($(document).height()); image_size = $.gallery_auto_fit_window(image_width, image_height); - $("#gFullsize").height(image_size.height) + $("#g-fullsize").height(image_size.height) .width(image_size.width) .css("top", image_size.top) .css("left", image_size.left); - $("#gFullSizeImage").height(image_size.height).width(image_size.width); + $("#g-fullsize-image").height(image_size.height).width(image_size.width); }); }; })(jQuery); diff --git a/lib/images/ico-separator.gif b/lib/images/ico-separator.gif new file mode 100644 index 00000000..3de2d0d3 Binary files /dev/null and b/lib/images/ico-separator.gif differ diff --git a/modules/akismet/helpers/akismet.php b/modules/akismet/helpers/akismet.php index acd5cb3e..43549ffa 100644 --- a/modules/akismet/helpers/akismet.php +++ b/modules/akismet/helpers/akismet.php @@ -21,7 +21,7 @@ class akismet_Core { public static $test_mode = TEST_MODE; static function get_configure_form() { - $form = new Forge("admin/akismet", "", "post", array("id" => "gConfigureAkismetForm")); + $form = new Forge("admin/akismet", "", "post", array("id" => "g-configure-akismet-form")); $group = $form->group("configure_akismet")->label(t("Configure Akismet")); $group->input("api_key")->label(t("API Key"))->value(module::get_var("akismet", "api_key")); $group->api_key->error_messages("invalid", t("The API key you provided is invalid.")); diff --git a/modules/akismet/views/admin_akismet.html.php b/modules/akismet/views/admin_akismet.html.php index 009d8810..22c60c97 100644 --- a/modules/akismet/views/admin_akismet.html.php +++ b/modules/akismet/views/admin_akismet.html.php @@ -1,5 +1,5 @@ -
        +

        Wordpress.com API Key, which is also free. Your comments will be automatically relayed to Akismet.com where they'll be scanned for spam. Spam messages will be flagged accordingly and hidden from your vistors until you approve or delete them.", @@ -8,7 +8,7 @@

        -
        +
        diff --git a/modules/akismet/views/admin_akismet_stats.html.php b/modules/akismet/views/admin_akismet_stats.html.php index 41bad15b..32908ba0 100644 --- a/modules/akismet/views/admin_akismet_stats.html.php +++ b/modules/akismet/views/admin_akismet_stats.html.php @@ -1,11 +1,11 @@ -
        -
        diff --git a/modules/comment/helpers/comment.php b/modules/comment/helpers/comment.php index f74a8644..7b2332a8 100644 --- a/modules/comment/helpers/comment.php +++ b/modules/comment/helpers/comment.php @@ -65,12 +65,12 @@ class comment_Core { } static function get_add_form($item) { - $form = new Forge("comments", "", "post", array("id" => "gAddCommentForm")); + $form = new Forge("comments", "", "post", array("id" => "g-comment-form")); $group = $form->group("add_comment")->label(t("Add comment")); - $group->input("name") ->label(t("Name")) ->id("gAuthor"); - $group->input("email") ->label(t("Email (hidden)")) ->id("gEmail"); - $group->input("url") ->label(t("Website (hidden)"))->id("gUrl"); - $group->textarea("text")->label(t("Comment")) ->id("gText"); + $group->input("name") ->label(t("Name")) ->id("g-author"); + $group->input("email") ->label(t("Email (hidden)")) ->id("g-email"); + $group->input("url") ->label(t("Website (hidden)"))->id("g-url"); + $group->textarea("text")->label(t("Comment")) ->id("g-text"); $group->hidden("item_id")->value($item->id); module::event("comment_add_form", $form); $group->submit("")->value(t("Add")); @@ -90,12 +90,12 @@ class comment_Core { static function get_edit_form($comment) { $form = new Forge("comments/{$comment->id}?_method=put", "", "post", - array("id" => "gEditCommentForm")); + array("id" => "g-edit-comment-form")); $group = $form->group("edit_comment")->label(t("Edit comment")); - $group->input("name") ->label(t("Author")) ->id("gAuthor"); - $group->input("email") ->label(t("Email (hidden)")) ->id("gEmail"); - $group->input("url") ->label(t("Website (hidden)"))->id("gUrl"); - $group->textarea("text")->label(t("Comment")) ->id("gText"); + $group->input("name") ->label(t("Author")) ->id("g-author"); + $group->input("email") ->label(t("Email (hidden)")) ->id("g-email"); + $group->input("url") ->label(t("Website (hidden)"))->id("g-url"); + $group->textarea("text")->label(t("Comment")) ->id("g-text"); $group->submit("")->value(t("Edit")); $group->text = $comment->text; diff --git a/modules/comment/helpers/comment_block.php b/modules/comment/helpers/comment_block.php index b989be6b..c00c6c51 100644 --- a/modules/comment/helpers/comment_block.php +++ b/modules/comment/helpers/comment_block.php @@ -26,7 +26,7 @@ class comment_block_Core { $block = new Block(); switch ($block_id) { case "recent_comments": - $block->css_id = "gRecentComments"; + $block->css_id = "g-recent-comments"; $block->title = t("Recent Comments"); $block->content = new View("admin_block_recent_comments.html"); $block->content->comments = diff --git a/modules/comment/helpers/comment_event.php b/modules/comment/helpers/comment_event.php index 0234aea9..2199eb7f 100644 --- a/modules/comment/helpers/comment_event.php +++ b/modules/comment/helpers/comment_event.php @@ -36,7 +36,7 @@ class comment_event_Core { ->id("comments") ->label(t("View comments on this item")) ->url("#comments") - ->css_id("gCommentsLink")); + ->css_id("g-comments-link")); } static function item_index_data($item, $data) { diff --git a/modules/comment/helpers/comment_theme.php b/modules/comment/helpers/comment_theme.php index e9b402f6..10c855db 100644 --- a/modules/comment/helpers/comment_theme.php +++ b/modules/comment/helpers/comment_theme.php @@ -25,7 +25,7 @@ class comment_theme_Core { static function photo_bottom($theme) { $block = new Block; - $block->css_id = "gComments"; + $block->css_id = "g-comments"; $block->title = t("Comments"); $block->anchor = "comments"; diff --git a/modules/comment/js/comment.js b/modules/comment/js/comment.js index 6e985626..96370fb1 100644 --- a/modules/comment/js/comment.js +++ b/modules/comment/js/comment.js @@ -1,43 +1,43 @@ $("document").ready(function() { - $("#gAddCommentButton").click(function(event) { + $("#g-admin-comment-button").click(function(event) { event.preventDefault(); - if (!$("#gAddCommentForm").length) { + if (!$("#g-comment-form").length) { $.get($(this).attr("href"), {}, function(data) { - $("#gCommentDetail").append(data); + $("#g-comment-detail").append(data); ajaxify_comment_form(); }); } }); - $("#gNoComments").click(function(event) { + $("#g-no-comments").click(function(event) { event.preventDefault(); - if (!$("#gAddCommentForm").length) { + if (!$("#g-comment-form").length) { $.get($(this).attr("href"), {}, function(data) { - $("#gCommentDetail").append(data); + $("#g-comment-detail").append(data); ajaxify_comment_form(); }); - $("#gNoCommentsYet").remove(); + $("#g-no-comments-yet").remove(); } }); }); function ajaxify_comment_form() { - $("#gComments form").ajaxForm({ + $("#g-comments form").ajaxForm({ dataType: "json", success: function(data) { if (data.form) { - $("#gComments form").replaceWith(data.form); + $("#g-comments form").replaceWith(data.form); ajaxify_comment_form(); } if (data.result == "success") { $.get(data.resource, function(data, textStatus) { - $("#gComments .gBlockContent ul:first").append("
      • "+data+"
        • "); - $("#gComments .gBlockContent ul:first li:last").effect("highlight", {color: "#cfc"}, 8000); - $("#gAddCommentForm").hide(2000).remove(); - $("#gNoCommentsYet").hide(2000); + $("#g-comments .g-block-content ul:first").append("
      • "+data+"
        • "); + $("#g-comments .g-block-content ul:first li:last").effect("highlight", {color: "#cfc"}, 8000); + $("#g-comment-form").hide(2000).remove(); + $("#g-no-comments-yet").hide(2000); }); } } diff --git a/modules/comment/views/admin_block_recent_comments.html.php b/modules/comment/views/admin_block_recent_comments.html.php index ca0d1c0b..7941e02d 100644 --- a/modules/comment/views/admin_block_recent_comments.html.php +++ b/modules/comment/views/admin_block_recent_comments.html.php @@ -1,9 +1,9 @@
          $comment): ?> -
        • "> +
        • "> " - class="gAvatar" + class="g-avatar" alt="author_name()) ?>" width="32" height="32" /> diff --git a/modules/comment/views/admin_comments.html.php b/modules/comment/views/admin_comments.html.php index 82de378c..0e8dd525 100644 --- a/modules/comment/views/admin_comments.html.php +++ b/modules/comment/views/admin_comments.html.php @@ -6,7 +6,7 @@ $.get(set_state_url.replace("__STATE__", state).replace("__ID__", id), {}, function() { - $("#gComment-" + id).slideUp(); + $("#g-comment-" + id).slideUp(); update_menu(); }); } @@ -18,7 +18,7 @@ $.get(delete_url.replace("__ID__", id), {}, function() { - $("#gComment-" + id).slideUp(); + $("#g-comment-" + id).slideUp(); update_menu(); }); } @@ -27,18 +27,18 @@ $.get(, {}, function(data) { for (var i = 0; i < data.length; i++) { - $("#gAdminCommentsMenu li:eq(" + i + ") a").html(data[i]); + $("#g-admin-comments-menu li:eq(" + i + ") a").html(data[i]); } }, "json"); } -
          +

          -
          +
          @@ -90,7 +90,7 @@
          - +
          $comment): ?> - "> + ">
          @@ -103,11 +103,11 @@
          " - class="gAvatar" + class="g-avatar" alt="author_name()) ?>" width="40" height="40" /> @@ -118,7 +118,7 @@
          item() ?> -
          +
          has_thumb()): ?> text)) ?>
          		-
            +
              state != "unpublished"): ?>
            • -
            • -

              +

            • +

              " - class="gAvatar" + class="g-avatar" alt="author_name()) ?>" width="40" height="40" /> diff --git a/modules/comment/views/comments.html.php b/modules/comment/views/comments.html.php index ee4a8ad6..636f1522 100644 --- a/modules/comment/views/comments.html.php +++ b/modules/comment/views/comments.html.php @@ -1,23 +1,23 @@ - id})") ?>" id="gAddCommentButton" + id})") ?>" id="g-admin-comment-button" class="g-button ui-corner-all ui-icon-left ui-state-default right"> -

              +
              count()): ?> -

              +

              comment!", - array("attrs" => html::mark_clean("id= \"gNoComments\" href=\"" . url::site("form/add/comments/{$item->id}") . "\" class=\"showCommentForm\""))) ?> + array("attrs" => html::mark_clean("id= \"g-no-comments\" href=\"" . url::site("form/add/comments/{$item->id}") . "\" class=\"showCommentForm\""))) ?>

                -
              • -

                +

              • +

                " - class="gAvatar" + class="g-avatar" alt="author_name()) ?>" width="40" height="40" /> diff --git a/modules/digibug/helpers/digibug_event.php b/modules/digibug/helpers/digibug_event.php index d2830b80..37fa57e5 100644 --- a/modules/digibug/helpers/digibug_event.php +++ b/modules/digibug/helpers/digibug_event.php @@ -32,8 +32,8 @@ class digibug_event_Core { ->id("digibug") ->label(t("Print with Digibug")) ->url(url::site("digibug/print_photo/$item->id?csrf=$theme->csrf")) - ->css_id("gDigibugLink") - ->css_class("ui-icon-print")); + ->css_id("g-print-digibug-link") + ->css_class("g-print-digibug-link ui-icon-print")); } static function context_menu($menu, $theme, $item) { @@ -43,8 +43,7 @@ class digibug_event_Core { ->id("digibug") ->label(t("Print with Digibug")) ->url(url::site("digibug/print_photo/$item->id?csrf=$theme->csrf")) - ->css_id("gDigibugLink") - ->css_class("ui-icon-print")); + ->css_class("g-print-digibug-link ui-icon-print")); } } } diff --git a/modules/digibug/js/digibug.js b/modules/digibug/js/digibug.js index 30bff47d..46ddac52 100644 --- a/modules/digibug/js/digibug.js +++ b/modules/digibug/js/digibug.js @@ -1,10 +1,5 @@ $(document).ready(function() { - $(".gDigibugPrintButton a").click(function(e) { - e.preventDefault(); - return digibug_popup(e.currentTarget.href, { width: 800, height: 600 } ); - }); - - $("#gDigibugLink").click(function(e) { + $(".g-print-digibug-link").click(function(e) { e.preventDefault(); return digibug_popup(e.currentTarget.href, { width: 800, height: 600 } ); }); diff --git a/modules/digibug/views/admin_digibug.html.php b/modules/digibug/views/admin_digibug.html.php index cb952a8a..f75adc60 100644 --- a/modules/digibug/views/admin_digibug.html.php +++ b/modules/digibug/views/admin_digibug.html.php @@ -1,14 +1,14 @@ -

                -
                - "> +
                +
                + ">

                  -
                • +
                diff --git a/modules/exif/helpers/exif.php b/modules/exif/helpers/exif.php index 453690ea..5ddd09d4 100644 --- a/modules/exif/helpers/exif.php +++ b/modules/exif/helpers/exif.php @@ -163,7 +163,7 @@ class exif_Core { list ($remaining) = exif::stats(); if ($remaining) { site_status::warning( - t('Your Exif index needs to be updated.                 Fix this now', + t('Your Exif index needs to be updated. Fix this now', array("url" => html::mark_clean(url::site("admin/maintenance/start/exif_task::update_index?csrf=__CSRF__")))), "exif_index_out_of_date"); } diff --git a/modules/exif/views/exif_dialog.html.php b/modules/exif/views/exif_dialog.html.php index 11d1e212..b50eea1d 100644 --- a/modules/exif/views/exif_dialog.html.php +++ b/modules/exif/views/exif_dialog.html.php @@ -1,30 +1,30 @@ -

                -
                - +
                +
                - - - - - + diff --git a/modules/exif/views/exif_sidebar.html.php b/modules/exif/views/exif_sidebar.html.php index 3c7bb517..04f72b02 100644 --- a/modules/exif/views/exif_sidebar.html.php +++ b/modules/exif/views/exif_sidebar.html.php @@ -1,7 +1,6 @@ -id}") ?>" title="for_html_attr() ?>" - class="g-dialogLink g-button ui-icon-left ui-state-default ui-corner-all"> +id}") ?>" title="for_html_attr() ?>" + class="g-dialog-link g-button ui-icon-left ui-state-default ui-corner-all"> - diff --git a/modules/g2_import/controllers/admin_g2_import.php b/modules/g2_import/controllers/admin_g2_import.php index 18d09363..1c65f482 100644 --- a/modules/g2_import/controllers/admin_g2_import.php +++ b/modules/g2_import/controllers/admin_g2_import.php @@ -68,7 +68,7 @@ class Admin_g2_import_Controller extends Admin_Controller { private function _get_import_form() { $form = new Forge( - "admin/g2_import/save", "", "post", array("id" => "gAdminConfigureG2ImportForm")); + "admin/g2_import/save", "", "post", array("id" => "g-admin-configure-g2-import-form")); $group = $form->group("configure_g2_import")->label(t("Configure Gallery 2 Import")); $group->input("embed_path")->label(t("Filesystem path to your Gallery 2 embed.php file")) ->value(module::get_var("g2_import", "embed_path", "")); diff --git a/modules/g2_import/helpers/g2_import.php b/modules/g2_import/helpers/g2_import.php index 7e5c6f75..99d56d5d 100644 --- a/modules/g2_import/helpers/g2_import.php +++ b/modules/g2_import/helpers/g2_import.php @@ -201,7 +201,7 @@ class g2_import_Core { if (g2_import::g2_module_active("tags") && module::is_active("tag")) { $result = - g2($gallery->search("SELECT COUNT(DISTINCT([TagItemMap::itemId])) FROM [TagItemMap]")) + g2($gallery->search("SELECT COUNT(DISTINCT([Tag-itemMap::itemId])) FROM [Tag-itemMap]")) ->nextResult(); $stats["tags"] = $result[0]; } else { @@ -853,8 +853,8 @@ class g2_import_Core { $ids = array(); $results = g2($gallery->search( - "SELECT DISTINCT([TagItemMap::itemId]) FROM [TagItemMap] " . - "WHERE [TagItemMap::itemId] > ?", + "SELECT DISTINCT([Tag-itemMap::itemId]) FROM [Tag-itemMap] " . + "WHERE [Tag-itemMap::itemId] > ?", array($min_id), array("limit" => array("count" => 100)))); while ($result = $results->nextResult()) { diff --git a/modules/g2_import/views/admin_g2_import.html.php b/modules/g2_import/views/admin_g2_import.html.php index 314f030b..51a1e245 100644 --- a/modules/g2_import/views/admin_g2_import.html.php +++ b/modules/g2_import/views/admin_g2_import.html.php @@ -1,11 +1,11 @@ -
                +

                -
                +

                @@ -28,14 +28,14 @@ -

                +

                -
                  -
                • +
                    +
                  • g2_import::version())) ?>
                    • -
                  • +
                  • Using the same value will speed up your import.", array("g2_pixels" => $g2_sizes["thumb"]["size"], "g3_pixels" => $thumb_size, @@ -44,7 +44,7 @@ -
                  • +
                  • Using the same value will speed up your import.", array("g2_pixels" => $g2_sizes["resize"]["size"], "g3_pixels" => $resize_size, @@ -53,7 +53,7 @@
                  -
                  +

                  @@ -84,7 +84,7 @@

                  - "> diff --git a/modules/gallery/controllers/admin_dashboard.php b/modules/gallery/controllers/admin_dashboard.php index 6bf3b966..7e28f625 100644 --- a/modules/gallery/controllers/admin_dashboard.php +++ b/modules/gallery/controllers/admin_dashboard.php @@ -22,7 +22,7 @@ class Admin_Dashboard_Controller extends Admin_Controller { $view = new Admin_View("admin.html"); $view->content = new View("admin_dashboard.html"); $view->content->blocks = block_manager::get_html("dashboard_center"); - $view->sidebar = "

                  " . + $view->sidebar = "
                  " . block_manager::get_html("dashboard_sidebar") . "
                  "; print $view; diff --git a/modules/gallery/controllers/admin_languages.php b/modules/gallery/controllers/admin_languages.php index a9693d21..8af1dd85 100644 --- a/modules/gallery/controllers/admin_languages.php +++ b/modules/gallery/controllers/admin_languages.php @@ -105,7 +105,7 @@ class Admin_Languages_Controller extends Admin_Controller { } private function _share_translations_form() { - $form = new Forge("admin/languages/share", "", "post", array("id" => "gShareTranslationsForm")); + $form = new Forge("admin/languages/share", "", "post", array("id" => "g-share-translations-form")); $group = $form->group("sharing") ->label(t("Sharing your own translations with the Gallery community is easy. Please do!")); $api_key = l10n_client::api_key(); diff --git a/modules/gallery/controllers/l10n_client.php b/modules/gallery/controllers/l10n_client.php index 6e19310b..6fdbb3a1 100644 --- a/modules/gallery/controllers/l10n_client.php +++ b/modules/gallery/controllers/l10n_client.php @@ -102,9 +102,9 @@ class L10n_Client_Controller extends Controller { } private static function _l10n_client_search_form() { - $form = new Forge("l10n_client/search", "", "post", array("id" => "gL10nSearchForm")); + $form = new Forge("l10n_client/search", "", "post", array("id" => "g-l10n-search-form")); $group = $form->group("l10n_search"); - $group->input("l10n-search")->id("gL10nSearch"); + $group->input("l10n-search")->id("g-l10n-search"); $group->submit("l10n-search-filter-clear")->value(t("X")); return $form; diff --git a/modules/gallery/css/debug.css b/modules/gallery/css/debug.css index fe5665ad..6808da09 100644 --- a/modules/gallery/css/debug.css +++ b/modules/gallery/css/debug.css @@ -1,4 +1,4 @@ -.gAnnotatedThemeBlock { +.g-annotated-theme-block { border: 1px solid #C00; clear: both; margin: 1em; @@ -6,15 +6,15 @@ position: relative; } -.gAnnotatedThemeBlock_album_top { +.g-annotated-theme-block_album_top { float: right; } -.gAnnotatedThemeBlock_header_bottom { +.g-annotated-theme-block_header_bottom { float: right; } -.gAnnotatedThemeBlock div.title { +.g-annotated-theme-block div.title { background: #C00; border: 1px solid black; color: white; diff --git a/modules/gallery/css/l10n_client.css b/modules/gallery/css/l10n_client.css index 9c1b12d0..542da8e6 100644 --- a/modules/gallery/css/l10n_client.css +++ b/modules/gallery/css/l10n_client.css @@ -1,6 +1,8 @@ -// TODO(andy_st): Add original copyright notice from Drupal l10_client. -// TODO(andy_st): Add G3 copyright notice. -// TODO(andy_st): clean up formatting to match our other CSS files. +/** + * TODO(andy_st): Add original copyright notice from Drupal l10_client. + * TODO(andy_st): Add G3 copyright notice. + * TODO(andy_st): clean up formatting to match our other CSS files. + */ /* $Id: l10n_client.css,v 1.6 2008/09/09 10:48:20 goba Exp $ */ @@ -50,7 +52,7 @@ font-size: 1em; padding: .5em; } -#l10n-client-toggler #gMinimizeL10n { +#l10n-client-toggler #g-minimize-l10n { border-right: 1px solid #ffffff; } @@ -126,31 +128,31 @@ #l10n-client .string-list li.active { font-weight:bold;} -#l10n-client #gL10nSearchForm { +#l10n-client #g-l10n-search-form { background:#eee; text-align:center; height:2em; line-height:2em; margin:0em; padding:.5em .5em; } -#l10n-client #gL10nSearchForm .form-item, -#l10n-client #gL10nSearchForm input.form-text, -#l10n-client #gL10nSearchForm #search-filter-go, -#l10n-client #gL10nSearchForm #search-filter-clear { +#l10n-client #g-l10n-search-form .form-item, +#l10n-client #g-l10n-search-form input.form-text, +#l10n-client #g-l10n-search-form #search-filter-go, +#l10n-client #g-l10n-search-form #search-filter-clear { display:inline; vertical-align:middle; } -#l10n-client #gL10nSearchForm .form-item { +#l10n-client #g-l10n-search-form .form-item { margin:0em; padding:0em; } -#l10n-client #gL10nSearchForm input.form-text { +#l10n-client #g-l10n-search-form input.form-text { width:80%; } -#l10n-client #gL10nSearchForm #search-filter-clear { +#l10n-client #g-l10n-search-form #search-filter-clear { width:10%; margin:0em; } @@ -178,7 +180,7 @@ overflow:hidden; width:49%; float:right;} -#gL10nClientSaveForm { +#g-l10n-client-save-form { padding:0em;} #l10n-client form ul, diff --git a/modules/gallery/helpers/album.php b/modules/gallery/helpers/album.php index 65868cf2..72a79a75 100644 --- a/modules/gallery/helpers/album.php +++ b/modules/gallery/helpers/album.php @@ -92,7 +92,7 @@ class album_Core { } static function get_add_form($parent) { - $form = new Forge("albums/{$parent->id}", "", "post", array("id" => "gAddAlbumForm")); + $form = new Forge("albums/{$parent->id}", "", "post", array("id" => "g-add-album-form")); $group = $form->group("add_album") ->label(t("Add an album to %album_title", array("album_title" => $parent->title))); $group->input("title")->label(t("Title")); @@ -114,7 +114,7 @@ class album_Core { } static function get_edit_form($parent) { - $form = new Forge("albums/{$parent->id}", "", "post", array("id" => "gEditAlbumForm")); + $form = new Forge("albums/{$parent->id}", "", "post", array("id" => "g-edit-album-form")); $form->hidden("_method")->value("put"); $group = $form->group("edit_item")->label(t("Edit Album")); @@ -141,14 +141,14 @@ class album_Core { $group->hidden("slug")->value($parent->slug); } - $sort_order = $group->group("sort_order", array("id" => "gAlbumSortOrder")) + $sort_order = $group->group("sort_order", array("id" => "g-album-sort-order")) ->label(t("Sort Order")); - $sort_order->dropdown("column", array("id" => "gAlbumSortColumn")) + $sort_order->dropdown("column", array("id" => "g-album-sort-column")) ->label(t("Sort by")) ->options(album::get_sort_order_options()) ->selected($parent->sort_column); - $sort_order->dropdown("direction", array("id" => "gAlbumSortDirection")) + $sort_order->dropdown("direction", array("id" => "g-album-sort-direction")) ->label(t("Order")) ->options(array("ASC" => t("Ascending"), "DESC" => t("Descending"))) diff --git a/modules/gallery/helpers/gallery_block.php b/modules/gallery/helpers/gallery_block.php index f2cb8ded..5d49a9de 100644 --- a/modules/gallery/helpers/gallery_block.php +++ b/modules/gallery/helpers/gallery_block.php @@ -32,13 +32,13 @@ class gallery_block_Core { $block = new Block(); switch($block_id) { case "welcome": - $block->css_id = "gWelcome"; + $block->css_id = "g-welcome"; $block->title = t("Welcome to Gallery 3"); $block->content = new View("admin_block_welcome.html"); break; case "photo_stream": - $block->css_id = "gPhotoStream"; + $block->css_id = "g-photo-stream"; $block->title = t("Photo Stream"); $block->content = new View("admin_block_photo_stream.html"); $block->content->photos = @@ -46,7 +46,7 @@ class gallery_block_Core { break; case "log_entries": - $block->css_id = "gLogEntries"; + $block->css_id = "g-log-entries"; $block->title = t("Log Entries"); $block->content = new View("admin_block_log_entries.html"); $block->content->entries = ORM::factory("log") @@ -54,7 +54,7 @@ class gallery_block_Core { break; case "stats": - $block->css_id = "gStats"; + $block->css_id = "g-stats"; $block->title = t("Gallery Stats"); $block->content = new View("admin_block_stats.html"); $block->content->album_count = @@ -63,7 +63,7 @@ class gallery_block_Core { break; case "platform_info": - $block->css_id = "gPlatform"; + $block->css_id = "g-platform"; $block->title = t("Platform Information"); $block->content = new View("admin_block_platform.html"); if (is_readable("/proc/loadavg")) { @@ -75,14 +75,14 @@ class gallery_block_Core { break; case "project_news": - $block->css_id = "gProjectNews"; + $block->css_id = "g-project-news"; $block->title = t("Gallery Project News"); $block->content = new View("admin_block_news.html"); $block->content->feed = feed::parse("http://gallery.menalto.com/node/feed", 3); break; case "block_adder": - $block->css_id = "gBlockAdder"; + $block->css_id = "g-block-adder"; $block->title = t("Dashboard Content"); $block->content = self::get_add_block_form(); } @@ -92,7 +92,7 @@ class gallery_block_Core { static function get_add_block_form() { $form = new Forge("admin/dashboard/add_block", "", "post", - array("id" => "gAddDashboardBlockForm")); + array("id" => "g-add-dashboard-block-form")); $group = $form->group("add_block")->label(t("Add Block")); $group->dropdown("id")->label(t("Available Blocks")) ->options(block_manager::get_available_admin_blocks()); diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php index c01f4135..290d7d12 100644 --- a/modules/gallery/helpers/gallery_event.php +++ b/modules/gallery/helpers/gallery_event.php @@ -281,7 +281,7 @@ class gallery_event_Core { ->id("delete") ->label($delete_title) ->css_class("ui-icon-trash") - ->css_id("gQuickDelete") + ->css_id("g-quick-delete") ->url(url::site("quick/form_delete/$item->id?csrf=$csrf&page_type=$page_type"))); } diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php index f9b88638..ecddd86b 100644 --- a/modules/gallery/helpers/graphics.php +++ b/modules/gallery/helpers/graphics.php @@ -249,7 +249,7 @@ class graphics_Core { "%count of your photos are out of date. Click here to fix them", $count, array("attrs" => html::mark_clean(sprintf( - 'href="%s" class="g-dialogLink"', + 'href="%s" class="g-dialog-link"', url::site("admin/maintenance/start/gallery_task::rebuild_dirty_images?csrf=__CSRF__"))))), "graphics_dirty"); } diff --git a/modules/gallery/helpers/item.php b/modules/gallery/helpers/item.php index 588c08d4..084bbc15 100644 --- a/modules/gallery/helpers/item.php +++ b/modules/gallery/helpers/item.php @@ -130,7 +130,7 @@ class item_Core { $page_type = "photo"; } $form = new Forge( - "quick/delete/$item->id?page_type=$page_type", "", "post", array("id" => "gConfirmDelete")); + "quick/delete/$item->id?page_type=$page_type", "", "post", array("id" => "g-confirm-delete")); $form->hidden("_method")->value("put"); $group = $form->group("confirm_delete")->label(t("Confirm Deletion")); $group->submit("")->value(t("Delete")); diff --git a/modules/gallery/helpers/log.php b/modules/gallery/helpers/log.php index 451f985a..c8e94b45 100644 --- a/modules/gallery/helpers/log.php +++ b/modules/gallery/helpers/log.php @@ -93,16 +93,16 @@ class log_Core { static function severity_class($severity) { switch($severity) { case self::SUCCESS: - return "gSuccess"; + return "g-success"; case self::INFO: - return "gInfo"; + return "g-info"; case self::WARNING: - return "gWarning"; + return "g-warning"; case self::ERROR: - return "gError"; + return "g-error"; } } } diff --git a/modules/gallery/helpers/message.php b/modules/gallery/helpers/message.php index af3b96cc..0d638571 100644 --- a/modules/gallery/helpers/message.php +++ b/modules/gallery/helpers/message.php @@ -81,7 +81,7 @@ class message_Core { $buf[] = "
                • $msg[0]
                  • "; } if ($buf) { - return "
                    " . implode("", $buf) . "
                  "; + return "
                    " . implode("", $buf) . "
                  "; } } @@ -93,16 +93,16 @@ class message_Core { static function severity_class($severity) { switch($severity) { case self::SUCCESS: - return "gSuccess"; + return "g-success"; case self::INFO: - return "gInfo"; + return "g-info"; case self::WARNING: - return "gWarning"; + return "g-warning"; case self::ERROR: - return "gError"; + return "g-error"; } } } diff --git a/modules/gallery/helpers/movie.php b/modules/gallery/helpers/movie.php index 6c8c6c88..2190fc94 100644 --- a/modules/gallery/helpers/movie.php +++ b/modules/gallery/helpers/movie.php @@ -129,7 +129,7 @@ class movie_Core { } static function get_edit_form($movie) { - $form = new Forge("movies/$movie->id", "", "post", array("id" => "gEditMovieForm")); + $form = new Forge("movies/$movie->id", "", "post", array("id" => "g-edit-movie-form")); $form->hidden("_method")->value("put"); $group = $form->group("edit_item")->label(t("Edit Movie")); $group->input("title")->label(t("Title"))->value($movie->title); diff --git a/modules/gallery/helpers/photo.php b/modules/gallery/helpers/photo.php index 065d2d31..692f7111 100644 --- a/modules/gallery/helpers/photo.php +++ b/modules/gallery/helpers/photo.php @@ -138,7 +138,7 @@ class photo_Core { } static function get_add_form($parent) { - $form = new Forge("albums/{$parent->id}", "", "post", array("id" => "gAddPhotoForm")); + $form = new Forge("albums/{$parent->id}", "", "post", array("id" => "g-add-photo-form")); $group = $form->group("add_photo")->label( t("Add Photo to %album_title", array("album_title" => $parent->title))); $group->input("title")->label(t("Title")); @@ -157,7 +157,7 @@ class photo_Core { } static function get_edit_form($photo) { - $form = new Forge("photos/$photo->id", "", "post", array("id" => "gEditPhotoForm")); + $form = new Forge("photos/$photo->id", "", "post", array("id" => "g-edit-photo-form")); $form->hidden("_method")->value("put"); $group = $form->group("edit_item")->label(t("Edit Photo")); $group->input("title")->label(t("Title"))->value($photo->title); diff --git a/modules/gallery/helpers/site_status.php b/modules/gallery/helpers/site_status.php index 6d47e565..b7c6de9a 100644 --- a/modules/gallery/helpers/site_status.php +++ b/modules/gallery/helpers/site_status.php @@ -105,7 +105,7 @@ class site_status_Core { } if ($buf) { - return "
                    " . implode("", $buf) . "
                  "; + return "
                    " . implode("", $buf) . "
                  "; } } @@ -117,16 +117,16 @@ class site_status_Core { static function severity_class($severity) { switch($severity) { case self::SUCCESS: - return "gSuccess"; + return "g-success"; case self::INFO: - return "gInfo"; + return "g-info"; case self::WARNING: - return "gWarning"; + return "g-warning"; case self::ERROR: - return "gError"; + return "g-error"; } } } diff --git a/modules/gallery/helpers/theme.php b/modules/gallery/helpers/theme.php index b46a2c14..fb8f7ca7 100644 --- a/modules/gallery/helpers/theme.php +++ b/modules/gallery/helpers/theme.php @@ -40,22 +40,22 @@ class theme_Core { } static function get_edit_form_admin() { - $form = new Forge("admin/theme_options/save/", "", null, array("id" =>"gThemeOptionsForm")); + $form = new Forge("admin/theme_options/save/", "", null, array("id" =>"g-theme-options-form")); $group = $form->group("edit_theme"); - $group->input("page_size")->label(t("Items per page"))->id("gPageSize") + $group->input("page_size")->label(t("Items per page"))->id("g-page-size") ->rules("required|valid_digit") ->value(module::get_var("gallery", "page_size")); - $group->input("thumb_size")->label(t("Thumbnail size (in pixels)"))->id("gThumbSize") + $group->input("thumb_size")->label(t("Thumbnail size (in pixels)"))->id("g-thumb-size") ->rules("required|valid_digit") ->value(module::get_var("gallery", "thumb_size")); - $group->input("resize_size")->label(t("Resized image size (in pixels)"))->id("gResizeSize") + $group->input("resize_size")->label(t("Resized image size (in pixels)"))->id("g-resize-size") ->rules("required|valid_digit") ->value(module::get_var("gallery", "resize_size")); - $group->textarea("header_text")->label(t("Header text"))->id("gHeaderText") + $group->textarea("header_text")->label(t("Header text"))->id("g-header-text") ->value(module::get_var("gallery", "header_text")); - $group->textarea("footer_text")->label(t("Footer text"))->id("gFooterText") + $group->textarea("footer_text")->label(t("Footer text"))->id("g-footer-text") ->value(module::get_var("gallery", "footer_text")); - $group->checkbox("show_credits")->label(t("Show site credits"))->id("gFooterText") + $group->checkbox("show_credits")->label(t("Show site credits"))->id("g-footer-text") ->checked(module::get_var("gallery", "show_credits")); $group->submit("")->value(t("Save")); return $form; diff --git a/modules/gallery/js/albums_form_add.js b/modules/gallery/js/albums_form_add.js index 43166f27..a568f35d 100644 --- a/modules/gallery/js/albums_form_add.js +++ b/modules/gallery/js/albums_form_add.js @@ -1,22 +1,22 @@ -$("#gAddAlbumForm input[name=title]").change( +$("#g-add-album-form input[name=title]").change( function() { - $("#gAddAlbumForm input[name=name]").attr( - "value", $("#gAddAlbumForm input[name=title]").attr("value") + $("#g-add-album-form input[name=name]").attr( + "value", $("#g-add-album-form input[name=title]").attr("value") .replace(/[\s\/]+/g, "-").replace(/\.+$/, "")); - $("#gAddAlbumForm input[name=slug]").attr( - "value", $("#gAddAlbumForm input[name=title]").attr("value") + $("#g-add-album-form input[name=slug]").attr( + "value", $("#g-add-album-form input[name=title]").attr("value") .replace(/[^A-Za-z0-9-_]+/g, "-") .replace(/^-+/, "") .replace(/-+$/, "")); }); -$("#gAddAlbumForm input[name=title]").keyup( +$("#g-add-album-form input[name=title]").keyup( function() { - $("#gAddAlbumForm input[name=name]").attr( - "value", $("#gAddAlbumForm input[name=title]").attr("value") + $("#g-add-album-form input[name=name]").attr( + "value", $("#g-add-album-form input[name=title]").attr("value") .replace(/[\s\/]+/g, "-") .replace(/\.+$/, "")); - $("#gAddAlbumForm input[name=slug]").attr( - "value", $("#gAddAlbumForm input[name=title]").attr("value") + $("#g-add-album-form input[name=slug]").attr( + "value", $("#g-add-album-form input[name=title]").attr("value") .replace(/[^A-Za-z0-9-_]+/g, "-") .replace(/^-+/, "") .replace(/-+$/, "")); diff --git a/modules/gallery/js/l10n_client.js b/modules/gallery/js/l10n_client.js index 35986e5a..9acb6ca8 100644 --- a/modules/gallery/js/l10n_client.js +++ b/modules/gallery/js/l10n_client.js @@ -35,12 +35,12 @@ jQuery.extend(Gallery, { if(userSelection.length > 0) { Gallery.l10nClient.filter(userSelection); Gallery.l10nClient.toggle(1); - $('#l10n-client #gL10nSearch').focus(); + $('#l10n-client #g-l10n-search').focus(); } else { if($('#l10n-client').is('.hidden')) { Gallery.l10nClient.toggle(1); if(!$.browser.safari) { - $('#l10n-client #gL10nSearch').focus(); + $('#l10n-client #g-l10n-search').focus(); } } else { Gallery.l10nClient.toggle(0); @@ -59,7 +59,7 @@ jQuery.extend(Gallery, { $('#l10n-client-string-select, #l10n-client-string-editor, #l10n-client .labels .label').show(); $('#l10n-client').height('22em').removeClass('hidden'); //$('#l10n-client').slideUp(); - $('#gMinimizeL10n').text("_"); + $('#g-minimize-l10n').text("_"); /* * This CSS clashes with Gallery's CSS, probably due to * YUI's grid / floats. @@ -73,7 +73,7 @@ jQuery.extend(Gallery, { $('#l10n-client-string-select, #l10n-client-string-editor, #l10n-client .labels .label').hide(); $('#l10n-client').height('2em').addClass('hidden'); // TODO: Localize this message - $('#gMinimizeL10n').text(MSG_TRANSLATE_TEXT); + $('#g-minimize-l10n').text(MSG_TRANSLATE_TEXT); /* if(!$.browser.msie) { $('body').css('border-bottom', '0px'); @@ -131,13 +131,13 @@ jQuery.extend(Gallery, { if(search == false || search == '') { $('#l10n-client #l10n-search-filter-clear').focus(); $('#l10n-client-string-select li').show(); - $('#l10n-client #gL10nSearch').val(''); - $('#l10n-client #gL10nSearch').focus(); + $('#l10n-client #g-l10n-search').val(''); + $('#l10n-client #g-l10n-search').focus(); } else { if(search.length > 0) { $('#l10n-client-string-select li').hide(); $('#l10n-client-string-select li:contains('+search+')').show(); - $('#l10n-client #gL10nSearch').val(search); + $('#l10n-client #g-l10n-search').val(search); } } } @@ -193,12 +193,12 @@ Gallery.behaviors.l10nClient = function(context) { var is_plural = Gallery.l10nClient.isPluralMessage(source); Gallery.l10nClient.showSourceMessage(source, is_plural); Gallery.l10nClient.updateTranslationForm(Gallery.l10nClient.getString(index, 'translation'), is_plural); - $("#gL10nClientSaveForm input[name='l10n-message-key']").val(key); + $("#g-l10n-client-save-form input[name='l10n-message-key']").val(key); Gallery.l10nClient.selected = index; }); // When l10n_client window is clicked, toggle based on current state. - $('#gMinimizeL10n').click(function() { + $('#g-minimize-l10n').click(function() { if($('#l10n-client').is('.hidden')) { Gallery.l10nClient.toggle(1); } else { @@ -207,7 +207,7 @@ Gallery.behaviors.l10nClient = function(context) { }); // Close the l10n client using an AJAX call and refreshing the page - $('#gCloseL10n').click(function(event) { + $('#g-close-l10n').click(function(event) { $.ajax({ type: "GET", url: toggle_l10n_mode_url, @@ -223,12 +223,12 @@ Gallery.behaviors.l10nClient = function(context) { // TODO: Either remove hotkeys code or add query.hotkeys.js. if($.hotkeys) { $.hotkeys.add(Gallery.l10nClient.keys['toggle'], function(){Gallery.l10nClient.key('toggle')}); - $.hotkeys.add(Gallery.l10nClient.keys['clear'], {target:'#l10n-client #gL10nSearch', type:'keyup'}, function(){Gallery.l10nClient.key('clear')}); + $.hotkeys.add(Gallery.l10nClient.keys['clear'], {target:'#l10n-client #g-l10n-search', type:'keyup'}, function(){Gallery.l10nClient.key('clear')}); } // Custom listener for l10n_client livesearch - $('#l10n-client #gL10nSearch').keyup(function(key) { - Gallery.l10nClient.filter($('#l10n-client #gL10nSearch').val()); + $('#l10n-client #g-l10n-search').keyup(function(key) { + Gallery.l10nClient.filter($('#l10n-client #g-l10n-search').val()); }); // Clear search @@ -238,7 +238,7 @@ Gallery.behaviors.l10nClient = function(context) { }); // Send AJAX POST data on form submit. - $('#gL10nClientSaveForm').ajaxForm({ + $('#g-l10n-client-save-form').ajaxForm({ dataType: "json", success: function(data) { var source = Gallery.l10nClient.getString(Gallery.l10nClient.selected, 'source'); @@ -250,7 +250,7 @@ Gallery.behaviors.l10nClient = function(context) { var translation = {}; for (var i = 0; i < num_plural_forms; i++) { var form = plural_forms[i]; - translation[form] = $('#gL10nClientSaveForm #l10n-edit-plural-translation-' + form).attr('value'); + translation[form] = $('#g-l10n-client-save-form #l10n-edit-plural-translation-' + form).attr('value'); } } else { translation = $('#l10n-edit-translation').attr('value'); @@ -262,13 +262,13 @@ Gallery.behaviors.l10nClient = function(context) { // Clear the translation form fields Gallery.l10nClient.showSourceMessage('', false); - $('#gL10nClientSaveForm #l10n-edit-translation').val(''); + $('#g-l10n-client-save-form #l10n-edit-translation').val(''); for (var i = 0; i < num_plural_forms; i++) { var form = plural_forms[i]; - $('#gL10nClientSaveForm #l10n-edit-plural-translation-' + form).val(''); + $('#g-l10n-client-save-form #l10n-edit-plural-translation-' + form).val(''); } - $("#gL10nClientSaveForm input[name='l10n-message-key']").val(''); + $("#g-l10n-client-save-form input[name='l10n-message-key']").val(''); }, error: function(xmlhttp) { // TODO: Localize this message @@ -283,12 +283,12 @@ Gallery.behaviors.l10nClient = function(context) { // TODO: Handle plurals in copy button // Copy source text to translation field on button click. - $('#gL10nClientSaveForm #l10n-edit-copy').click(function() { - $('#gL10nClientSaveForm #l10n-edit-target').val($('#l10n-client-string-editor .source-text').text()); + $('#g-l10n-client-save-form #l10n-edit-copy').click(function() { + $('#g-l10n-client-save-form #l10n-edit-target').val($('#l10n-client-string-editor .source-text').text()); }); // Clear translation field on button click. - $('#gL10nClientSaveForm #l10n-edit-clear').click(function() { - $('#gL10nClientSaveForm #l10n-edit-target').val(''); + $('#g-l10n-client-save-form #l10n-edit-clear').click(function() { + $('#g-l10n-client-save-form #l10n-edit-target').val(''); }); }; diff --git a/modules/gallery/libraries/Admin_View.php b/modules/gallery/libraries/Admin_View.php index 9b12df7e..fa6d1dd3 100644 --- a/modules/gallery/libraries/Admin_View.php +++ b/modules/gallery/libraries/Admin_View.php @@ -96,7 +96,7 @@ class Admin_View_Core extends Gallery_View { if (Session::instance()->get("debug")) { if ($function != "admin_head") { array_unshift( - $blocks, "
                  " . + $blocks, "
                  " . "
                  $function
                  "); $blocks[] = "
                  "; } diff --git a/modules/gallery/libraries/Menu.php b/modules/gallery/libraries/Menu.php index 4be374a2..47af8531 100644 --- a/modules/gallery/libraries/Menu.php +++ b/modules/gallery/libraries/Menu.php @@ -91,7 +91,7 @@ class Menu_Element_Link extends Menu_Element { } else { $css_class = ""; } - return "
                • url\" " . + return "
                • url\" " . "title=\"$this->label\">$this->label
                  • "; } } @@ -122,7 +122,7 @@ class Menu_Element_Ajax_Link extends Menu_Element { } else { $css_class = ""; } - return "
                • url\" " . + return "
                • url\" " . "title=\"$this->label\" ajax_handler=\"$this->ajax_handler\">$this->label
                  • "; } } @@ -142,7 +142,7 @@ class Menu_Element_Dialog extends Menu_Element { } else { $css_class = ""; } - return "
                • url\" " . + return "
                • url\" " . "title=\"$this->label\">$this->label
                  • "; } } @@ -171,7 +171,7 @@ class Menu_Core extends Menu_Element { case "root": $menu = new Menu("root"); - $menu->css_class("gMenu"); + $menu->css_class("g-menu"); return $menu; case "submenu": diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php index ab25a4b6..cba436e8 100644 --- a/modules/gallery/libraries/Theme_View.php +++ b/modules/gallery/libraries/Theme_View.php @@ -103,7 +103,7 @@ class Theme_View_Core extends Gallery_View { ->id("fullsize") ->label(t("View full size")) ->url($this->item()->file_url()) - ->css_class("gFullSizeLink")); + ->css_class("g-fullsize-link")); } module::event("photo_menu", $menu, $this); @@ -121,7 +121,7 @@ class Theme_View_Core extends Gallery_View { ->append(Menu::factory("submenu") ->id("context_menu") ->label(t("Options"))) - ->css_class("gContextMenu"); + ->css_class("g-context-menu"); module::event("context_menu", $menu, $this, $item, $thumbnail_css_selector); return $menu->compact(); @@ -231,7 +231,7 @@ class Theme_View_Core extends Gallery_View { if (Session::instance()->get("debug")) { if ($function != "head") { array_unshift( - $blocks, "
                  " . + $blocks, "
                  " . "
                  $function
                  "); $blocks[] = "
                  "; } diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php index ff02daf8..246d5fcd 100644 --- a/modules/gallery/models/item.php +++ b/modules/gallery/models/item.php @@ -567,7 +567,7 @@ class Item_Model extends ORM_MPTT { $v->attrs = array_merge($extra_attrs, array("style" => "display:block;width:{$this->width}px;height:{$this->height}px")); if (empty($v->attrs["id"])) { - $v->attrs["id"] = "gMovieId-{$this->id}"; + $v->attrs["id"] = "g-movie-id-{$this->id}"; } return $v; } diff --git a/modules/gallery/tests/DrawForm_Test.php b/modules/gallery/tests/DrawForm_Test.php index dde54257..7ee80ca2 100644 --- a/modules/gallery/tests/DrawForm_Test.php +++ b/modules/gallery/tests/DrawForm_Test.php @@ -19,14 +19,14 @@ */ class DrawForm_Test extends Unit_Test_Case { function no_group_test() { - $form = new Forge("test/controller", "", "post", array("id" => "gTestGroupForm")); + $form = new Forge("test/controller", "", "post", array("id" => "g-test-group-form")); $form->input("title")->label(t("Title")); $form->textarea("description")->label(t("Text Area")); $form->submit("")->value(t("Submit")); $rendered = $form->__toString(); $expected = "
                  \n" . + "id=\"g-test-group-form\">\n" . "\n" . "
                    \n" . "
                  • \n" . @@ -48,7 +48,7 @@ class DrawForm_Test extends Unit_Test_Case { } function group_test() { - $form = new Forge("test/controller", "", "post", array("id" => "gTestGroupForm")); + $form = new Forge("test/controller", "", "post", array("id" => "g-test-group-form")); $group = $form->group("test_group")->label(t("Test Group")); $group->input("title")->label(t("Title")); $group->textarea("description")->label(t("Text Area")); @@ -56,7 +56,7 @@ class DrawForm_Test extends Unit_Test_Case { $rendered = $form->__toString(); $expected = "\n" . + "id=\"g-test-group-form\">\n" . "\n" . "
                    \n" . " Test Group\n" . @@ -81,7 +81,7 @@ class DrawForm_Test extends Unit_Test_Case { } function form_script_test() { - $form = new Forge("test/controller", "", "post", array("id" => "gTestGroupForm")); + $form = new Forge("test/controller", "", "post", array("id" => "g-test-group-form")); $group = $form->group("test_group")->label(t("Test Group")); $group->input("title")->label(t("Title")); $group->textarea("description")->label(t("Text Area")); @@ -92,7 +92,7 @@ class DrawForm_Test extends Unit_Test_Case { $rendered = $form->__toString(); $expected = "\n" . + "id=\"g-test-group-form\">\n" . "\n" . "
                    \n" . " Test Group\n" . diff --git a/modules/gallery/tests/selenium/Add_Comment.html b/modules/gallery/tests/selenium/Add_Comment.html index b4b96ed2..dff653da 100644 --- a/modules/gallery/tests/selenium/Add_Comment.html +++ b/modules/gallery/tests/selenium/Add_Comment.html @@ -18,22 +18,22 @@
                - + - + - + - + diff --git a/modules/gallery/tests/selenium/Login.html b/modules/gallery/tests/selenium/Login.html index 5e17a3c7..d2e45c63 100644 --- a/modules/gallery/tests/selenium/Login.html +++ b/modules/gallery/tests/selenium/Login.html @@ -18,17 +18,17 @@ - + - + - + @@ -38,7 +38,7 @@ - + diff --git a/modules/gallery/tests/xss_data.txt b/modules/gallery/tests/xss_data.txt index 5fd6a390..c8ba3770 100644 --- a/modules/gallery/tests/xss_data.txt +++ b/modules/gallery/tests/xss_data.txt @@ -1,12 +1,12 @@ modules/akismet/views/admin_akismet.html.php 16 DIRTY $form modules/akismet/views/admin_akismet_stats.html.php 9 DIRTY_ATTR $api_key modules/akismet/views/admin_akismet_stats.html.php 9 DIRTY_ATTR urlencode($blog_url) -modules/comment/views/admin_block_recent_comments.html.php 4 DIRTY_ATTR ($i%2==0)?"g-even-row":"g-odd-row" +modules/comment/views/admin_block_recent_comments.html.php 4 DIRTY_ATTR ($i%2==0)?"g-even":"g-odd" modules/comment/views/admin_block_recent_comments.html.php 5 DIRTY_ATTR $comment->author()->avatar_url(32,$theme->url(,true)) modules/comment/views/admin_block_recent_comments.html.php 10 DIRTY gallery::date_time($comment->created) modules/comment/views/admin_comments.html.php 42 DIRTY $menu modules/comment/views/admin_comments.html.php 106 DIRTY_ATTR $comment->id -modules/comment/views/admin_comments.html.php 106 DIRTY_ATTR ($i%2==0)?"g-odd-row":"g-even-row" +modules/comment/views/admin_comments.html.php 106 DIRTY_ATTR ($i%2==0)?"g-odd":"g-even" modules/comment/views/admin_comments.html.php 109 DIRTY_ATTR $comment->author()->avatar_url(40,$theme->url(,true)) modules/comment/views/admin_comments.html.php 122 DIRTY_JS $item->url() modules/comment/views/admin_comments.html.php 124 DIRTY_ATTR $item->thumb_url() @@ -56,14 +56,14 @@ modules/gallery/views/admin_dashboard.html.php 35 DIRTY $block modules/gallery/views/admin_graphics.html.php 22 DIRTY newView("admin_graphics_none.html") modules/gallery/views/admin_graphics.html.php 24 DIRTY newView("admin_graphics_$active.html",array("tk"=>$tk->$active,"is_active"=>true)) modules/gallery/views/admin_graphics.html.php 31 DIRTY newView("admin_graphics_$id.html",array("tk"=>$tk->$id,"is_active"=>false)) -modules/gallery/views/admin_graphics_gd.html.php 2 DIRTY_ATTR $is_active?" gSelected":"" -modules/gallery/views/admin_graphics_gd.html.php 2 DIRTY_ATTR $tk->installed?" gInstalledToolkit":" gUnavailable" +modules/gallery/views/admin_graphics_gd.html.php 2 DIRTY_ATTR $is_active?" g-selected":"" +modules/gallery/views/admin_graphics_gd.html.php 2 DIRTY_ATTR $tk->installed?" g-installed-toolkit":" g-unavailable" modules/gallery/views/admin_graphics_gd.html.php 19 DIRTY $tk->error -modules/gallery/views/admin_graphics_graphicsmagick.html.php 2 DIRTY_ATTR $is_active?" gSelected":"" -modules/gallery/views/admin_graphics_graphicsmagick.html.php 2 DIRTY_ATTR $tk->installed?" gInstalledToolkit":" gUnavailable" +modules/gallery/views/admin_graphics_graphicsmagick.html.php 2 DIRTY_ATTR $is_active?" g-selected":"" +modules/gallery/views/admin_graphics_graphicsmagick.html.php 2 DIRTY_ATTR $tk->installed?" g-installed-toolkit":" g-unavailable" modules/gallery/views/admin_graphics_graphicsmagick.html.php 18 DIRTY $tk->error -modules/gallery/views/admin_graphics_imagemagick.html.php 2 DIRTY_ATTR $is_active?" gSelected":"" -modules/gallery/views/admin_graphics_imagemagick.html.php 2 DIRTY_ATTR $tk->installed?" gInstalledToolkit":" gUnavailable" +modules/gallery/views/admin_graphics_imagemagick.html.php 2 DIRTY_ATTR $is_active?" g-selected":"" +modules/gallery/views/admin_graphics_imagemagick.html.php 2 DIRTY_ATTR $tk->installed?" g-installed-toolkit":" g-unavailable" modules/gallery/views/admin_graphics_imagemagick.html.php 18 DIRTY $tk->error modules/gallery/views/admin_languages.html.php 9 DIRTY access::csrf_form_field() modules/gallery/views/admin_languages.html.php 27 DIRTY_ATTR (isset($installed_locales[$code]))?"installed":"" @@ -72,20 +72,20 @@ modules/gallery/views/admin_languages.html.php 28 DIRTY form:: modules/gallery/views/admin_languages.html.php 29 DIRTY $display_name modules/gallery/views/admin_languages.html.php 31 DIRTY form::radio("default_locale",$code,($default_locale==$code),((isset($installed_locales[$code]))?'':'disabled="disabled"')) modules/gallery/views/admin_languages.html.php 102 DIRTY $share_translations_form -modules/gallery/views/admin_maintenance.html.php 24 DIRTY_ATTR ($i%2==0)?"g-odd-row":"g-even-row" +modules/gallery/views/admin_maintenance.html.php 24 DIRTY_ATTR ($i%2==0)?"g-odd":"g-even" modules/gallery/views/admin_maintenance.html.php 24 DIRTY_ATTR log::severity_class($task->severity) modules/gallery/views/admin_maintenance.html.php 25 DIRTY_ATTR log::severity_class($task->severity) modules/gallery/views/admin_maintenance.html.php 26 DIRTY $task->name modules/gallery/views/admin_maintenance.html.php 29 DIRTY $task->description -modules/gallery/views/admin_maintenance.html.php 72 DIRTY_ATTR ($i%2==0)?"g-odd-row":"g-even-row" -modules/gallery/views/admin_maintenance.html.php 72 DIRTY_ATTR $task->state=="stalled"?"gWarning":"" -modules/gallery/views/admin_maintenance.html.php 73 DIRTY_ATTR $task->state=="stalled"?"gWarning":"" +modules/gallery/views/admin_maintenance.html.php 72 DIRTY_ATTR ($i%2==0)?"g-odd":"g-even" +modules/gallery/views/admin_maintenance.html.php 72 DIRTY_ATTR $task->state=="stalled"?"g-warning":"" +modules/gallery/views/admin_maintenance.html.php 73 DIRTY_ATTR $task->state=="stalled"?"g-warning":"" modules/gallery/views/admin_maintenance.html.php 74 DIRTY gallery::date_time($task->updated) modules/gallery/views/admin_maintenance.html.php 77 DIRTY $task->name modules/gallery/views/admin_maintenance.html.php 92 DIRTY $task->status -modules/gallery/views/admin_maintenance.html.php 145 DIRTY_ATTR ($i%2==0)?"g-odd-row":"g-even-row" -modules/gallery/views/admin_maintenance.html.php 145 DIRTY_ATTR $task->state=="success"?"gSuccess":"gError" -modules/gallery/views/admin_maintenance.html.php 146 DIRTY_ATTR $task->state=="success"?"gSuccess":"gError" +modules/gallery/views/admin_maintenance.html.php 145 DIRTY_ATTR ($i%2==0)?"g-odd":"g-even" +modules/gallery/views/admin_maintenance.html.php 145 DIRTY_ATTR $task->state=="success"?"g-success":"g-error" +modules/gallery/views/admin_maintenance.html.php 146 DIRTY_ATTR $task->state=="success"?"g-success":"g-error" modules/gallery/views/admin_maintenance.html.php 147 DIRTY gallery::date_time($task->updated) modules/gallery/views/admin_maintenance.html.php 150 DIRTY $task->name modules/gallery/views/admin_maintenance.html.php 162 DIRTY $task->status @@ -93,7 +93,7 @@ modules/gallery/views/admin_maintenance_show_log.html.php 8 DIRTY_JS url::s modules/gallery/views/admin_maintenance_show_log.html.php 13 DIRTY $task->name modules/gallery/views/admin_maintenance_task.html.php 55 DIRTY $task->name modules/gallery/views/admin_modules.html.php 9 DIRTY access::csrf_form_field() -modules/gallery/views/admin_modules.html.php 19 DIRTY_ATTR ($i%2==0)?"g-odd-row":"g-even-row" +modules/gallery/views/admin_modules.html.php 19 DIRTY_ATTR ($i%2==0)?"g-odd":"g-even" modules/gallery/views/admin_modules.html.php 22 DIRTY form::checkbox($data,'1',module::is_active($module_name)) modules/gallery/views/admin_modules.html.php 24 DIRTY $module_info->version modules/gallery/views/admin_theme_options.html.php 5 DIRTY $form @@ -178,7 +178,7 @@ modules/gallery/views/upgrader.html.php 45 DIRTY_ATTR $id modules/gallery/views/upgrader.html.php 49 DIRTY $module->version modules/gallery/views/upgrader.html.php 52 DIRTY $module->code_version modules/image_block/views/image_block_block.html.php 3 DIRTY_JS $item->url() -modules/image_block/views/image_block_block.html.php 4 DIRTY $item->thumb_img(array("class"=>"gThumbnail")) +modules/image_block/views/image_block_block.html.php 4 DIRTY $item->thumb_img(array("class"=>"g-thumbnail")) modules/info/views/info_block.html.php 22 DIRTY date("M j, Y H:i:s",$item->captured) modules/info/views/info_block.html.php 29 DIRTY_JS $item->owner->url modules/notification/views/comment_published.html.php 28 DIRTY_JS $comment->item()->abs_url() @@ -195,19 +195,19 @@ modules/organize/views/organize_dialog.html.php 5 DIRTY_JS url::s modules/organize/views/organize_dialog.html.php 6 DIRTY_JS url::site("organize/tree/__ALBUM_ID__") modules/organize/views/organize_dialog.html.php 22 DIRTY $album_tree modules/organize/views/organize_dialog.html.php 29 DIRTY $micro_thumb_grid -modules/organize/views/organize_dialog.html.php 37 DIRTY form::dropdown(array("id"=>"gOrganizeSortColumn"),album::get_sort_order_options(),$album->sort_column) -modules/organize/views/organize_dialog.html.php 38 DIRTY form::dropdown(array("id"=>"gOrganizeSortOrder"),array("ASC"=>"Ascending","DESC"=>"Descending"),$album->sort_order) +modules/organize/views/organize_dialog.html.php 37 DIRTY form::dropdown(array("id"=>"g-organize-sort-column"),album::get_sort_order_options(),$album->sort_column) +modules/organize/views/organize_dialog.html.php 38 DIRTY form::dropdown(array("id"=>"g-organize-sort-order"),array("ASC"=>"Ascending","DESC"=>"Descending"),$album->sort_order) modules/organize/views/organize_thumb_grid.html.php 3 DIRTY_ATTR $child->id modules/organize/views/organize_thumb_grid.html.php 4 DIRTY_ATTR $child->id -modules/organize/views/organize_thumb_grid.html.php 5 DIRTY_ATTR $child->is_album()?"gAlbum":"gPhoto" -modules/organize/views/organize_thumb_grid.html.php 6 DIRTY $child->thumb_img(array("class"=>"gThumbnail","ref"=>$child->id),90,true) +modules/organize/views/organize_thumb_grid.html.php 5 DIRTY_ATTR $child->is_album()?"g-album":"g-photo" +modules/organize/views/organize_thumb_grid.html.php 6 DIRTY $child->thumb_img(array("class"=>"g-thumbnail","ref"=>$child->id),90,true) modules/organize/views/organize_thumb_grid.html.php 14 DIRTY_JS url::site("organize/album/$album->id/".($offset+25)) -modules/organize/views/organize_tree.html.php 2 DIRTY_ATTR access::can("edit",$album)?"":"gViewOnly" +modules/organize/views/organize_tree.html.php 2 DIRTY_ATTR access::can("edit",$album)?"":"g-view-only" modules/organize/views/organize_tree.html.php 3 DIRTY_ATTR $album->id modules/organize/views/organize_tree.html.php 6 DIRTY_ATTR $selected&&$album->id==$selected->id?"selected":"" modules/organize/views/organize_tree.html.php 7 DIRTY_ATTR $album->id modules/organize/views/organize_tree.html.php 13 DIRTY View::factory("organize_tree.html",array("selected"=>$selected,"album"=>$child)); -modules/organize/views/organize_tree.html.php 15 DIRTY_ATTR access::can("edit",$child)?"":"gViewOnly" +modules/organize/views/organize_tree.html.php 15 DIRTY_ATTR access::can("edit",$child)?"":"g-view-only" modules/organize/views/organize_tree.html.php 16 DIRTY_ATTR $child->id modules/organize/views/organize_tree.html.php 19 DIRTY_ATTR $child->id modules/recaptcha/views/admin_recaptcha.html.php 10 DIRTY $form @@ -252,7 +252,7 @@ modules/search/views/search.html.php 32 DIRTY $item- modules/server_add/views/admin_server_add.html.php 15 DIRTY_ATTR $id modules/server_add/views/admin_server_add.html.php 24 DIRTY $form modules/server_add/views/server_add_tree.html.php 20 DIRTY_ATTR is_dir($file)?"ui-icon-folder-collapsed":"ui-icon-document" -modules/server_add/views/server_add_tree.html.php 21 DIRTY_ATTR is_dir($file)?"gDirectory":"gFile" +modules/server_add/views/server_add_tree.html.php 21 DIRTY_ATTR is_dir($file)?"g-directory":"g-file" modules/server_add/views/server_add_tree_dialog.html.php 3 DIRTY_JS url::site("server_add/children?path=__PATH__") modules/server_add/views/server_add_tree_dialog.html.php 4 DIRTY_JS url::site("server_add/start?item_id={$item->id}&csrf=$csrf") modules/server_add/views/server_add_tree_dialog.html.php 23 DIRTY $tree @@ -267,19 +267,19 @@ modules/user/views/admin_users.html.php 3 DIRTY_JS url::s modules/user/views/admin_users.html.php 26 DIRTY_JS url::site("admin/users/group/__GROUPID__") modules/user/views/admin_users.html.php 36 DIRTY_JS url::site("admin/users/remove_user_from_group/__USERID__/__GROUPID__?csrf=$csrf") modules/user/views/admin_users.html.php 67 DIRTY_ATTR $user->id -modules/user/views/admin_users.html.php 67 DIRTY_ATTR text::alternate("g-odd-row","g-even-row") +modules/user/views/admin_users.html.php 67 DIRTY_ATTR text::alternate("g-odd","g-even") modules/user/views/admin_users.html.php 67 DIRTY_ATTR $user->admin?"admin":"" modules/user/views/admin_users.html.php 68 DIRTY_ATTR $user->id modules/user/views/admin_users.html.php 69 DIRTY_ATTR $user->avatar_url(20,$theme->url(,true)) modules/user/views/admin_users.html.php 83 DIRTY ($user->last_login==0)?"":gallery::date($user->last_login) modules/user/views/admin_users.html.php 121 DIRTY_ATTR $group->id -modules/user/views/admin_users.html.php 121 DIRTY_ATTR ($group->special?"gDefaultGroup":"") +modules/user/views/admin_users.html.php 121 DIRTY_ATTR ($group->special?"g-default-group":"") modules/user/views/admin_users.html.php 123 DIRTY $v modules/user/views/admin_users_group.html.php 22 DIRTY_JS $user->id modules/user/views/admin_users_group.html.php 22 DIRTY_JS $group->id modules/user/views/login_ajax.html.php 6 DIRTY_JS url::site("password/reset") modules/user/views/login_ajax.html.php 37 DIRTY $form -modules/user/views/user_languages_block.html.php 2 DIRTY form::dropdown("gSelectSessionLocale",$installed_locales,$selected) +modules/user/views/user_languages_block.html.php 2 DIRTY form::dropdown("g-select-session-locale",$installed_locales,$selected) modules/watermark/views/admin_watermarks.html.php 19 DIRTY_ATTR $width modules/watermark/views/admin_watermarks.html.php 19 DIRTY_ATTR $height modules/watermark/views/admin_watermarks.html.php 19 DIRTY_ATTR $url @@ -308,13 +308,13 @@ themes/admin_wind/views/pager.html.php 37 DIRTY_JS str_re themes/wind/views/album.html.php 16 DIRTY_ATTR $child->id themes/wind/views/album.html.php 16 DIRTY_ATTR $item_class themes/wind/views/album.html.php 18 DIRTY_JS $child->url() -themes/wind/views/album.html.php 19 DIRTY $child->thumb_img(array("class"=>"gThumbnail")) +themes/wind/views/album.html.php 19 DIRTY $child->thumb_img(array("class"=>"g-thumbnail")) themes/wind/views/album.html.php 23 DIRTY_JS $child->url() themes/wind/views/block.html.php 3 DIRTY_ATTR $anchor themes/wind/views/block.html.php 5 DIRTY_ATTR $css_id themes/wind/views/block.html.php 6 DIRTY $title themes/wind/views/block.html.php 8 DIRTY $content -themes/wind/views/dynamic.html.php 11 DIRTY_ATTR $child->is_album()?"gAlbum":"" +themes/wind/views/dynamic.html.php 11 DIRTY_ATTR $child->is_album()?"g-album":"" themes/wind/views/dynamic.html.php 13 DIRTY_JS $child->url() themes/wind/views/dynamic.html.php 14 DIRTY_ATTR $child->id themes/wind/views/dynamic.html.php 15 DIRTY_ATTR $child->thumb_url() @@ -322,7 +322,7 @@ themes/wind/views/dynamic.html.php 16 DIRTY_ATTR $chi themes/wind/views/dynamic.html.php 17 DIRTY_ATTR $child->thumb_height themes/wind/views/movie.html.php 8 DIRTY_JS $previous_item->url() themes/wind/views/movie.html.php 18 DIRTY_JS $next_item->url() -themes/wind/views/movie.html.php 28 DIRTY $item->movie_img(array("class"=>"gMovie","id"=>"gMovieId-{$item->id}")) +themes/wind/views/movie.html.php 28 DIRTY $item->movie_img(array("class"=>"g-movie","id"=>"g-movie-id-{$item->id}")) themes/wind/views/page.html.php 9 DIRTY $page_title themes/wind/views/page.html.php 32 DIRTY_JS $theme->url() themes/wind/views/page.html.php 41 DIRTY $new_width @@ -344,4 +344,4 @@ themes/wind/views/photo.html.php 8 DIRTY_JS $theme themes/wind/views/photo.html.php 21 DIRTY_JS $previous_item->url() themes/wind/views/photo.html.php 31 DIRTY_JS $next_item->url() themes/wind/views/photo.html.php 43 DIRTY_JS $item->file_url() -themes/wind/views/photo.html.php 45 DIRTY $item->resize_img(array("id"=>"gPhotoId-{$item->id}","class"=>"gResize")) +themes/wind/views/photo.html.php 45 DIRTY $item->resize_img(array("id"=>"g-photoId-{$item->id}","class"=>"g-resize")) diff --git a/modules/gallery/views/admin_advanced_settings.html.php b/modules/gallery/views/admin_advanced_settings.html.php index 6ad265ac..422bd8f7 100644 --- a/modules/gallery/views/admin_advanced_settings.html.php +++ b/modules/gallery/views/admin_advanced_settings.html.php @@ -1,11 +1,11 @@ -
                +

                -
                  -
                • +
                    +
                  @@ -23,7 +23,7 @@
                + + + +
                clickAndWaitgPhotoId-2g-photoId-2
                typegAuthorg-author Test
                typegEmailg-email test@gmail.com
                typegTextg-text This is a selenium test comment.
                clickgLoginLinkg-login-link
                typegNameg-name admin
                typegPasswordg-password admin
                clickAndWaitgUserProfileLinkg-user-profile-link
                name) ?> module_name/" . html::clean($var->name)) ?>" - class="g-dialogLink" + class="g-dialog-link" title=" $var->name, "module_name" => $var->module_name))->for_html_attr() ?>"> value): ?> value) ?> diff --git a/modules/gallery/views/admin_block_photo_stream.html.php b/modules/gallery/views/admin_block_photo_stream.html.php index 4968c39b..f9725eee 100644 --- a/modules/gallery/views/admin_block_photo_stream.html.php +++ b/modules/gallery/views/admin_block_photo_stream.html.php @@ -1,7 +1,7 @@
                  -
                • +
                • width, $photo->height, 72) ?> src="thumb_url() ?>" alt="title)->for_html_attr() ?>" /> diff --git a/modules/gallery/views/admin_dashboard.html.php b/modules/gallery/views/admin_dashboard.html.php index 148de65f..154aa172 100644 --- a/modules/gallery/views/admin_dashboard.html.php +++ b/modules/gallery/views/admin_dashboard.html.php @@ -3,34 +3,34 @@ update_blocks = function() { $.get(, {"csrf": "", - "dashboard_center[]": $("#gAdminDashboard").sortable( + "dashboard_center[]": $("#g-admin-dashboard").sortable( "toArray", {attribute: "block_id"}), - "dashboard_sidebar[]": $("#gAdminDashboardSidebar").sortable( + "dashboard_sidebar[]": $("#g-admin-dashboard-sidebar").sortable( "toArray", {attribute: "block_id"})}); }; $(document).ready(function(){ - $("#gAdminDashboard .gBlock .ui-widget-header").addClass("gDraggable"); - $("#gAdminDashboard").sortable({ - connectWith: ["#gAdminDashboardSidebar"], + $("#g-admin-dashboard .g-block .ui-widget-header").addClass("g-draggable"); + $("#g-admin-dashboard").sortable({ + connectWith: ["#g-admin-dashboard-sidebar"], cursor: "move", handle: $(".ui-widget-header"), opacity: 0.6, - placeholder: "gDropTarget", + placeholder: "g-drop-target", stop: update_blocks }); - $("#gAdminDashboardSidebar .gBlock .ui-widget-header").addClass("gDraggable"); - $("#gAdminDashboardSidebar").sortable({ - connectWith: ["#gAdminDashboard"], + $("#g-admin-dashboard-sidebar .g-block .ui-widget-header").addClass("g-draggable"); + $("#g-admin-dashboard-sidebar").sortable({ + connectWith: ["#g-admin-dashboard"], cursor: "move", handle: $(".ui-widget-header"), opacity: 0.6, - placeholder: "gDropTarget", + placeholder: "g-drop-target", stop: update_blocks }); }); -
                  +
                  diff --git a/modules/gallery/views/admin_graphics.html.php b/modules/gallery/views/admin_graphics.html.php index f4c300ae..95d0618c 100644 --- a/modules/gallery/views/admin_graphics.html.php +++ b/modules/gallery/views/admin_graphics.html.php @@ -1,18 +1,18 @@ -
                  +

                  @@ -25,7 +25,7 @@ $tk->$active, "is_active" => true)) ?> -

                  +

                  diff --git a/modules/gallery/views/admin_graphics_gd.html.php b/modules/gallery/views/admin_graphics_gd.html.php index 08c19234..1cc9dc9e 100644 --- a/modules/gallery/views/admin_graphics_gd.html.php +++ b/modules/gallery/views/admin_graphics_gd.html.php @@ -1,5 +1,5 @@ -
                  installed ? " gInstalledToolkit" : " gUnavailable" ?>"> +
                  installed ? " g-installed-toolkit" : " g-unavailable" ?>"> " alt="" />

                  @@ -7,7 +7,7 @@ array("url" => "http://www.boutell.com/gd")) ?>

                  installed && $tk->rotate): ?> -
                  +
                  $tk->version)) ?>

                  @@ -15,7 +15,7 @@

                  installed): ?> error): ?> -

                  +

                  error ?>

                  @@ -23,7 +23,7 @@

                  -
                  +
                  diff --git a/modules/gallery/views/admin_graphics_graphicsmagick.html.php b/modules/gallery/views/admin_graphics_graphicsmagick.html.php index 6ee15bc3..5dae1442 100644 --- a/modules/gallery/views/admin_graphics_graphicsmagick.html.php +++ b/modules/gallery/views/admin_graphics_graphicsmagick.html.php @@ -1,5 +1,5 @@ -
                  installed ? " gInstalledToolkit" : " gUnavailable" ?>"> +
                  installed ? " g-installed-toolkit" : " g-unavailable" ?>"> " alt="" />

                  @@ -7,14 +7,14 @@ array("url" => "http://www.graphicsmagick.org")) ?>

                  installed): ?> -
                  +
                  $tk->version, "dir" => $tk->dir)) ?>

                  -
                  +
                  error ?>
                  diff --git a/modules/gallery/views/admin_graphics_imagemagick.html.php b/modules/gallery/views/admin_graphics_imagemagick.html.php index aeef4919..9c1a9909 100644 --- a/modules/gallery/views/admin_graphics_imagemagick.html.php +++ b/modules/gallery/views/admin_graphics_imagemagick.html.php @@ -1,5 +1,5 @@ -
                  installed ? " gInstalledToolkit" : " gUnavailable" ?>"> +
                  installed ? " g-installed-toolkit" : " g-unavailable" ?>"> " alt="" />

                  @@ -7,14 +7,14 @@ array("url" => "http://www.imagemagick.org")) ?>

                  installed): ?> -
                  +
                  $tk->version, "dir" => $tk->dir)) ?>

                  error): ?> -
                  +
                  error ?>
                  diff --git a/modules/gallery/views/admin_graphics_none.html.php b/modules/gallery/views/admin_graphics_none.html.php index e6923a5a..3ac6b4fb 100644 --- a/modules/gallery/views/admin_graphics_none.html.php +++ b/modules/gallery/views/admin_graphics_none.html.php @@ -1,6 +1,6 @@ -
                  +

                  diff --git a/modules/gallery/views/admin_languages.html.php b/modules/gallery/views/admin_languages.html.php index d6f50516..74f48b76 100644 --- a/modules/gallery/views/admin_languages.html.php +++ b/modules/gallery/views/admin_languages.html.php @@ -1,11 +1,11 @@ -

                  +

                  - "> + "> @@ -52,7 +52,7 @@ } }); - $("#gLanguagesForm").ajaxForm({ + $("g-languages-form").ajaxForm({ dataType: "json", success: function(data) { if (data.result == "success") { @@ -65,7 +65,7 @@ -
                  +

                  @@ -73,9 +73,9 @@

                  -
                  +
                  for_html_attr() ?>"> diff --git a/modules/gallery/views/admin_maintenance.html.php b/modules/gallery/views/admin_maintenance.html.php index 4c79c25b..94582dc8 100644 --- a/modules/gallery/views/admin_maintenance.html.php +++ b/modules/gallery/views/admin_maintenance.html.php @@ -1,11 +1,11 @@ -
                  +

                  -
                  +

                  @@ -21,7 +21,7 @@ - severity) ?>"> + severity) ?>"> @@ -30,7 +30,7 @@ @@ -41,7 +41,7 @@ count()): ?> -
                  +

                  name ?> callback?csrf=$csrf") ?>" - class="g-dialogLink g-button ui-icon-left ui-state-default ui-corner-all"> + class="g-dialog-link g-button ui-icon-left ui-state-default ui-corner-all">
                  @@ -69,8 +69,8 @@ - state == "stalled" ? "gWarning" : "" ?>"> - state == "stalled" ? "g-warning" : "" ?>"> +
                  "> +
                  "> updated) ?> @@ -100,7 +100,7 @@ state == "stalled"): ?> - id?csrf=$csrf") ?>"> @@ -114,7 +114,7 @@ count()): ?> -
                  +

                  @@ -142,8 +142,8 @@ - state == "success" ? "gSuccess" : "gError" ?>"> - state == "success" ? "g-success" : "g-error" ?>"> + $module_info): ?> - "> + "> $module_name); ?> locked) $data["disabled"] = 1; ?> diff --git a/modules/gallery/views/admin_sidebar.html.php b/modules/gallery/views/admin_sidebar.html.php index 62b59ac1..3137a2a6 100644 --- a/modules/gallery/views/admin_sidebar.html.php +++ b/modules/gallery/views/admin_sidebar.html.php @@ -1,20 +1,20 @@ -
                  +
                  -
                    -
                  • +
                      +
                    • mod_rewrite and set AllowOverride FileInfo Options to fix this.", array("mod_rewrite_attrs" => html::mark_clean('href="http://httpd.apache.org/docs/2.0/mod/mod_rewrite.html" target="_blank"'), "apache_attrs" => html::mark_clean('href="http://httpd.apache.org/docs/2.0/mod/core.html#allowoverride" target="_blank"'))) ?> @@ -37,7 +37,7 @@

                      -
                        +
                        • @@ -56,7 +56,7 @@
                        -
                        +
                        diff --git a/modules/gallery/views/permissions_form.html.php b/modules/gallery/views/permissions_form.html.php index f5639439..e2871adb 100644 --- a/modules/gallery/views/permissions_form.html.php +++ b/modules/gallery/views/permissions_form.html.php @@ -19,7 +19,7 @@ name, $item) ?> -
                  - -
                  "> +
                  "> updated) ?> @@ -170,12 +170,12 @@ get_log()): ?> - id?csrf=$csrf") ?>" class="g-dialogLink g-button ui-state-default ui-corner-all"> + id?csrf=$csrf") ?>" class="g-dialog-link g-button ui-state-default ui-corner-all"> - id?csrf=$csrf") ?>" class="g-dialogLink g-button" ui-state-default ui-corner-all> + id?csrf=$csrf") ?>" class="g-dialog-link g-button" ui-state-default ui-corner-all> id?csrf=$csrf") ?>" class="g-button ui-state-default ui-corner-all"> diff --git a/modules/gallery/views/admin_maintenance_show_log.html.php b/modules/gallery/views/admin_maintenance_show_log.html.php index c61db871..e6ed97b3 100644 --- a/modules/gallery/views/admin_maintenance_show_log.html.php +++ b/modules/gallery/views/admin_maintenance_show_log.html.php @@ -9,11 +9,11 @@ appendTo('body').submit().remove(); }; -
                  +

                  name ?>

                  -
                  + 
                  get_log()) ?>
                  - - + +
                  diff --git a/modules/gallery/views/admin_maintenance_task.html.php b/modules/gallery/views/admin_maintenance_task.html.php index c0bc0d43..53972b70 100644 --- a/modules/gallery/views/admin_maintenance_task.html.php +++ b/modules/gallery/views/admin_maintenance_task.html.php @@ -4,7 +4,7 @@ var animation = null; var delta = 1; animate_progress_bar = function() { - var current_value = parseInt($(".gProgressBar div").css("width").replace("%", "")); + var current_value = parseInt($(".g-progress-bar div").css("width").replace("%", "")); if (target_value > current_value) { // speed up delta = Math.min(delta + 0.04, 3); @@ -14,10 +14,10 @@ } if (target_value == 100) { - $(".gProgressBar").progressbar("value", 100); + $(".g-progress-bar").progressbar("value", 100); } else if (current_value != target_value || delta != 1) { var new_value = Math.min(current_value + delta, target_value); - $(".gProgressBar").progressbar("value", new_value); + $(".g-progress-bar").progressbar("value", new_value); animation = setTimeout(function() { animate_progress_bar(target_value); }, 100); } else { animation = null; @@ -35,30 +35,30 @@ if (!animation) { animate_progress_bar(); } - $("#gStatus").html("" + data.task.status); + $("#g-status").html("" + data.task.status); if (data.task.done) { - $("#gPauseButton").hide(); - $("#gDoneButton").show(); + $("#g-pause-button").hide(); + $("#g-done-button").show(); } else { setTimeout(update, 100); } } }); } - $(".gProgressBar").progressbar({value: 0}); + $(".g-progress-bar").progressbar({value: 0}); update(); dismiss = function() { window.location.reload(); } -
                  +

                  name ?>

                  -
                  -
                  +
                  +
                  - - + +
                  diff --git a/modules/gallery/views/admin_modules.html.php b/modules/gallery/views/admin_modules.html.php index 058844b4..75f4f0c5 100644 --- a/modules/gallery/views/admin_modules.html.php +++ b/modules/gallery/views/admin_modules.html.php @@ -1,5 +1,5 @@ -
                  +

                  @@ -16,7 +16,7 @@

                  + " title="for_html_attr() ?>" alt="for_html_attr() ?>" /> @@ -30,7 +30,7 @@ - + " alt="for_html_attr() ?>" /> @@ -40,7 +40,7 @@ + " alt="for_html_attr() ?>" /> @@ -53,7 +53,7 @@ - + " alt="for_html_attr() ?>" /> @@ -68,7 +68,7 @@ + id == 1): ?> " title="for_html_attr() ?>" alt="for_html_attr() ?>" /> diff --git a/modules/gallery/views/simple_uploader.html.php b/modules/gallery/views/simple_uploader.html.php index 6e66d241..ddad1fc4 100644 --- a/modules/gallery/views/simple_uploader.html.php +++ b/modules/gallery/views/simple_uploader.html.php @@ -4,16 +4,16 @@ -"> +">
                  html::purify($item->title))) ?>
                  -
                  +
                  -
                    -
                  • +
                      +
                    • suhosin.session.encrypt setting from Suhosin. You must disable this setting to upload photos.", array("encrypt_url" => "http://www.hardened-php.net/suhosin/configuration.html#suhosin.session.encrypt", "suhosin_url" => "http://www.hardened-php.net/suhosin/")) ?> @@ -24,7 +24,7 @@

                      -
                  -
                  -
                  -
                  +
                  +
                  +
                  - + -
                  @@ -68,7 +68,7 @@ button_image_url: , button_width: "202", button_height: "45", - button_placeholder_id: "gChooseFilesButtonPlaceholder", + button_placeholder_id: "g-choose-files-placeholder", button_text: ' . t("Select photos...") . '') ?>, button_text_style: ".swfUploadFont { color: #2E6E9E; font-size: 16px; font-family: Lucida Grande,Lucida Sans,Arial,sans-serif; font-weight: bold; }", button_text_left_padding: 30, @@ -91,7 +91,7 @@ function File_Progress(file) { this.box = $("#" + file.id); if (!this.box.length) { - $("#gAddPhotosQueue").append( + $("#g-add-photos-queue").append( "
                  " + "
                  " + "
                  " + @@ -163,7 +163,7 @@ var fp = new File_Progress(file); fp.title.html(file.name); fp.set_status("uploading", for_js() ?>); - $("#gAddPhotosCanvas").scrollTo(fp.box, 1000); + $("#g-add-photos-canvas").scrollTo(fp.box, 1000); // move file select button $("#SWFUpload_0").css({'left': '0', 'top': '0'}); @@ -243,6 +243,6 @@ // This event comes from the Queue Plugin function queue_complete(num_files_uploaded) { var status_msg = for_js() ?>; - $("#gUploadStatus").html(status_msg.replace("__COUNT__", num_files_uploaded)); + $("#g-upload-status").html(status_msg.replace("__COUNT__", num_files_uploaded)); } diff --git a/modules/gallery/views/welcome_message.html.php b/modules/gallery/views/welcome_message.html.php index 021e5772..4acdb156 100644 --- a/modules/gallery/views/welcome_message.html.php +++ b/modules/gallery/views/welcome_message.html.php @@ -1,5 +1,5 @@ -
                  +

                  @@ -17,12 +17,12 @@

                  id}") ?>" title="for_html_attr() ?>" - id="gAfterInstallChangePasswordLink" + id="g-after-install-change-password-link" class="g-button ui-state-default ui-corners-all">

                  diff --git a/modules/gallery/views/welcome_message_loader.html.php b/modules/gallery/views/welcome_message_loader.html.php index 2c6bffca..818e2072 100644 --- a/modules/gallery/views/welcome_message_loader.html.php +++ b/modules/gallery/views/welcome_message_loader.html.php @@ -1,7 +1,7 @@ -for_html_attr() ?>" href=""/> diff --git a/modules/image_block/helpers/image_block_block.php b/modules/image_block/helpers/image_block_block.php index d0402eb6..eb4f7aab 100644 --- a/modules/image_block/helpers/image_block_block.php +++ b/modules/image_block/helpers/image_block_block.php @@ -27,7 +27,7 @@ class image_block_block_Core { switch ($block_id) { case "random_image": $block = new Block(); - $block->css_id = "gImageBlock"; + $block->css_id = "g-image-block"; $block->title = t("Random Image"); $block->content = new View("image_block_block.html"); diff --git a/modules/image_block/views/image_block_block.html.php b/modules/image_block/views/image_block_block.html.php index c51c1b4a..68d5fa89 100644 --- a/modules/image_block/views/image_block_block.html.php +++ b/modules/image_block/views/image_block_block.html.php @@ -1,6 +1,6 @@ -
                  +
                  - thumb_img(array("class" => "gThumbnail")) ?> + thumb_img(array("class" => "g-thumbnail")) ?>
                  diff --git a/modules/info/helpers/info_block.php b/modules/info/helpers/info_block.php index 3a853609..d28b02e7 100644 --- a/modules/info/helpers/info_block.php +++ b/modules/info/helpers/info_block.php @@ -28,7 +28,7 @@ class info_block_Core { case "metadata": if ($theme->item()) { $block = new Block(); - $block->css_id = "gMetadata"; + $block->css_id = "g-metadata"; $block->title = $theme->item()->is_album() ? t("Album Info") : t("Photo Info"); $block->content = new View("info_block.html"); } diff --git a/modules/info/views/info_block.html.php b/modules/info/views/info_block.html.php index d8f36984..ac177ee7 100644 --- a/modules/info/views/info_block.html.php +++ b/modules/info/views/info_block.html.php @@ -1,5 +1,5 @@ -
                    +
                    • title) ?> diff --git a/modules/notification/helpers/notification_event.php b/modules/notification/helpers/notification_event.php index c50b04c4..06c5bc44 100644 --- a/modules/notification/helpers/notification_event.php +++ b/modules/notification/helpers/notification_event.php @@ -107,7 +107,7 @@ class notification_event_Core { ->append(Menu::factory("link") ->id("watch") ->label($label) - ->css_id("gNotifyLink") + ->css_id("g-notify-link") ->url(url::site("notification/watch/$item->id?csrf=" . access::csrf_token()))); } } diff --git a/modules/organize/css/organize.css b/modules/organize/css/organize.css index b1cef33c..fbf3c383 100644 --- a/modules/organize/css/organize.css +++ b/modules/organize/css/organize.css @@ -2,33 +2,33 @@ /******************************************************************* * Dialog wide styles */ -#gOrganize { +#g-organize { overflow: hidden; } -#gOrganize #bd { +#g-organize #bd { height: 100%; } -#gOrganize .yui-u { +#g-organize .yui-u { width: 75%; } -#gOrganize .yui-gf .first { +#g-organize .yui-gf .first { width: 25%; } -#gMessage { +#g-action-status { margin-bottom: .4em; width: 75%; white-space: nowrap; } -#gOrganizeDetail { +#g-organizeDetail { height: 100%; } -#gMessage .gInfo { +#g-action-status .g-info { font-weight: bold; padding-left: 2em; } @@ -36,42 +36,42 @@ /******************************************************************* * Album Tree styles */ -#gOrganizeTreeContainer { +#g-organizeTreeContainer { height: 100%; overflow: auto; margin: 0 !important; padding: 0 !important; } -#gOrganizeAlbumTree .selected { +#g-organize-albumTree .selected { background-color: #cfdeff; border-bottom: 1px solid #999; margin-right: 0px; } -#gOrganizeAlbumTree ul li { +#g-organize-albumTree ul li { padding-left: 1.2em; } -.gOrganizeAlbum span { +.g-organize-album span { cursor: pointer; } -.gOrganizeAlbumText { +.g-organize-album-text { cursor: pointer; width: auto; margin: 2px 0px 1px 2px; display: block; } -.gOrganizeAlbumText:hover { +.g-organize-album-text:hover { background: #eee; } /******************************************************************* * Album panel styles */ -#gOrganizeMicroThumbPanel { +#g-organize-microthumb-panel { margin: 0 !important; padding: 0 !important; background-color: #cfdeff; @@ -82,11 +82,11 @@ overflow-y: auto; } -#gOrganizeMicroThumbGrid { +#g-organize-microthumb-grid { padding: 1em; } -.gOrganizeMicroThumbGridCell { +.g-organize-microthumb-grid-cell { float: left; font-size: 0.8em; padding: .5em !important; @@ -95,15 +95,15 @@ margin: 4px; } -.gOrganizeMicroThumb { +.g-organize-microthumb { display: block; height: 9em; text-align: center; width: 9em; } -.gOrganizeMicroThumbGridCell.ui-selecting, -.gOrganizeMicroThumbGridCell.ui-selected { +.g-organize-microthumb-grid-cell.ui-selecting, +.g-organize-microthumb-grid-cell.ui-selected { margin: 2px; border: 2px solid #13A; } @@ -115,15 +115,15 @@ background: #13A; } -.gThumbnail { +.g-thumbnail { padding: .5em; } -#gOrganizeMicroThumbGrid .gAlbum { +#g-organize-microthumb-grid .g-album { background-color: #e8e8e8; } -.gOrganizeMicroThumbGridCell:hover { +.g-organize-microthumb-grid-cell:hover { margin: 2px; border: 2px solid #13A; } @@ -131,18 +131,18 @@ /**************************************************************** * Controls styles */ -#gOrganizeControls { +#g-organizeControls { padding-left: 8px; background-color: #13A; color: #ccc; width: 100% !important; } -#gOrganizeControls select { +#g-organizeControls select { display: inline; } -#gOrganizeClose { +#g-organizeClose { float: right; margin-right: 12px; } diff --git a/modules/organize/helpers/organize_event.php b/modules/organize/helpers/organize_event.php index d6043116..a33b2f2e 100644 --- a/modules/organize/helpers/organize_event.php +++ b/modules/organize/helpers/organize_event.php @@ -26,7 +26,7 @@ class organize_event_Core { ->append(Menu::factory("dialog") ->id("organize") ->label(t("Organize Album")) - ->css_id("gOrganizeLink") + ->css_id("g-organize-link") ->url(url::site("organize/dialog/{$item->id}"))); } } @@ -37,7 +37,7 @@ class organize_event_Core { ->append(Menu::factory("dialog") ->id("organize") ->label(t("Organize album")) - ->css_id("gOrganizeLink") + ->css_id("g-organize-link") ->css_class("ui-icon-folder-open") ->url(url::site("organize/dialog/{$item->id}"))); } diff --git a/modules/organize/js/organize.js b/modules/organize/js/organize.js index bee42a22..960d75e2 100644 --- a/modules/organize/js/organize.js +++ b/modules/organize/js/organize.js @@ -4,11 +4,11 @@ handle: ".ui-selected", distance: 10, cursorAt: { left: -10, top: -10}, - appendTo: "#gOrganizeMicroThumbPanel", + appendTo: "#g-organize-microthumb-panel", helper: function(event, ui) { var selected = $(".ui-draggable.ui-selected img"); if (selected.length) { - var set = $('
                      ') + var set = $('
                      ') .css({ zIndex: 2000, width: 80, @@ -37,16 +37,16 @@ }, start: function(event, ui) { - $("#gOrganizeMicroThumbPanel .ui-selected").hide(); + $("#g-organize-microthumb-panel .ui-selected").hide(); }, drag: function(event, ui) { - var top = $("#gOrganizeMicroThumbPanel").offset().top; - var height = $("#gOrganizeMicroThumbPanel").height(); + var top = $("#g-organize-microthumb-panel").offset().top; + var height = $("#g-organize-microthumb-panel").height(); if (ui.offset.top > height + top - 20) { - $("#gOrganizeMicroThumbPanel").get(0).scrollTop += 100; + $("#g-organize-microthumb-panel").get(0).scrollTop += 100; } else if (ui.offset.top < top + 20) { - $("#gOrganizeMicroThumbPanel").get(0).scrollTop = Math.max(0, $("#gOrganizeMicroThumbPanel").get(0).scrollTop - 100); + $("#g-organize-microthumb-panel").get(0).scrollTop = Math.max(0, $("#g-organize-microthumb-panel").get(0).scrollTop - 100); } } }, @@ -63,7 +63,7 @@ target_id = $(".currentDropTarget").attr("ref"); } else { before_or_after = "after"; - target_id = $("#gOrganizeMicroThumbGrid li:last").attr("ref"); + target_id = $("#g-organize-microthumb-grid li:last").attr("ref"); } $.organize.do_drop({ url: rearrange_url @@ -79,9 +79,9 @@ tolerance: "pointer", greedy: true, drop: function(event, ui) { - if ($(event.target).hasClass("gViewOnly")) { + if ($(event.target).hasClass("g-view-only")) { $(".ui-selected").show(); - $(".gOrganizeMicroThumbGridCell").css("borderStyle", "none"); + $(".g-organize-microthumb-grid-cell").css("borderStyle", "none"); } else { $.organize.do_drop({ url: move_url.replace("__ALBUM_ID__", $(event.target).attr("ref")), @@ -92,7 +92,7 @@ }, do_drop: function(options) { - $("#gOrganizeMicroThumbPanel").selectable("destroy"); + $("#g-organize-microthumb-panel").selectable("destroy"); var source_ids = []; $(options.source).each(function(i) { source_ids.push($(this).attr("ref")); @@ -110,19 +110,19 @@ _refresh: function(data) { if (data.tree) { - $("#gOrganizeAlbumTree").html(data.tree); + $("#g-organize-albumTree").html(data.tree); } if (data.grid) { - $("#gOrganizeMicroThumbGrid").html(data.grid); - $("#gOrganizeSortColumn").attr("value", data.sort_column); - $("#gOrganizeSortOrder").attr("value", data.sort_order); + $("#g-organize-microthumb-grid").html(data.grid); + $("#g-organize-sort-column").attr("value", data.sort_column); + $("#g-organize-sort-order").attr("value", data.sort_order); } $.organize.set_handlers(); }, mouse_move_handler: function(event) { - if ($(".gDragHelper").length) { - $(".gOrganizeMicroThumbGridCell").css({borderStyle: "hidden", margin: "4px"}); + if ($(".g-drag-helper").length) { + $(".g-organize-microthumb-grid-cell").css({borderStyle: "hidden", margin: "4px"}); $(".currentDropTarget").removeClass("currentDropTarget"); var borderStyle = event.pageX < $(this).offset().left + $(this).width() / 2 ? {borderLeftStyle: "solid", marginLeft: "2px"} : {borderRightStyle: "solid", marginRight: "2px"}; @@ -140,37 +140,37 @@ $(".sf-menu li.sfHover ul").css("z-index", 68); $("#g-dialog").dialog("option", "zIndex", 70); $("#g-dialog").bind("dialogopen", function(event, ui) { - $("#gOrganize").height($("#g-dialog").innerHeight() - 20); - $("#gOrganizeMicroThumbPanel").height($("#g-dialog").innerHeight() - 90); - $("#gOrganizeTreeContainer").height($("#g-dialog").innerHeight() - 59); + $("#g-organize").height($("#g-dialog").innerHeight() - 20); + $("#g-organize-microthumb-panel").height($("#g-dialog").innerHeight() - 90); + $("#g-organizeTreeContainer").height($("#g-dialog").innerHeight() - 59); }); $("#g-dialog").bind("dialogclose", function(event, ui) { window.location.reload(); }); - $("#g-dialog #gOrganizeClose").click(function(event) { + $("#g-dialog #g-organizeClose").click(function(event) { $("#g-dialog").dialog("close"); }); - $("#gOrganizeSortColumn,#gOrganizeSortOrder").change(function(event) { - $.organize.resort($("#gOrganizeSortColumn").attr("value"), $("#gOrganizeSortOrder").attr("value")); + $("#g-organize-sort-column,#g-organize-sort-order").change(function(event) { + $.organize.resort($("#g-organize-sort-column").attr("value"), $("#g-organize-sort-order").attr("value")); }); $.organize.set_handlers(); }, set_handlers: function() { - $("#gOrganizeMicroThumbPanel") - .selectable({filter: ".gOrganizeMicroThumbGridCell"}) + $("#g-organize-microthumb-panel") + .selectable({filter: ".g-organize-microthumb-grid-cell"}) .droppable($.organize.content_droppable); - $(".gOrganizeMicroThumbGridCell") + $(".g-organize-microthumb-grid-cell") .draggable($.organize.micro_thumb_draggable) .mouseleave($.organize.mouse_leave_handler) .mousemove($.organize.mouse_move_handler); - $(".gOrganizeAlbum").droppable($.organize.branch_droppable); - $(".gOrganizeAlbumText").click($.organize.show_album); - $("#gOrganizeAlbumTree .ui-icon-plus,#gOrganizeAlbumTree .ui-icon-minus").click($.organize.toggle_branch); + $(".g-organize-album").droppable($.organize.branch_droppable); + $(".g-organize-album-text").click($.organize.show_album); + $("#g-organize-albumTree .ui-icon-plus,#g-organize-albumTree .ui-icon-minus").click($.organize.toggle_branch); }, toggle_branch: function(event) { @@ -207,20 +207,20 @@ if ($(event.currentTarget).hasClass("selected")) { return; } - var parent = $(event.currentTarget).parents(".gOrganizeBranch"); - if ($(parent).hasClass("gViewOnly")) { + var parent = $(event.currentTarget).parents(".g-organizeBranch"); + if ($(parent).hasClass("g-view-only")) { return; } - $("#gOrganizeMicroThumbPanel").selectable("destroy"); + $("#g-organize-microthumb-panel").selectable("destroy"); var id = $(event.currentTarget).attr("ref"); - $("#gOrganizeAlbumTree .selected").removeClass("selected"); - $(".gOrganizeAlbumText[ref=" + id + "]").addClass("selected"); - var url = $("#gOrganizeMicroThumbPanel").attr("ref").replace("__ITEM_ID__", id).replace("__OFFSET__", 0); + $("#g-organize-albumTree .selected").removeClass("selected"); + $(".g-organize-album-text[ref=" + id + "]").addClass("selected"); + var url = $("#g-organize-microthumb-panel").attr("ref").replace("__ITEM_ID__", id).replace("__OFFSET__", 0); $.get(url, {}, function(data) { - $("#gOrganizeMicroThumbGrid").html(data.grid); - $("#gOrganizeSortColumn").attr("value", data.sort_column); - $("#gOrganizeSortOrder").attr("value", data.sort_order); + $("#g-organize-microthumb-grid").html(data.grid); + $("#g-organize-sort-column").attr("value", data.sort_column); + $("#g-organize-sort-order").attr("value", data.sort_order); $.organize.set_handlers(); }, "json"); @@ -231,14 +231,14 @@ */ resort: function(column, dir) { var url = sort_order_url - .replace("__ALBUM_ID__", $("#gOrganizeAlbumTree .selected").attr("ref")) + .replace("__ALBUM_ID__", $("#g-organize-albumTree .selected").attr("ref")) .replace("__COL__", column) .replace("__DIR__", dir); $.get(url, {}, function(data) { - $("#gOrganizeMicroThumbGrid").html(data.grid); - $("#gOrganizeSortColumn").attr("value", data.sort_column); - $("#gOrganizeSortOrder").attr("value", data.sort_order); + $("#g-organize-microthumb-grid").html(data.grid); + $("#g-organize-sort-column").attr("value", data.sort_column); + $("#g-organize-sort-order").attr("value", data.sort_order); $.organize.set_handlers(); }, "json"); diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php index 09720fe4..858c794c 100644 --- a/modules/organize/views/organize_dialog.html.php +++ b/modules/organize/views/organize_dialog.html.php @@ -5,37 +5,37 @@ var sort_order_url = ""; var tree_url = ""; -
                      +

                      html::purify($album->title))) ?>

                      -
                      -
                      +
                      +
                      -
                      -
                      -
                        +
                        +
                        +
                        -
                        -
                        +
                        "> -
                          +
                        -
                        - +
                        - "gOrganizeSortColumn"), album::get_sort_order_options(), $album->sort_column) ?> - "gOrganizeSortOrder"), array("ASC" => "Ascending", "DESC" => "Descending"), $album->sort_order) ?> + "g-organize-sort-column"), album::get_sort_order_options(), $album->sort_column) ?> + "g-organize-sort-order"), array("ASC" => "Ascending", "DESC" => "Descending"), $album->sort_order) ?>
                        @@ -44,5 +44,5 @@
                        diff --git a/modules/organize/views/organize_thumb_grid.html.php b/modules/organize/views/organize_thumb_grid.html.php index af7136fc..553fc493 100644 --- a/modules/organize/views/organize_thumb_grid.html.php +++ b/modules/organize/views/organize_thumb_grid.html.php @@ -1,9 +1,9 @@ children(25, $offset) as $child): ?> -
                      • -
                        "> - thumb_img(array("class" => "gThumbnail", "ref" => $child->id), 90, true) ?> +
                      • +
                        "> + thumb_img(array("class" => "g-thumbnail", "ref" => $child->id), 90, true) ?>
                        • @@ -14,7 +14,7 @@ $.get("id/" . ($offset + 25)) ?>", {}, function(data) { - $("#gOrganizeMicroThumbGrid").append(data.grid); + $("#g-organize-microthumb-grid").append(data.grid); $.organize.set_handlers(); }, "json"); diff --git a/modules/organize/views/organize_tree.html.php b/modules/organize/views/organize_tree.html.php index e5d91c04..924a1bd6 100644 --- a/modules/organize/views/organize_tree.html.php +++ b/modules/organize/views/organize_tree.html.php @@ -1,9 +1,9 @@ -
                      • " +
                      • " ref="id ?>"> - " + " ref="id ?>"> title) ?> @@ -12,11 +12,11 @@ contains($selected)): ?> $selected, "album" => $child)); ?> -
                      • " +
                      • " ref="id ?>"> - + title) ?>
                        • diff --git a/modules/recaptcha/helpers/recaptcha.php b/modules/recaptcha/helpers/recaptcha.php index bead6156..789bae85 100644 --- a/modules/recaptcha/helpers/recaptcha.php +++ b/modules/recaptcha/helpers/recaptcha.php @@ -19,7 +19,7 @@ */ class recaptcha_Core { static function get_configure_form() { - $form = new Forge("admin/recaptcha", "", "post", array("id" => "gConfigureRecaptchaForm")); + $form = new Forge("admin/recaptcha", "", "post", array("id" => "g-configure-recaptcha-form")); $group = $form->group("configure_recaptcha") ->label(t("Configure reCAPTCHA")); $group->input("public_key") diff --git a/modules/recaptcha/helpers/recaptcha_event.php b/modules/recaptcha/helpers/recaptcha_event.php index d23a0c74..feedced4 100644 --- a/modules/recaptcha/helpers/recaptcha_event.php +++ b/modules/recaptcha/helpers/recaptcha_event.php @@ -20,7 +20,7 @@ class recaptcha_event_Core { static function comment_add_form($form) { if (module::get_var("recaptcha", "public_key")) { - $form->add_comment->recaptcha("recaptcha")->label("")->id("gRecaptcha"); + $form->add_comment->recaptcha("recaptcha")->label("")->id("g-recaptcha"); } } diff --git a/modules/recaptcha/views/admin_recaptcha.html.php b/modules/recaptcha/views/admin_recaptcha.html.php index 0a4b1f8f..3e964801 100644 --- a/modules/recaptcha/views/admin_recaptcha.html.php +++ b/modules/recaptcha/views/admin_recaptcha.html.php @@ -1,5 +1,5 @@ -
                        +

                        reCAPTCHA Public/Private Key pair, which is also free. Once registered, the challenge and response strings are evaluated at recaptcha.net to determine if the form content has been entered by a bot.", @@ -11,16 +11,16 @@

                        -
                        +

                        -
                        +
                        -
                        +

                        html::purify($item->title))) ?>

                        -

                        -
                          +

                          +
                            parents() as $parent): ?>
                          • title) ?> @@ -19,35 +19,35 @@
                          -
                            +
                            -