diff options
Diffstat (limited to '')
| -rw-r--r-- | admin/include/functions_metadata.php | 33 | ||||
| -rw-r--r-- | admin/template/yoga/default-layout.css | 2 | ||||
| -rw-r--r-- | admin/template/yoga/layout.css | 3 | ||||
| -rw-r--r-- | admin/template/yoga/theme/admin/theme.css | 2 |
4 files changed, 17 insertions, 23 deletions
diff --git a/admin/include/functions_metadata.php b/admin/include/functions_metadata.php index e805aeba6..51867b448 100644 --- a/admin/include/functions_metadata.php +++ b/admin/include/functions_metadata.php @@ -28,9 +28,9 @@ $page['datefields'] = array('date_creation', 'date_available'); function get_sync_iptc_data($file) { global $conf, $page; - + $map = $conf['use_iptc_mapping']; - + $iptc = get_iptc_data($file, $map); foreach ($iptc as $pwg_key => $value) @@ -108,7 +108,7 @@ function update_metadata($files) { array_push($image_ids, $id); } - + $query = ' SELECT id FROM '.IMAGES_TABLE.' @@ -118,18 +118,14 @@ SELECT id ) ;'; - $result = pwg_query($query); - while ($row = mysql_fetch_array($result)) - { - array_push($has_high_images, $row['id']); - } + $has_high_images = array_from_query($query, 'id'); foreach ($files as $id => $file) { $data = array(); $data['id'] = $id; $data['filesize'] = floor(filesize($file)/1024); - + if ($image_size = @getimagesize($file)) { $data['width'] = $image_size[0]; @@ -142,7 +138,7 @@ SELECT id $data['high_filesize'] = floor(filesize($high_file)/1024); } - + if ($conf['use_exif']) { $exif = get_sync_exif_data($file); @@ -161,7 +157,7 @@ SELECT id { $tags_of[$id] = array(); } - + foreach (explode(',', $iptc[$key]) as $tag_name) { array_push( @@ -178,7 +174,7 @@ SELECT id array_push($datas, $data); } - + if (count($datas) > 0) { $update_fields = @@ -189,7 +185,7 @@ SELECT id 'high_filesize', 'date_metadata_update' ); - + if ($conf['use_exif']) { $update_fields = @@ -198,7 +194,7 @@ SELECT id array_keys($conf['use_exif_mapping']) ); } - + if ($conf['use_iptc']) { $update_fields = @@ -217,7 +213,8 @@ SELECT id 'primary' => array('id'), 'update' => array_unique($update_fields) ), - $datas + $datas, + MASS_UPDATES_SKIP_EMPTY ); } @@ -234,12 +231,12 @@ SELECT id * @param boolean only newly added files ? * @return array */ -function get_filelist($category_id = '', $site_id=1, $recursive = false, +function get_filelist($category_id = '', $site_id=1, $recursive = false, $only_new = false) { // filling $cat_ids : all categories required $cat_ids = array(); - + $query = ' SELECT id FROM '.CATEGORIES_TABLE.' @@ -292,7 +289,7 @@ SELECT id, path { $files[$row['id']] = $row['path']; } - + return $files; } ?>
\ No newline at end of file diff --git a/admin/template/yoga/default-layout.css b/admin/template/yoga/default-layout.css index 9d755d95d..ac2388bdb 100644 --- a/admin/template/yoga/default-layout.css +++ b/admin/template/yoga/default-layout.css @@ -290,7 +290,7 @@ INPUT, SELECT { margin: 0; font-size: 1em; /* <= some browsers don't set it correctly */ } -UL, DL { text-align: left;} +UL, DL, OL { text-align: left;} TABLE { /* horizontaly centered */ margin-left: auto; margin-right: auto; diff --git a/admin/template/yoga/layout.css b/admin/template/yoga/layout.css index 21b3edf90..5a7d5c4df 100644 --- a/admin/template/yoga/layout.css +++ b/admin/template/yoga/layout.css @@ -1,7 +1,6 @@ -/* $Id$ */ /* template css */ -@import "menubar.css"; +/*@import "menubar.css";*/ @import "content.css"; @import "thumbnails.css"; @import "default-layout.css"; diff --git a/admin/template/yoga/theme/admin/theme.css b/admin/template/yoga/theme/admin/theme.css index b3f4bec62..7d71daed1 100644 --- a/admin/template/yoga/theme/admin/theme.css +++ b/admin/template/yoga/theme/admin/theme.css @@ -44,11 +44,9 @@ letter-spacing:0.1em; margin-right:30px; text-align:right; color: #777; text-transform:none; font-weight:bold; padding-left:20px; } .content dl, dd { margin:5px; } .content div.titrePage { height:55px; } -.content ol li { text-align: left; } .instructions { text-align: left; padding: 20px 20px 0 20px; } .throw, td h3 { background-image: url(images/fillet.png); background-repeat: repeat-x; } -.browsePath a { color: #eee; } /* borders */ /* TODO */ INPUT, SELECT, TEXTAREA { border-left: 2px inset #696969; cursor:text; text-indent:4px; } |