Menu
▾
▴
phpwebsite-comm-cvs-commits — Read-Only CVS commits log list
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(120) |
Jun
(74) |
Jul
(97) |
Aug
(35) |
Sep
(35) |
Oct
(34) |
Nov
|
Dec
(6) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(18) |
Feb
(8) |
Mar
(7) |
Apr
(23) |
May
(28) |
Jun
(31) |
Jul
(27) |
Aug
(34) |
Sep
(48) |
Oct
(511) |
Nov
(197) |
Dec
(333) |
| 2005 |
Jan
(212) |
Feb
(33) |
Mar
(94) |
Apr
(51) |
May
(16) |
Jun
|
Jul
(200) |
Aug
(43) |
Sep
(88) |
Oct
(60) |
Nov
(62) |
Dec
(41) |
| 2006 |
Jan
(94) |
Feb
(49) |
Mar
(54) |
Apr
|
May
(39) |
Jun
(39) |
Jul
(61) |
Aug
(36) |
Sep
(23) |
Oct
(76) |
Nov
(73) |
Dec
(32) |
| 2007 |
Jan
|
Feb
(87) |
Mar
|
Apr
(8) |
May
(36) |
Jun
(49) |
Jul
(54) |
Aug
(8) |
Sep
(50) |
Oct
(36) |
Nov
|
Dec
(3) |
| 2008 |
Jan
(133) |
Feb
(54) |
Mar
(39) |
Apr
(2) |
May
(6) |
Jun
(74) |
Jul
(97) |
Aug
(70) |
Sep
(12) |
Oct
(20) |
Nov
(64) |
Dec
(24) |
| 2009 |
Jan
(25) |
Feb
(49) |
Mar
(18) |
Apr
|
May
|
Jun
(3) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
(10) |
Feb
|
Mar
|
Apr
|
May
|
Jun
(7) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Greg M. <bli...@us...> - 2008-01-28 15:36:08
|
Update of /cvsroot/phpwebsite-comm/modules/featuredphoto/locale/en_US/LC_MESSAGES In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31826/locale/en_US/LC_MESSAGES Modified Files: featuredphoto.po Log Message: Updated en_US locale Index: featuredphoto.po =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/featuredphoto/locale/en_US/LC_MESSAGES/featuredphoto.po,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** featuredphoto.po 13 Oct 2007 15:24:53 -0000 1.2 --- featuredphoto.po 28 Jan 2008 15:36:09 -0000 1.3 *************** *** 22,31 **** "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2007-10-13 10:20-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL...@li...>\n" "MIME-Version: 1.0\n" ! "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" --- 22,31 ---- "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2008-01-28 09:30-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL...@li...>\n" "MIME-Version: 1.0\n" ! "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" *************** *** 63,66 **** --- 63,72 ---- msgstr "" + msgid "Cannot choose Fixed mode with no image selected." + msgstr "" + + msgid "Cannot choose Flickr Set mode with no set selected." + msgstr "" + msgid "Cannot locate any block templates. Cannot continue." msgstr "" *************** *** 78,81 **** --- 84,99 ---- msgstr "" + msgid "Edit Settings" + msgstr "" + + msgid "Enable Flickr Support" + msgstr "" + + msgid "Error from Flickr. Check error log for details." + msgstr "" + + msgid "Error saving the settings. Check error log for details." + msgstr "" + msgid "Featured Photo" msgstr "" *************** *** 87,94 **** msgstr "" ! msgid "Fixed on an image" msgstr "" ! msgid "Fixed on the image" msgstr "" --- 105,130 ---- msgstr "" ! msgid "Fixed on the image" msgstr "" ! msgid "Flickr API Key" ! msgstr "" ! ! msgid "Flickr Username" ! msgstr "" ! ! msgid "Flickr returned failure" ! msgstr "" ! ! msgid "Flickr set to use" ! msgstr "" ! ! msgid "Flickr: Latest public photo" ! msgstr "" ! ! msgid "Flickr: Latest public photo in set" ! msgstr "" ! ! msgid "Flickr: Random public photo in set" msgstr "" *************** *** 120,123 **** --- 156,162 ---- msgstr "" + msgid "More Photos" + msgstr "" + msgid "N/A" msgstr "" *************** *** 132,135 **** --- 171,183 ---- msgstr "" + msgid "No photo blocks found." + msgstr "" + + msgid "No photos found." + msgstr "" + + msgid "None" + msgstr "" + msgid "Photo activation changed" msgstr "" *************** *** 177,180 **** --- 225,237 ---- msgstr "" + msgid "Pin all" + msgstr "" + + msgid "Please specify both API key and username." + msgstr "" + + msgid "Problem sending command to the server" + msgstr "" + msgid "Random" msgstr "" *************** *** 195,201 **** --- 252,265 ---- msgstr "" + msgid "Settings" + msgstr "" + msgid "Size" msgstr "" + msgid "" + "This module uses the Flickr API but is not endorsed or certified by Flickr." + msgstr "" + msgid "Title" msgstr "" *************** *** 204,207 **** --- 268,274 ---- msgstr "" + msgid "Unpin all" + msgstr "" + msgid "Update Photo" msgstr "" *************** *** 210,213 **** --- 277,283 ---- msgstr "" + msgid "Update Settings" + msgstr "" + msgid "View" msgstr "" *************** *** 222,225 **** --- 292,298 ---- msgstr "" + msgid "Your settings have been successfully saved." + msgstr "" + msgid "pixels" msgstr "" |
|
From: Greg M. <bli...@us...> - 2008-01-27 21:42:37
|
Update of /cvsroot/phpwebsite-comm/modules/featuredphoto/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6630/docs Modified Files: ChangeLog Log Message: Now using PHPWS_LIST_TOGGLE_CLASS Index: ChangeLog =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/featuredphoto/docs/ChangeLog,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** ChangeLog 27 Jan 2008 01:43:12 -0000 1.27 --- ChangeLog 27 Jan 2008 21:42:39 -0000 1.28 *************** *** 7,10 **** --- 7,11 ---- *cvs + Now use PHPWS_LIST_TOGGLE_CLASS for toggle class when listing items. RFE #1880295: Can now pin a photo block to all pages RFE #1880296: Added Flickr support |
|
From: Greg M. <bli...@us...> - 2008-01-27 21:42:37
|
Update of /cvsroot/phpwebsite-comm/modules/featuredphoto/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6630/class Modified Files: manager.php Log Message: Now using PHPWS_LIST_TOGGLE_CLASS Index: manager.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/featuredphoto/class/manager.php,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** manager.php 27 Jan 2008 18:03:31 -0000 1.38 --- manager.php 27 Jan 2008 21:42:38 -0000 1.39 *************** *** 372,376 **** $pager->setModule('featuredphoto'); $pager->setTemplate('block/list.tpl'); ! $pager->addToggle(' class="bgcolor1"'); $pager->addPageTags($pageTags); $pager->addRowTags('getListTags'); --- 372,376 ---- $pager->setModule('featuredphoto'); $pager->setTemplate('block/list.tpl'); ! $pager->addToggle(PHPWS_LIST_TOGGLE_CLASS); $pager->addPageTags($pageTags); $pager->addRowTags('getListTags'); *************** *** 610,614 **** $pager->setModule('featuredphoto'); $pager->setTemplate('photo/list.tpl'); ! $pager->addToggle(' class="bgcolor1"'); $pager->addPageTags($pageTags); $pager->addRowTags('getListTags'); --- 610,614 ---- $pager->setModule('featuredphoto'); $pager->setTemplate('photo/list.tpl'); ! $pager->addToggle(PHPWS_LIST_TOGGLE_CLASS); $pager->addPageTags($pageTags); $pager->addRowTags('getListTags'); |
|
From: Greg M. <bli...@us...> - 2008-01-27 21:28:54
|
Update of /cvsroot/phpwebsite-comm/modules/featuredphoto/boost In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1229/boost Modified Files: boost.php update.php Log Message: Preparing for 1.2.0 Index: boost.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/featuredphoto/boost/boost.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** boost.php 2 Oct 2007 04:05:29 -0000 1.9 --- boost.php 27 Jan 2008 21:27:15 -0000 1.10 *************** *** 24,28 **** $proper_name = 'Featured Photo'; ! $version = '1.1.0'; $register = FALSE; $unregister = FALSE; --- 24,28 ---- $proper_name = 'Featured Photo'; ! $version = '1.2.0'; $register = FALSE; $unregister = FALSE; Index: update.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/featuredphoto/boost/update.php,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** update.php 13 Oct 2007 16:59:07 -0000 1.18 --- update.php 27 Jan 2008 21:27:15 -0000 1.19 *************** *** 158,161 **** --- 158,183 ---- $content[] = '- Now using Image Manager from File Cabinet to manage photos.'; $content[] = '- Switch to use new logIfError() function in the core.'; + + case version_compare($currentVersion, '1.2.0', '<'): + $db = new PHPWS_DB('featuredphoto_blocks'); + + /* First, need to add new column to block table. */ + if (PHPWS_Error::logIfError($db->addTableColumn('flickr_set', 'BIGINT unsigned NOT NULL', 'current_photo'))) + { + $content[] = '- Unable to create table column flickr_set in featuredphoto_blocks table.'; + return false; + } + + /* Update permissions table. */ + Users_Permission::registerPermissions('featuredphoto', $content); + + /* Update the templates and config file. */ + $files = array('templates/settings.tpl', 'templates/block/edit.tpl', + 'templates/photo/flickr_view.tpl', 'conf/error.php'); + featuredphoto_update_files($files, $content); + + $content[] = '- Added ability to pin a photo block to all pages.'; + $content[] = '- Added Flickr support.'; + $content[] = '- Added German translation.'; } |
|
From: Greg M. <bli...@us...> - 2008-01-27 20:08:25
|
Update of /cvsroot/phpwebsite-comm/modules/featuredphoto/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5055 Modified Files: block.php Log Message: Fixed notice Index: block.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/featuredphoto/class/block.php,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** block.php 27 Jan 2008 18:03:31 -0000 1.24 --- block.php 27 Jan 2008 20:08:26 -0000 1.25 *************** *** 563,566 **** --- 563,567 ---- function getListTags() { + $links = array(); $vars['block_id'] = $this->getId(); |
|
From: Greg M. <bli...@us...> - 2008-01-27 18:04:02
|
Update of /cvsroot/phpwebsite-comm/modules/featuredphoto/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25150/class Modified Files: block.php manager.php Log Message: Added More Photos link. Added Flickr Random in Set block mode. Index: manager.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/featuredphoto/class/manager.php,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** manager.php 27 Jan 2008 02:41:30 -0000 1.37 --- manager.php 27 Jan 2008 18:03:31 -0000 1.38 *************** *** 466,469 **** --- 466,470 ---- $form->addSelect('flickr_set', $flickr_sets); $form->setMatch('flickr_set', $block->flickr_set); + $form->setLabel('flickr_set', dgettext('featuredphoto', 'Flickr set to use')); } *************** *** 519,523 **** $errors['mode'] = dgettext('featuredphoto', 'Cannot choose Fixed mode with no image selected.'); } ! if (($_POST['mode'] == FEATUREDPHOTO_BLOCK_MODE_FLICKR_LATEST_SET) && ($_POST['flickr_set'] == 0)) { $errors['mode'] = dgettext('featuredphoto', 'Cannot choose Flickr Set mode with no set selected.'); --- 520,526 ---- $errors['mode'] = dgettext('featuredphoto', 'Cannot choose Fixed mode with no image selected.'); } ! if ((($_POST['mode'] == FEATUREDPHOTO_BLOCK_MODE_FLICKR_LATEST_SET) || ! ($_POST['mode'] == FEATUREDPHOTO_BLOCK_MODE_FLICKR_RANDOM_SET)) && ! ($_POST['flickr_set'] == 0)) { $errors['mode'] = dgettext('featuredphoto', 'Cannot choose Flickr Set mode with no set selected.'); *************** *** 742,746 **** } ! /* If Flickr disabled, verify no blocks modes are set to Flickr. */ if (!PHPWS_Settings::get('featuredphoto', 'flickr_support')) { --- 745,749 ---- } ! /* If Flickr disabled, verify no block modes are set to Flickr. */ if (!PHPWS_Settings::get('featuredphoto', 'flickr_support')) { Index: block.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/featuredphoto/class/block.php,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** block.php 27 Jan 2008 01:43:08 -0000 1.23 --- block.php 27 Jan 2008 18:03:31 -0000 1.24 *************** *** 28,31 **** --- 28,32 ---- define('FEATUREDPHOTO_BLOCK_MODE_FLICKR_LATEST', 3); define('FEATUREDPHOTO_BLOCK_MODE_FLICKR_LATEST_SET', 4); + define('FEATUREDPHOTO_BLOCK_MODE_FLICKR_RANDOM_SET', 5); class FeaturedPhoto_Block *************** *** 184,187 **** --- 185,190 ---- $modes[FEATUREDPHOTO_BLOCK_MODE_FLICKR_LATEST_SET] = dgettext('featuredphoto', 'Flickr: Latest public photo in set'); + $modes[FEATUREDPHOTO_BLOCK_MODE_FLICKR_RANDOM_SET] = dgettext('featuredphoto', + 'Flickr: Random public photo in set'); } *************** *** 189,192 **** --- 192,207 ---- } + function isModeFlickr() + { + if (($this->mode == FEATUREDPHOTO_BLOCK_MODE_FLICKR_LATEST) || + ($this->mode == FEATUREDPHOTO_BLOCK_MODE_FLICKR_LATEST_SET) || + ($this->mode == FEATUREDPHOTO_BLOCK_MODE_FLICKR_RANDOM_SET)) + { + return true; + } + + return false; + } + function save($save_key=TRUE) { *************** *** 344,348 **** // Get the friendly URL of the user's photos $photos_url = $f->urls_getUserPhotos($person['id']); ! // Get the user's first public photo $photos = $f->people_getPublicPhotos($person['id'], NULL, 1); --- 359,363 ---- // Get the friendly URL of the user's photos $photos_url = $f->urls_getUserPhotos($person['id']); ! // Get the user's latest public photo $photos = $f->people_getPublicPhotos($person['id'], NULL, 1); *************** *** 358,362 **** $template['IMAGE_ALT'] = $photo['title']; $template['NAME'] = $photo['title']; ! $template['CAPTION'] = $info['description']; return PHPWS_Template::process($template, 'featuredphoto', 'photo/flickr_view.tpl'); } --- 373,379 ---- $template['IMAGE_ALT'] = $photo['title']; $template['NAME'] = $photo['title']; ! $template['CAPTION'] = !empty($info['description']) ? $info['description'] : NULL; ! $template['MORE_URL'] = $photos_url; ! $template['MORE'] = dgettext('featuredphoto', 'More Photos'); return PHPWS_Template::process($template, 'featuredphoto', 'photo/flickr_view.tpl'); } *************** *** 368,371 **** --- 385,389 ---- case FEATUREDPHOTO_BLOCK_MODE_FLICKR_LATEST_SET: + case FEATUREDPHOTO_BLOCK_MODE_FLICKR_RANDOM_SET: { if (PHPWS_Settings::get('featuredphoto', 'flickr_support') && ($this->flickr_set > 0)) *************** *** 376,385 **** $person = $f->people_findByUsername(PHPWS_Settings::get('featuredphoto', 'flickr_username')); $photoset = $f->photosets_getInfo($this->flickr_set); ! if (!PHPWS_Error::logIfError($person) && !PHPWS_Error::logIfError($photoset)) { // Get the friendly URL of the user's photos $photos_url = $f->urls_getUserPhotos($person['id']); ! // Get the user's first public photo ! $photos = $f->photosets_getPhotos($this->flickr_set, NULL, 1, 1, $photoset['photos']); if (!PHPWS_Error::logIfError($photos_url) && !PHPWS_Error::logIfError($photos)) --- 394,407 ---- $person = $f->people_findByUsername(PHPWS_Settings::get('featuredphoto', 'flickr_username')); $photoset = $f->photosets_getInfo($this->flickr_set); ! if (!PHPWS_Error::logIfError($person) && !PHPWS_Error::logIfError($photoset) && ! ($photoset['photos'] > 0)) { // Get the friendly URL of the user's photos $photos_url = $f->urls_getUserPhotos($person['id']); ! ! // Get the user's photo ! $page = (($this->mode == FEATUREDPHOTO_BLOCK_MODE_FLICKR_RANDOM_SET) ? ! rand(1, $photoset['photos']) : $photoset['photos']); ! $photos = $f->photosets_getPhotos($this->flickr_set, NULL, 1, 1, $page); if (!PHPWS_Error::logIfError($photos_url) && !PHPWS_Error::logIfError($photos)) *************** *** 394,398 **** $template['IMAGE_ALT'] = $photo['title']; $template['NAME'] = $photo['title']; ! $template['CAPTION'] = $info['description']; return PHPWS_Template::process($template, 'featuredphoto', 'photo/flickr_view.tpl'); } --- 416,422 ---- $template['IMAGE_ALT'] = $photo['title']; $template['NAME'] = $photo['title']; ! $template['CAPTION'] = !empty($info['description']) ? $info['description'] : NULL; ! $template['MORE_URL'] = $photos_url . 'sets/' . $this->flickr_set; ! $template['MORE'] = dgettext('featuredphoto', 'More Photos'); return PHPWS_Template::process($template, 'featuredphoto', 'photo/flickr_view.tpl'); } *************** *** 455,460 **** $link['block_id'] = $this->getId(); ! if (($this->getMode(false) != FEATUREDPHOTO_BLOCK_MODE_FLICKR_LATEST) && ! ($this->getMode(false) != FEATUREDPHOTO_BLOCK_MODE_FLICKR_LATEST_SET)) { $link['action'] = 'managePhotos'; --- 479,483 ---- $link['block_id'] = $this->getId(); ! if (!$this->isModeFlickr()) { $link['action'] = 'managePhotos'; *************** *** 542,547 **** $vars['block_id'] = $this->getId(); ! if (($this->getMode(false) != FEATUREDPHOTO_BLOCK_MODE_FLICKR_LATEST) && ! ($this->getMode(false) != FEATUREDPHOTO_BLOCK_MODE_FLICKR_LATEST_SET)) { $vars['action'] = 'managePhotos'; --- 565,569 ---- $vars['block_id'] = $this->getId(); ! if (!$this->isModeFlickr()) { $vars['action'] = 'managePhotos'; |
|
From: Greg M. <bli...@us...> - 2008-01-27 18:03:33
|
Update of /cvsroot/phpwebsite-comm/modules/featuredphoto/templates/photo In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25150/templates/photo Modified Files: flickr_view.tpl Log Message: Added More Photos link. Added Flickr Random in Set block mode. Index: flickr_view.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/featuredphoto/templates/photo/flickr_view.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** flickr_view.tpl 26 Jan 2008 22:32:55 -0000 1.1 --- flickr_view.tpl 27 Jan 2008 18:03:36 -0000 1.2 *************** *** 1,5 **** <a href="{URL}" target="_blank"><img src="{IMAGE_SRC}" alt="{IMAGE_ALT}" /></a> ! <br /><br /> ! <b>{NAME}</b><br /> ! {CAPTION} \ No newline at end of file --- 1,6 ---- <a href="{URL}" target="_blank"><img src="{IMAGE_SRC}" alt="{IMAGE_ALT}" /></a> ! <br /><br /><strong>{NAME}</strong> ! <!-- BEGIN caption --><br />{CAPTION}<!-- END caption --> ! ! <!-- BEGIN more --><br /><br /><a href="{MORE_URL}" target="_blank">{MORE}</a><!-- END more --> |
|
From: Greg M. <bli...@us...> - 2008-01-27 18:03:32
|
Update of /cvsroot/phpwebsite-comm/modules/featuredphoto/templates/block In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25150/templates/block Modified Files: edit.tpl Log Message: Added More Photos link. Added Flickr Random in Set block mode. Index: edit.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/featuredphoto/templates/block/edit.tpl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** edit.tpl 26 Jan 2008 18:03:56 -0000 1.8 --- edit.tpl 27 Jan 2008 18:03:34 -0000 1.9 *************** *** 1,40 **** {START_FORM} ! <table class="form-table" width="99%"> ! <tr> ! <td>{TITLE_LABEL}</td> ! <td> ! {TITLE} ! <!-- BEGIN title-error --> ! <div class="featuredphoto-error">{TITLE_ERROR}</div> ! <!-- END title-error --> ! </td> ! </tr> ! <tr> ! <td><strong>{MODE_LABEL}</strong></td> ! <td> ! {MODE_1} {MODE_1_LABEL}<br /> ! {MODE_2} {MODE_2_LABEL}<br /> ! {MODE_3} {MODE_3_LABEL} {CURRENT_PHOTO}<br /> ! <!-- BEGIN mode_4 -->{MODE_4} {MODE_4_LABEL}<br /><!-- END mode_4 --> ! <!-- BEGIN mode_5 -->{MODE_5} {MODE_5_LABEL} {FLICKR_SET}<!-- END mode_5 --> ! <!-- BEGIN mode-error --> ! <div class="featuredphoto-error">{MODE_ERROR}</div> ! <!-- END mode-error --> ! </td> ! </tr> ! <tr> ! <td><strong>{RESIZE_LABEL}</strong></td> ! <td> ! {TN_WIDTH} X {TN_HEIGHT} {PIXELS_LABEL} ! <!-- BEGIN resize-error --> ! <div class="featuredphoto-error">{RESIZE_ERROR}</div> ! <!-- END resize-error --> ! </td> ! </tr> ! <tr> ! <td><strong>{TEMPLATE_LABEL}</strong></td> ! <td>{TEMPLATE}</td> ! </tr> ! </table> ! {SUBMIT} {CANCEL} {END_FORM} --- 1,25 ---- {START_FORM} ! ! <div class="padded"> ! <strong>{TITLE_LABEL}</strong><br />{TITLE} ! <!-- BEGIN title-error --><div class="error">{TITLE_ERROR}</div><!-- END title-error --> ! </div> ! <div class="padded"> ! <strong>{MODE_LABEL}</strong><br /> ! {MODE_1} {MODE_1_LABEL}<br /> ! {MODE_2} {MODE_2_LABEL}<br /> ! {MODE_3} {MODE_3_LABEL} {CURRENT_PHOTO}<br /> ! <!-- BEGIN mode_4 -->{MODE_4} {MODE_4_LABEL}<br /><!-- END mode_4 --> ! <!-- BEGIN mode_5 -->{MODE_5} {MODE_5_LABEL} *<br /><!-- END mode_5 --> ! <!-- BEGIN mode_6 -->{MODE_6} {MODE_6_LABEL} *<!-- END mode_6 --> ! <!-- BEGIN flickr_set --><div style="margin-left:25px">* {FLICKR_SET_LABEL} {FLICKR_SET}</div><!-- END flickr_set --> ! <!-- BEGIN mode-error --><div class="error">{MODE_ERROR}</div><!-- END mode-error --> ! </div> ! <div class="padded"> ! <strong>{RESIZE_LABEL}</strong><br />{TN_WIDTH} X {TN_HEIGHT} {PIXELS_LABEL} ! <!-- BEGIN resize-error --><div class="error">{RESIZE_ERROR}</div><!-- END resize-error --> ! </div> ! <div class="padded"><strong>{TEMPLATE_LABEL}</strong><br />{TEMPLATE}</div> ! <div class="padded">{SUBMIT} {CANCEL}</div> ! {END_FORM} |
|
From: Greg M. <bli...@us...> - 2008-01-27 02:41:27
|
Update of /cvsroot/phpwebsite-comm/modules/featuredphoto/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22628/class Modified Files: manager.php Log Message: If disabling flickr in settings, reset block modes to non-flickr value. Index: manager.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/featuredphoto/class/manager.php,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** manager.php 27 Jan 2008 01:43:08 -0000 1.36 --- manager.php 27 Jan 2008 02:41:30 -0000 1.37 *************** *** 742,745 **** --- 742,754 ---- } + /* If Flickr disabled, verify no blocks modes are set to Flickr. */ + if (!PHPWS_Settings::get('featuredphoto', 'flickr_support')) + { + $db = new PHPWS_DB('featuredphoto_blocks'); + $db->addWhere('mode', FEATUREDPHOTO_BLOCK_MODE_FLICKR_LATEST, '>='); + $db->addValue('mode', FEATUREDPHOTO_BLOCK_MODE_INCREMENT); + PHPWS_Error::logIfError($db->update()); + } + FeaturedPhoto_Manager::sendMessage($ret_msg, 'editSettings'); } |
|
From: Greg M. <bli...@us...> - 2008-01-27 01:43:09
|
Update of /cvsroot/phpwebsite-comm/modules/featuredphoto/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1021/docs Modified Files: ChangeLog Log Message: Can now pin a photo block to all pages. Index: ChangeLog =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/featuredphoto/docs/ChangeLog,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** ChangeLog 26 Jan 2008 22:32:54 -0000 1.26 --- ChangeLog 27 Jan 2008 01:43:12 -0000 1.27 *************** *** 7,10 **** --- 7,11 ---- *cvs + RFE #1880295: Can now pin a photo block to all pages RFE #1880296: Added Flickr support Added German translation (Thanks Peter Heppner) |
|
From: Greg M. <bli...@us...> - 2008-01-27 01:43:08
|
Update of /cvsroot/phpwebsite-comm/modules/featuredphoto/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1021/class Modified Files: block.php manager.php runtime.php Log Message: Can now pin a photo block to all pages. Index: manager.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/featuredphoto/class/manager.php,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** manager.php 26 Jan 2008 22:32:51 -0000 1.35 --- manager.php 27 Jan 2008 01:43:08 -0000 1.36 *************** *** 186,196 **** if (PHPWS_Error::logIfError($result)) { ! FeaturedPhoto_Manager::sendMessage(dgettext('featuredphoto', 'Photo block activation could not be changed'), ! 'manageBlocks'); } else { ! FeaturedPhoto_Manager::sendMessage(dgettext('featuredphoto', 'Photo block activation changed'), ! 'manageBlocks'); } break; --- 186,196 ---- if (PHPWS_Error::logIfError($result)) { ! FeaturedPhoto_Manager::sendMessage(dgettext('featuredphoto', ! 'Photo block activation could not be changed'), 'manageBlocks'); } else { ! FeaturedPhoto_Manager::sendMessage(dgettext('featuredphoto', ! 'Photo block activation changed'), 'manageBlocks'); } break; *************** *** 202,205 **** --- 202,210 ---- break; + case 'pinBlockAll': + FeaturedPhoto_Manager::pinBlockAll($block->getId()); + FeaturedPhoto_Manager::sendMessage(dgettext('featuredphoto', 'Photo block pinned'), 'manageBlocks'); + break; + case 'unpinBlock': unset($_SESSION['Pinned_Photo_Blocks'][$block->getId()]); *************** *** 220,224 **** case 'removeBlockPin': - FeaturedPhoto_Manager::checkPermission('pin_blocks'); FeaturedPhoto_Manager::removeBlockPin(); PHPWS_Core::goBack(); --- 225,228 ---- *************** *** 536,539 **** --- 540,559 ---- } + function pinBlockAll($block_id) + { + FeaturedPhoto_Manager::checkPermission('pin_blocks'); + + $values['block_id'] = $block_id; + $db = new PHPWS_DB('featuredphoto_pins'); + $db->addWhere($values); + PHPWS_Error::logIfError($db->delete()); + $db->resetWhere(); + + $values['key_id'] = -1; + $db->addValue($values); + + PHPWS_Error::logIfError($db->insert()); + } + function lockBlock($block_id, $key_id) { *************** *** 555,566 **** function removeBlockPin() { ! if (isset($_GET['key_id']) && isset($_GET['block_id'])) { $db = new PHPWS_DB('featuredphoto_pins'); $db->addWhere('block_id', $_GET['block_id']); ! $db->addWhere('key_id', $_GET['key_id']); ! $result = $db->delete(); ! PHPWS_Error::logIfError($result); } } --- 575,590 ---- function removeBlockPin() { ! FeaturedPhoto_Manager::checkPermission('pin_blocks'); ! ! if (isset($_GET['block_id'])) { $db = new PHPWS_DB('featuredphoto_pins'); $db->addWhere('block_id', $_GET['block_id']); ! if (isset($_GET['key_id'])) ! { ! $db->addWhere('key_id', $_GET['key_id']); ! } ! PHPWS_Error::logIfError($db->delete()); } } Index: block.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/featuredphoto/class/block.php,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** block.php 26 Jan 2008 22:32:51 -0000 1.22 --- block.php 27 Jan 2008 01:43:08 -0000 1.23 *************** *** 507,510 **** --- 507,541 ---- } + function allPinned() + { + static $all_pinned = null; + + if (empty($all_pinned)) + { + $db = new PHPWS_DB('featuredphoto_pins'); + $db->addWhere('key_id', -1); + $db->addColumn('block_id'); + $result = $db->select('col'); + if (!PHPWS_Error::logIfError($result)) + { + if ($result) + { + $all_pinned = $result; + } + else + { + $all_pinned = true; + } + } + } + + if (is_array($all_pinned)) + { + return in_array($this->id, $all_pinned); + } + + return false; + } + function getListTags() { *************** *** 531,538 **** --- 562,576 ---- $links[] = PHPWS_Text::secureLink(dgettext('featuredphoto', 'Unpin'), 'featuredphoto', $vars); } + else if ($this->allPinned()) + { + $vars['action'] = 'removeBlockPin'; + $links[] = PHPWS_Text::secureLink(dgettext('featuredphoto', 'Unpin all'), 'featuredphoto', $vars); + } else { $vars['action'] = 'pinBlock'; $links[] = PHPWS_Text::secureLink(dgettext('featuredphoto', 'Pin'), 'featuredphoto', $vars); + $vars['action'] = 'pinBlockAll'; + $links[] = PHPWS_Text::secureLink(dgettext('featuredphoto', 'Pin all'), 'featuredphoto', $vars); } } Index: runtime.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/featuredphoto/class/runtime.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** runtime.php 30 Sep 2007 22:48:46 -0000 1.4 --- runtime.php 27 Jan 2008 01:43:08 -0000 1.5 *************** *** 25,34 **** PHPWS_Core::initModClass('featuredphoto', 'block.php'); ! class FeaturedPhoto_Runtime { ! function show() { ! $key = Key::getCurrent(); if (!empty($key) && !$key->isDummy(true)) { --- 25,35 ---- PHPWS_Core::initModClass('featuredphoto', 'block.php'); ! class FeaturedPhoto_Runtime ! { function show() { ! FeaturedPhoto_Runtime::showAllBlocks(); + $key = Key::getCurrent(); if (!empty($key) && !$key->isDummy(true)) { *************** *** 38,66 **** } ! function viewPinnedBlocks($key) { ! if (!isset($_SESSION['Pinned_Photo_Blocks'])) ! { ! return FALSE; ! } ! $block_list = &$_SESSION['Pinned_Photo_Blocks']; ! if (!empty($block_list)) { ! foreach ($block_list as $block_id => $block) { ! if (isset($GLOBALS['Current_Photo_Blocks'][$block_id])) { ! continue; } ! $block->setPinKey($key); ! $content[] = $block->view(TRUE); ! } ! ! if (!empty($content)) ! { ! $complete = implode('', $content); ! Layout::add($complete, 'featuredphoto', 'Photo_Block_List'); } } --- 39,70 ---- } ! function showAllBlocks() { ! $key = new Key; ! $key->id = -1; ! FeaturedPhoto_Runtime::showBlocks($key); ! } ! function viewPinnedBlocks($key) ! { ! if (isset($_SESSION['Pinned_Photo_Blocks'])) { ! $block_list = &$_SESSION['Pinned_Photo_Blocks']; ! if (!empty($block_list)) { ! foreach ($block_list as $block_id => $block) { ! if (!isset($GLOBALS['Current_Photo_Blocks'][$block_id])) ! { ! $block->setPinKey($key); ! $content[] = $block->view(TRUE); ! } } ! if (!empty($content)) ! { ! $complete = implode('', $content); ! Layout::add($complete, 'featuredphoto', 'Photo_Block_List'); ! } } } |
|
From: Greg M. <bli...@us...> - 2008-01-26 22:33:24
|
Update of /cvsroot/phpwebsite-comm/modules/featuredphoto/class/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29746/class/lib Modified Files: Flickr.php Log Message: Can now display photos from Flickr Index: Flickr.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/featuredphoto/class/lib/Flickr.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Flickr.php 26 Jan 2008 18:03:54 -0000 1.2 --- Flickr.php 26 Jan 2008 22:32:52 -0000 1.3 *************** *** 132,135 **** --- 132,165 ---- /** + * Get the largest size that will fit in the specified dimensions. + * + * @access public + * + * @param int Maximum width of a photo + * @param int Maximum height of a photo + * @return string Photo size that best fits the dimensions + */ + function best_photo_size($width, $height) + { + $sizes = array('large' => 1024, + 'medium' => 500, + 'small' => 240, + 'thumbnail' => 100, + 'square' => 75); + + $min = (($width < $height) ? $width : $height); + foreach ($sizes as $str => $px) + { + if ($min > $px) + { + return $str; + } + } + + /* If we make it to here, return the smallest size possible. */ + return 'square'; + } + + /** * Build a photo's Flickr URL. * *************** *** 216,219 **** --- 246,262 ---- /** + * Retrieve a photoset's information + * + * @access public + * @note http://www.flickr.com/services/api/flickr.photosets.getInfo.html + * @return mixed Photoset node on success, PHPWS_Error on failure + */ + function photosets_getInfo($photoset_id) + { + $resp = $this->_request('flickr.photosets.getInfo', array('photoset_id'=>$photoset_id)); + return (PEAR::isError($resp) ? $resp : $resp['photoset']); + } + + /** * Get a listing of a user's photo sets * |
|
From: Greg M. <bli...@us...> - 2008-01-26 22:33:18
|
Update of /cvsroot/phpwebsite-comm/modules/featuredphoto/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29746/class Modified Files: block.php manager.php Log Message: Can now display photos from Flickr Index: manager.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/featuredphoto/class/manager.php,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** manager.php 26 Jan 2008 18:03:53 -0000 1.34 --- manager.php 26 Jan 2008 22:32:51 -0000 1.35 *************** *** 23,26 **** --- 23,28 ---- */ + PHPWS_Core::initModClass('featuredphoto', 'photo.php'); + class FeaturedPhoto_Manager { *************** *** 371,374 **** --- 373,377 ---- $pager->setSearch('title'); $pager->setDefaultOrder('title', 'asc'); + $pager->setEmptyMessage(dgettext('featuredphoto', 'No photo blocks found.')); return $pager->get(); *************** *** 585,588 **** --- 588,592 ---- $pager->setDefaultOrder('id'); $pager->addWhere('block_id', $block_id); + $pager->setEmptyMessage(dgettext('featuredphoto', 'No photos found.')); return $pager->get(); Index: block.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/featuredphoto/class/block.php,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** block.php 26 Jan 2008 18:03:53 -0000 1.21 --- block.php 26 Jan 2008 22:32:51 -0000 1.22 *************** *** 23,28 **** */ - PHPWS_Core::initModClass('featuredphoto', 'photo.php'); - define('FEATUREDPHOTO_BLOCK_MODE_INCREMENT', 0); define('FEATUREDPHOTO_BLOCK_MODE_RANDOM', 1); --- 23,26 ---- *************** *** 257,260 **** --- 255,260 ---- function clearPhotos() { + PHPWS_Core::initModClass('featuredphoto', 'photo.php'); + $db = new PHPWS_DB('featuredphoto_photos'); $db->addWhere('block_id', $this->id); *************** *** 293,304 **** function getPhoto() { - $db = new PHPWS_DB('featuredphoto_photos'); - $db->addWhere('active', 1); - $db->addWhere('block_id', $this->getId()); - switch ($this->getMode(false)) { case FEATUREDPHOTO_BLOCK_MODE_RANDOM: { $db->addOrder('random'); $db->setLimit(1); --- 293,305 ---- function getPhoto() { switch ($this->getMode(false)) { case FEATUREDPHOTO_BLOCK_MODE_RANDOM: { + PHPWS_Core::initModClass('featuredphoto', 'photo.php'); + + $db = new PHPWS_DB('featuredphoto_photos'); + $db->addWhere('active', 1); + $db->addWhere('block_id', $this->getId()); $db->addOrder('random'); $db->setLimit(1); *************** *** 315,318 **** --- 316,324 ---- if ($this->current_photo > 0) { + PHPWS_Core::initModClass('featuredphoto', 'photo.php'); + + $db = new PHPWS_DB('featuredphoto_photos'); + $db->addWhere('active', 1); + $db->addWhere('block_id', $this->getId()); $db->addWhere('id', $this->current_photo); $db->setLimit(1); *************** *** 330,334 **** if (PHPWS_Settings::get('featuredphoto', 'flickr_support')) { ! return 'Flickr Latest'; } break; --- 336,366 ---- if (PHPWS_Settings::get('featuredphoto', 'flickr_support')) { ! PHPWS_Core::initModClass('featuredphoto', 'lib/Flickr.php'); ! ! $f = new PHPWS_Flickr(PHPWS_Settings::get('featuredphoto', 'flickr_api_key')); ! $person = $f->people_findByUsername(PHPWS_Settings::get('featuredphoto', 'flickr_username')); ! if (!PHPWS_Error::logIfError($person)) ! { ! // Get the friendly URL of the user's photos ! $photos_url = $f->urls_getUserPhotos($person['id']); ! // Get the user's first public photo ! $photos = $f->people_getPublicPhotos($person['id'], NULL, 1); ! ! if (!PHPWS_Error::logIfError($photos_url) && !PHPWS_Error::logIfError($photos)) ! { ! $photo = $photos['photo'][0]; ! $info = $f->photos_getInfo($photo['id'], $photo['secret']); ! if (!PHPWS_Error::logIfError($info)) ! { ! $template['URL'] = $photos_url . $photo['id']; ! $template['IMAGE_SRC'] = $f->build_photo_url($photo, ! $f->best_photo_size($this->tn_width, $this->tn_height)); ! $template['IMAGE_ALT'] = $photo['title']; ! $template['NAME'] = $photo['title']; ! $template['CAPTION'] = $info['description']; ! return PHPWS_Template::process($template, 'featuredphoto', 'photo/flickr_view.tpl'); ! } ! } ! } } break; *************** *** 339,343 **** if (PHPWS_Settings::get('featuredphoto', 'flickr_support') && ($this->flickr_set > 0)) { ! return 'Flickr Latest in Set'; } break; --- 371,402 ---- if (PHPWS_Settings::get('featuredphoto', 'flickr_support') && ($this->flickr_set > 0)) { ! PHPWS_Core::initModClass('featuredphoto', 'lib/Flickr.php'); ! ! $f = new PHPWS_Flickr(PHPWS_Settings::get('featuredphoto', 'flickr_api_key')); ! $person = $f->people_findByUsername(PHPWS_Settings::get('featuredphoto', 'flickr_username')); ! $photoset = $f->photosets_getInfo($this->flickr_set); ! if (!PHPWS_Error::logIfError($person) && !PHPWS_Error::logIfError($photoset)) ! { ! // Get the friendly URL of the user's photos ! $photos_url = $f->urls_getUserPhotos($person['id']); ! // Get the user's first public photo ! $photos = $f->photosets_getPhotos($this->flickr_set, NULL, 1, 1, $photoset['photos']); ! ! if (!PHPWS_Error::logIfError($photos_url) && !PHPWS_Error::logIfError($photos)) ! { ! $photo = $photos['photo'][0]; ! $info = $f->photos_getInfo($photo['id'], $photo['secret']); ! if (!PHPWS_Error::logIfError($info)) ! { ! $template['URL'] = $photos_url . $photo['id']; ! $template['IMAGE_SRC'] = $f->build_photo_url($photo, ! $f->best_photo_size($this->tn_width, $this->tn_height)); ! $template['IMAGE_ALT'] = $photo['title']; ! $template['NAME'] = $photo['title']; ! $template['CAPTION'] = $info['description']; ! return PHPWS_Template::process($template, 'featuredphoto', 'photo/flickr_view.tpl'); ! } ! } ! } } break; *************** *** 346,349 **** --- 405,413 ---- default: { + PHPWS_Core::initModClass('featuredphoto', 'photo.php'); + + $db = new PHPWS_DB('featuredphoto_photos'); + $db->addWhere('active', 1); + $db->addWhere('block_id', $this->getId()); $db->addOrder('id'); $photos = $db->getObjects('FeaturedPhoto'); |
|
From: Greg M. <bli...@us...> - 2008-01-26 22:32:52
|
Update of /cvsroot/phpwebsite-comm/modules/featuredphoto/templates/photo In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29746/templates/photo Added Files: flickr_view.tpl Log Message: Can now display photos from Flickr --- NEW FILE: flickr_view.tpl --- <a href="{URL}" target="_blank"><img src="{IMAGE_SRC}" alt="{IMAGE_ALT}" /></a> <br /><br /> <b>{NAME}</b><br /> {CAPTION} |
|
From: Greg M. <bli...@us...> - 2008-01-26 22:32:51
|
Update of /cvsroot/phpwebsite-comm/modules/featuredphoto/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29746/docs Modified Files: ChangeLog Log Message: Can now display photos from Flickr Index: ChangeLog =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/featuredphoto/docs/ChangeLog,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** ChangeLog 23 Jan 2008 04:38:33 -0000 1.25 --- ChangeLog 26 Jan 2008 22:32:54 -0000 1.26 *************** *** 7,10 **** --- 7,11 ---- *cvs + RFE #1880296: Added Flickr support Added German translation (Thanks Peter Heppner) |
|
From: Greg M. <bli...@us...> - 2008-01-26 18:04:20
|
Update of /cvsroot/phpwebsite-comm/modules/featuredphoto/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1906/class Modified Files: block.php manager.php Log Message: Can now select a Flickr block mode. Index: manager.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/featuredphoto/class/manager.php,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** manager.php 26 Jan 2008 14:49:11 -0000 1.33 --- manager.php 26 Jan 2008 18:03:53 -0000 1.34 *************** *** 51,55 **** } ! $panel->setContent(FeaturedPhoto_Manager::route($action)); Layout::add(PHPWS_ControlPanel::display($panel->display())); } --- 51,55 ---- } ! $panel->setContent(FeaturedPhoto_Manager::route($action, $panel)); Layout::add(PHPWS_ControlPanel::display($panel->display())); } *************** *** 78,82 **** } ! function route($action) { $title = NULL; --- 78,82 ---- } ! function route($action, &$panel) { $title = NULL; *************** *** 111,114 **** --- 111,116 ---- case 'manageBlocks': + /* Need to set tab in case we got here from another action. */ + $panel->setCurrentTab('manageBlocks'); $title = dgettext('featuredphoto', 'Manage Photo Blocks'); $content = FeaturedPhoto_Manager::listBlocks(); *************** *** 435,438 **** --- 437,464 ---- $form->setMatch('current_photo', $block->current_photo); + if (PHPWS_Settings::get('featuredphoto', 'flickr_support')) + { + PHPWS_Core::initModClass('featuredphoto', 'lib/Flickr.php'); + $flickr_sets[0] = '(' . dgettext('featuredphoto', 'None') . ')'; + + $f = new PHPWS_Flickr(PHPWS_Settings::get('featuredphoto', 'flickr_api_key')); + $person = $f->people_findByUsername(PHPWS_Settings::get('featuredphoto', 'flickr_username')); + if (!PHPWS_Error::logIfError($person)) + { + $photosets = $f->photosets_getList($person['id']); + if (!PHPWS_Error::logIfError($photosets)) + { + $flickr_sets = NULL; + foreach ($photosets as $photoset) + { + $flickr_sets[$photoset['id']] = $photoset['title']; + } + } + } + + $form->addSelect('flickr_set', $flickr_sets); + $form->setMatch('flickr_set', $block->flickr_set); + } + $form->addText('tn_width', $block->getTnWidth()); $form->setSize('tn_width', 4); *************** *** 460,463 **** --- 486,493 ---- $template['TITLE_ERROR'] = $errors['title']; } + if (isset($errors['mode'])) + { + $template['MODE_ERROR'] = $errors['mode']; + } if (isset($errors['resize'])) { *************** *** 478,485 **** --- 508,524 ---- $errors['resize'] = dgettext('featuredphoto', 'Image dimensions must be greater than zero.'); } + if (($_POST['mode'] == FEATUREDPHOTO_BLOCK_MODE_FIXED) && ($_POST['current_photo'] == 0)) + { + $errors['mode'] = dgettext('featuredphoto', 'Cannot choose Fixed mode with no image selected.'); + } + if (($_POST['mode'] == FEATUREDPHOTO_BLOCK_MODE_FLICKR_LATEST_SET) && ($_POST['flickr_set'] == 0)) + { + $errors['mode'] = dgettext('featuredphoto', 'Cannot choose Flickr Set mode with no set selected.'); + } $block->setTitle($_POST['title']); $block->setMode($_POST['mode']); $block->setCurrentPhoto($_POST['current_photo']); + $block->setFlickrSet(isset($_POST['flickr_set']) ? $_POST['flickr_set'] : 0); $block->setTnWidth($_POST['tn_width']); $block->setTnHeight($_POST['tn_height']); Index: block.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/featuredphoto/class/block.php,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** block.php 26 Jan 2008 14:49:11 -0000 1.20 --- block.php 26 Jan 2008 18:03:53 -0000 1.21 *************** *** 25,31 **** PHPWS_Core::initModClass('featuredphoto', 'photo.php'); ! define('FEATUREDPHOTO_BLOCK_MODE_INCREMENT', 0); ! define('FEATUREDPHOTO_BLOCK_MODE_RANDOM', 1); ! define('FEATUREDPHOTO_BLOCK_MODE_FIXED', 2); class FeaturedPhoto_Block --- 25,33 ---- PHPWS_Core::initModClass('featuredphoto', 'photo.php'); ! define('FEATUREDPHOTO_BLOCK_MODE_INCREMENT', 0); ! define('FEATUREDPHOTO_BLOCK_MODE_RANDOM', 1); ! define('FEATUREDPHOTO_BLOCK_MODE_FIXED', 2); ! define('FEATUREDPHOTO_BLOCK_MODE_FLICKR_LATEST', 3); ! define('FEATUREDPHOTO_BLOCK_MODE_FLICKR_LATEST_SET', 4); class FeaturedPhoto_Block *************** *** 37,40 **** --- 39,43 ---- var $active = 1; var $current_photo = 0; + var $flickr_set = 0; var $tn_width = FEATUREDPHOTO_DEFAULT_THUMBNAIL_WIDTH; var $tn_height = FEATUREDPHOTO_DEFAULT_THUMBNAIL_HEIGHT; *************** *** 107,111 **** function setCurrentPhoto($current_photo) { ! $this->current_photo = (int)$current_photo; } --- 110,119 ---- function setCurrentPhoto($current_photo) { ! $this->current_photo = (is_numeric($current_photo) ? $current_photo : 0); ! } ! ! function setFlickrSet($flickr_set) ! { ! $this->flickr_set = (is_numeric($flickr_set) ? $flickr_set : 0); } *************** *** 172,175 **** --- 180,191 ---- $modes[FEATUREDPHOTO_BLOCK_MODE_FIXED] = dgettext('featuredphoto', 'Fixed on the image'); + if (PHPWS_Settings::get('featuredphoto', 'flickr_support')) + { + $modes[FEATUREDPHOTO_BLOCK_MODE_FLICKR_LATEST] = dgettext('featuredphoto', + 'Flickr: Latest public photo'); + $modes[FEATUREDPHOTO_BLOCK_MODE_FLICKR_LATEST_SET] = dgettext('featuredphoto', + 'Flickr: Latest public photo in set'); + } + return $modes; } *************** *** 288,292 **** $db->setLimit(1); $photos = $db->getObjects('FeaturedPhoto'); ! $photo = &$photos[0]; break; } --- 304,311 ---- $db->setLimit(1); $photos = $db->getObjects('FeaturedPhoto'); ! if (!PHPWS_Error::logIfError($photos) && ($photos != NULL)) ! { ! return $photos[0]->view(); ! } break; } *************** *** 299,303 **** $db->setLimit(1); $photos = $db->getObjects('FeaturedPhoto'); ! $photo = &$photos[0]; } break; --- 318,343 ---- $db->setLimit(1); $photos = $db->getObjects('FeaturedPhoto'); ! if (!PHPWS_Error::logIfError($photos) && ($photos != NULL)) ! { ! return $photos[0]->view(); ! } ! } ! break; ! } ! ! case FEATUREDPHOTO_BLOCK_MODE_FLICKR_LATEST: ! { ! if (PHPWS_Settings::get('featuredphoto', 'flickr_support')) ! { ! return 'Flickr Latest'; ! } ! break; ! } ! ! case FEATUREDPHOTO_BLOCK_MODE_FLICKR_LATEST_SET: ! { ! if (PHPWS_Settings::get('featuredphoto', 'flickr_support') && ($this->flickr_set > 0)) ! { ! return 'Flickr Latest in Set'; } break; *************** *** 309,320 **** $photos = $db->getObjects('FeaturedPhoto'); ! $newFound = FALSE; ! if ($photos != NULL) { foreach ($photos as $pic) { if (($pic->getId() > $this->current_photo) && (!$newFound)) { ! $newFound = TRUE; $photo = $pic; $this->current_photo = $pic->getId(); --- 349,361 ---- $photos = $db->getObjects('FeaturedPhoto'); ! if (!PHPWS_Error::logIfError($photos) && ($photos != NULL)) { + $newFound = false; + foreach ($photos as $pic) { if (($pic->getId() > $this->current_photo) && (!$newFound)) { ! $newFound = true; $photo = $pic; $this->current_photo = $pic->getId(); *************** *** 324,347 **** if (!$newFound) { ! $newFound = TRUE; $photo = &$photos[0]; $this->current_photo = $photo->getId(); } - } ! if ($newFound) ! { ! $this->save(FALSE); } - break; } } - if (isset($photo)) - { - return $photo->view(); - } - return dgettext('featuredphoto', 'No active photo.'); } --- 365,380 ---- if (!$newFound) { ! $newFound = true; $photo = &$photos[0]; $this->current_photo = $photo->getId(); } ! $this->save(false); ! return $photo->view(); } break; } } return dgettext('featuredphoto', 'No active photo.'); } *************** *** 356,364 **** if (Current_User::allow('featuredphoto')) { ! $link['action'] = 'managePhotos'; ! $link['block_id'] = $this->id; ! $img = sprintf('<img src="./images/mod/featuredphoto/edit.png" alt="%s" title="%s" />', ! dgettext('featuredphoto', 'Manage Photos'), dgettext('featuredphoto', 'Manage Photos')); ! $edit = PHPWS_Text::secureLink($img, 'featuredphoto', $link); if (Current_User::allow('featuredphoto', 'pin_blocks')) --- 389,403 ---- if (Current_User::allow('featuredphoto')) { ! $link['block_id'] = $this->getId(); ! ! if (($this->getMode(false) != FEATUREDPHOTO_BLOCK_MODE_FLICKR_LATEST) && ! ($this->getMode(false) != FEATUREDPHOTO_BLOCK_MODE_FLICKR_LATEST_SET)) ! { ! $link['action'] = 'managePhotos'; ! $img = sprintf('<img src="./images/mod/featuredphoto/edit.png" alt="%s" title="%s" />', ! dgettext('featuredphoto', 'Manage Photos'), ! dgettext('featuredphoto', 'Manage Photos')); ! $edit = PHPWS_Text::secureLink($img, 'featuredphoto', $link); ! } if (Current_User::allow('featuredphoto', 'pin_blocks')) *************** *** 408,413 **** $vars['block_id'] = $this->getId(); ! $vars['action'] = 'managePhotos'; ! $links[] = PHPWS_Text::secureLink(dgettext('featuredphoto', 'Photos'), 'featuredphoto', $vars); if (Current_User::allow('featuredphoto', 'edit_blocks', $this->id)) --- 447,456 ---- $vars['block_id'] = $this->getId(); ! if (($this->getMode(false) != FEATUREDPHOTO_BLOCK_MODE_FLICKR_LATEST) && ! ($this->getMode(false) != FEATUREDPHOTO_BLOCK_MODE_FLICKR_LATEST_SET)) ! { ! $vars['action'] = 'managePhotos'; ! $links[] = PHPWS_Text::secureLink(dgettext('featuredphoto', 'Photos'), 'featuredphoto', $vars); ! } if (Current_User::allow('featuredphoto', 'edit_blocks', $this->id)) |
|
From: Greg M. <bli...@us...> - 2008-01-26 18:04:19
|
Update of /cvsroot/phpwebsite-comm/modules/featuredphoto/boost In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1906/boost Modified Files: install.sql Log Message: Can now select a Flickr block mode. Index: install.sql =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/featuredphoto/boost/install.sql,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** install.sql 30 Sep 2007 19:26:15 -0000 1.11 --- install.sql 26 Jan 2008 18:03:52 -0000 1.12 *************** *** 16,19 **** --- 16,20 ---- active SMALLINT NOT NULL, current_photo INT NOT NULL, + flickr_set BIGINT unsigned NOT NULL, tn_width INT NOT NULL, tn_height INT NOT NULL, |
|
From: Greg M. <bli...@us...> - 2008-01-26 18:03:52
|
Update of /cvsroot/phpwebsite-comm/modules/featuredphoto/templates/block In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1906/templates/block Modified Files: edit.tpl Log Message: Can now select a Flickr block mode. Index: edit.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/featuredphoto/templates/block/edit.tpl,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** edit.tpl 30 Sep 2007 21:28:29 -0000 1.7 --- edit.tpl 26 Jan 2008 18:03:56 -0000 1.8 *************** *** 14,21 **** <td> {MODE_1} {MODE_1_LABEL}<br /> ! {MODE_2} {MODE_2_LABEL} ! <!-- BEGIN mode_3 --> ! <br />{MODE_3} {MODE_3_LABEL} {CURRENT_PHOTO} ! <!-- END mode_3 --> </td> </tr> --- 14,24 ---- <td> {MODE_1} {MODE_1_LABEL}<br /> ! {MODE_2} {MODE_2_LABEL}<br /> ! {MODE_3} {MODE_3_LABEL} {CURRENT_PHOTO}<br /> ! <!-- BEGIN mode_4 -->{MODE_4} {MODE_4_LABEL}<br /><!-- END mode_4 --> ! <!-- BEGIN mode_5 -->{MODE_5} {MODE_5_LABEL} {FLICKR_SET}<!-- END mode_5 --> ! <!-- BEGIN mode-error --> ! <div class="featuredphoto-error">{MODE_ERROR}</div> ! <!-- END mode-error --> </td> </tr> |
|
From: Greg M. <bli...@us...> - 2008-01-26 18:03:52
|
Update of /cvsroot/phpwebsite-comm/modules/featuredphoto/class/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1906/class/lib Modified Files: Flickr.php Log Message: Can now select a Flickr block mode. Index: Flickr.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/featuredphoto/class/lib/Flickr.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Flickr.php 22 Jan 2008 03:22:34 -0000 1.1 --- Flickr.php 26 Jan 2008 18:03:54 -0000 1.2 *************** *** 225,229 **** { $resp = $this->_request('flickr.photosets.getList', array('user_id' => $user_id)); ! return (PEAR::isError($resp) ? $resp : $resp['photosets']); } --- 225,229 ---- { $resp = $this->_request('flickr.photosets.getList', array('user_id' => $user_id)); ! return (PEAR::isError($resp) ? $resp : $resp['photosets']['photoset']); } |
|
From: Greg M. <bli...@us...> - 2008-01-26 14:49:10
|
Update of /cvsroot/phpwebsite-comm/modules/featuredphoto/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29204/class Modified Files: block.php manager.php Log Message: Improved block mode code. Index: manager.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/featuredphoto/class/manager.php,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** manager.php 23 Jan 2008 04:04:20 -0000 1.32 --- manager.php 26 Jan 2008 14:49:11 -0000 1.33 *************** *** 396,406 **** } - $form->addText('title', $block->getTitle()); - $form->setLabel('title', dgettext('featuredphoto', 'Title')); - $form->setSize('title', 50); - - $modes[0] = dgettext('featuredphoto', 'Increment'); - $modes[1] = dgettext('featuredphoto', 'Random'); - if (empty($block->id)) { --- 396,399 ---- *************** *** 411,437 **** $form->addHidden('block_id', $block->getId()); $form->addSubmit('submit', dgettext('featuredphoto', 'Update Photo Block')); ! $db = new PHPWS_DB('featuredphoto_photos'); ! $db->addWhere(array('active'=>1, 'block_id'=>$block->getId())); ! $db->addOrder('id'); ! $photos = $db->select(); ! if (!PHPWS_Error::logIfError($photos) && ($photos != NULL)) ! { ! PHPWS_Core::initModClass('filecabinet', 'Image.php'); ! $modes[2] = dgettext('featuredphoto', 'Fixed on the image'); ! foreach ($photos as $photo) ! { ! $image = new PHPWS_Image($photo['image_id']); ! $current_photos[$photo['id']] = $image->title; ! } ! $form->addSelect('current_photo', $current_photos); ! $form->setMatch('current_photo', $block->current_photo); } } ! ! $form->addRadioAssoc('mode', $modes); ! $form->setMatch('mode', $block->mode); ! $form->addTplTag('MODE_LABEL', dgettext('featuredphoto', 'Mode')); $form->addText('tn_width', $block->getTnWidth()); --- 404,437 ---- $form->addHidden('block_id', $block->getId()); $form->addSubmit('submit', dgettext('featuredphoto', 'Update Photo Block')); + } ! $form->addText('title', $block->getTitle()); ! $form->setLabel('title', dgettext('featuredphoto', 'Title')); ! $form->setSize('title', 50); ! $form->addRadioAssoc('mode', $block->allModes()); ! $form->setMatch('mode', $block->getMode(false)); ! $form->addTplTag('MODE_LABEL', dgettext('featuredphoto', 'Mode')); ! ! $db = new PHPWS_DB('featuredphoto_photos'); ! $db->addWhere(array('active'=>1, 'block_id'=>$block->getId())); ! $db->addOrder('id'); ! $photos = $db->select(); ! if (!PHPWS_Error::logIfError($photos) && ($photos != NULL)) ! { ! PHPWS_Core::initModClass('filecabinet', 'Image.php'); ! ! foreach ($photos as $photo) ! { ! $image = new PHPWS_Image($photo['image_id']); ! $current_photos[$photo['id']] = $image->title; } } ! else ! { ! $current_photos[0] = '(' . dgettext('featuredphoto', 'None') . ')'; ! } ! $form->addSelect('current_photo', $current_photos); ! $form->setMatch('current_photo', $block->current_photo); $form->addText('tn_width', $block->getTnWidth()); Index: block.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/featuredphoto/class/block.php,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** block.php 13 Oct 2007 15:11:50 -0000 1.19 --- block.php 26 Jan 2008 14:49:11 -0000 1.20 *************** *** 25,28 **** --- 25,32 ---- PHPWS_Core::initModClass('featuredphoto', 'photo.php'); + define('FEATUREDPHOTO_BLOCK_MODE_INCREMENT', 0); + define('FEATUREDPHOTO_BLOCK_MODE_RANDOM', 1); + define('FEATUREDPHOTO_BLOCK_MODE_FIXED', 2); + class FeaturedPhoto_Block { *************** *** 81,97 **** } ! function getMode() { ! $mode_labels = array(dgettext('featuredphoto', 'Increment'), ! dgettext('featuredphoto', 'Random'), ! dgettext('featuredphoto', 'Fixed on an image')); ! if ($this->mode < 3) ! { ! return $mode_labels[$this->mode]; ! } ! else { return dgettext('featuredphoto', 'N/A'); } } --- 85,106 ---- } ! function getMode($format=true) { ! if ($format) { + $modes = $this->allModes(); + + foreach ($modes as $num => $name) + { + if ($num == $this->mode) + { + return $name; + } + } + return dgettext('featuredphoto', 'N/A'); } + + return $this->mode; } *************** *** 157,160 **** --- 166,178 ---- } + function allModes() + { + $modes[FEATUREDPHOTO_BLOCK_MODE_INCREMENT] = dgettext('featuredphoto', 'Increment'); + $modes[FEATUREDPHOTO_BLOCK_MODE_RANDOM] = dgettext('featuredphoto', 'Random'); + $modes[FEATUREDPHOTO_BLOCK_MODE_FIXED] = dgettext('featuredphoto', 'Fixed on the image'); + + return $modes; + } + function save($save_key=TRUE) { *************** *** 263,309 **** $db->addWhere('block_id', $this->getId()); ! if($this->mode == 1) ! { ! $db->addOrder('random'); ! $db->setLimit(1); ! $photos = $db->getObjects('FeaturedPhoto'); ! $photo = &$photos[0]; ! } ! else if($this->mode == 2) ! { ! $db->addWhere('id', $this->current_photo); ! $db->setLimit(1); ! $photos = $db->getObjects('FeaturedPhoto'); ! $photo = &$photos[0]; ! } ! else { ! $db->addOrder('id'); ! $photos = $db->getObjects('FeaturedPhoto'); ! $newFound = FALSE; ! if ($photos != NULL) { ! foreach ($photos as $pic) { ! if (($pic->getId() > $this->current_photo) && (!$newFound)) { $newFound = TRUE; ! $photo = $pic; ! $this->current_photo = $pic->getId(); } } ! if (!$newFound) { ! $newFound = TRUE; ! $photo = &$photos[0]; ! $this->current_photo = $photo->getId(); } - } ! if($newFound) ! { ! $this->save(FALSE); } } --- 281,339 ---- $db->addWhere('block_id', $this->getId()); ! switch ($this->getMode(false)) { ! case FEATUREDPHOTO_BLOCK_MODE_RANDOM: ! { ! $db->addOrder('random'); ! $db->setLimit(1); ! $photos = $db->getObjects('FeaturedPhoto'); ! $photo = &$photos[0]; ! break; ! } ! case FEATUREDPHOTO_BLOCK_MODE_FIXED: { ! if ($this->current_photo > 0) { ! $db->addWhere('id', $this->current_photo); ! $db->setLimit(1); ! $photos = $db->getObjects('FeaturedPhoto'); ! $photo = &$photos[0]; ! } ! break; ! } ! ! default: ! { ! $db->addOrder('id'); ! $photos = $db->getObjects('FeaturedPhoto'); ! ! $newFound = FALSE; ! if ($photos != NULL) ! { ! foreach ($photos as $pic) ! { ! if (($pic->getId() > $this->current_photo) && (!$newFound)) ! { ! $newFound = TRUE; ! $photo = $pic; ! $this->current_photo = $pic->getId(); ! } ! } ! ! if (!$newFound) { $newFound = TRUE; ! $photo = &$photos[0]; ! $this->current_photo = $photo->getId(); } } ! if ($newFound) { ! $this->save(FALSE); } ! break; } } |
|
From: Greg M. <bli...@us...> - 2008-01-23 04:38:31
|
Update of /cvsroot/phpwebsite-comm/modules/featuredphoto/locale/de_DE/LC_MESSAGES In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30728/locale/de_DE/LC_MESSAGES Added Files: featuredphoto.mo featuredphoto.po Log Message: Added German translation --- NEW FILE: featuredphoto.mo --- (This appears to be a binary file; contents omitted.) --- NEW FILE: featuredphoto.po --- # featuredphoto # # See docs/AUTHORS and docs/COPYRIGHT for relevant info. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # msgid "" msgstr "" "Project-Id-Version: PHPWS1_3_2,FeaturedPhoto1_1_0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-10-13 10:20-0500\n" "PO-Revision-Date: 2007-11-29 17:18+0100\n" "Last-Translator: Peter Heppner <he...@gm...>\n" "Language-Team: Peter Heppner <he...@gm...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: German\n" "X-Poedit-Country: GERMANY\n" msgid "Action" msgstr "Aktion" msgid "Active" msgstr "Aktiv" msgid "Add new photo" msgstr "Neues Foto hinzufügen" msgid "Add photo block here" msgstr "Fotoblock hier hinzufügen" msgid "Add/Edit Photo Blocks" msgstr "Fotoblöcke hinzufügen/bearbeiten" msgid "Add/Edit Photos" msgstr "Fotos hinzufügen/bearbeiten" msgid "Are you sure you want to permanently delete this photo block?" msgstr "Soll dieser Fotoblock dauerhaft gelöscht werden?" msgid "Are you sure you want to remove this photo block from this page?" msgstr "Soll dieser Fotoblock von der Seite entfernt werden?" msgid "Are you sure you want to remove this photo from this photo block?" msgstr "Soll dieses Foto von diesem Fotoblock entfernt werden?" msgid "Block Template" msgstr "Blockvorlage" msgid "Cancel" msgstr "Abbruch" msgid "Cannot locate any block templates. Cannot continue." msgstr "Vorlagen nicht gefunden. Es geht nicht weiter." msgid "Click photo to start Image Manager" msgstr "Foto klicken um den Manager zu starten" msgid "Delete" msgstr "Löschen" msgid "Delete Photo Blocks" msgstr "Fotoblöcke löschen" msgid "Edit" msgstr "Bearbeiten" msgid "Featured Photo" msgstr "Vorgestelltes Foto" msgid "Featured Photo module images." msgstr "Bilder der vorgestellten Fotos " msgid "Featured Photo tables removed." msgstr "Fototabelle entfernt." msgid "Fixed on an image" msgstr "Gebunden an ein Bild" msgid "Fixed on the image" msgstr "Gebunden an das Bild" msgid "Hide Photo Blocks" msgstr "Fotoblöcke verstecken" msgid "Hide Photos" msgstr "Fotos verstecken" msgid "Image dimensions must be greater than zero." msgstr "Die Anzahl der Dimensionen muss grösser 0 sein." msgid "Inactive" msgstr "Inaktiv" msgid "Increment" msgstr "Zuwachs" msgid "Maintain the featured photo(s) in the database." msgstr "Vorgestellte Fotos in der Datenbank bearbeiten." msgid "Manage Photo Blocks" msgstr "Fotoblöcke organisieren" msgid "Manage Photos" msgstr "Fotos organisieren" msgid "Mode" msgstr "Modus" msgid "N/A" msgstr "Nicht verfügbar" msgid "Name" msgstr "Name" msgid "New Photo Block" msgstr "Neuer Fotoblock" msgid "No active photo." msgstr "Keine aktiven Fotos." msgid "Photo activation changed" msgstr "Fotoaktivierung geändert" msgid "Photo activation could not be changed" msgstr "Fotoaktivierung konnte nicht geändert werden" msgid "Photo block activation changed" msgstr "Fotoblockaktivierung geändert" msgid "Photo block activation could not be changed" msgstr "Fotoblockaktivierung konnte nicht geändert werden" msgid "Photo block could not be saved" msgstr "Fotoblock konnte nicht gespeichert werden" msgid "Photo block deleted" msgstr "Fotoblock gelöscht." msgid "Photo block pinned" msgstr "Fotoblock angeheftet" msgid "Photo block saved" msgstr "Fotoblock gespeichert" msgid "Photo block unpinned" msgstr "Fotoblock losgeheftet" msgid "Photo could not be saved" msgstr "Foto konnte nicht in der Datenbank gespeichert werden." msgid "Photo removed from photo block" msgstr "Das Foto wurde aus dem Fotoblock gelöscht." msgid "Photo saved" msgstr "Das Foto wurde gespeichert." msgid "Photos" msgstr "Fotos" msgid "Pin" msgstr "Anheften" msgid "Pin Photo Blocks" msgstr "Fotoblöcke anheften" msgid "Random" msgstr "Zufall" msgid "Remove" msgstr "Entfernen" msgid "Remove Photos from Blocks" msgstr "Fotos vom Fotoblock entfernen" msgid "Resize images to fit inside" msgstr "Bilder an Innengrösse anpassen" msgid "Save New Photo" msgstr "Neues Foto speichern" msgid "Save New Photo Block" msgstr "Neuen Fotoblock speichern" msgid "Size" msgstr "Grösse" msgid "Title" msgstr "Titel" msgid "Unpin" msgstr "Losheften" msgid "Update Photo" msgstr "Foto aktualisieren" msgid "Update Photo Block" msgstr "Fotoblock aktualisieren" msgid "View" msgstr "Ansicht" msgid "View Photo" msgstr "Foto ansehen" msgid "You must select an image." msgstr "Ein Bild muss ausgewählt werden." msgid "Your photo block must have a title." msgstr "Der Fotoblock benötigt einen Titel." msgid "pixels" msgstr "Pixel" |
|
From: Greg M. <bli...@us...> - 2008-01-23 04:38:30
|
Update of /cvsroot/phpwebsite-comm/modules/featuredphoto/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30728/docs Modified Files: AUTHORS ChangeLog Log Message: Added German translation Index: AUTHORS =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/featuredphoto/docs/AUTHORS,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** AUTHORS 13 Jul 2004 16:08:33 -0000 1.1.1.1 --- AUTHORS 23 Jan 2008 04:38:33 -0000 1.2 *************** *** 5,7 **** Greg Meiste <bli...@NO...> ! - Lead Developer \ No newline at end of file --- 5,10 ---- Greg Meiste <bli...@NO...> ! - Lead Developer ! ! Peter Heppner <he...@NO...> ! - German translation \ No newline at end of file Index: ChangeLog =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/featuredphoto/docs/ChangeLog,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** ChangeLog 14 Oct 2007 18:19:32 -0000 1.24 --- ChangeLog 23 Jan 2008 04:38:33 -0000 1.25 *************** *** 5,8 **** --- 5,12 ---- ========================== PHPWEBSITE 1.X.X RELEASES ========================== + *cvs + + Added German translation (Thanks Peter Heppner) + *featuredphoto-1.1.0 (14 Oct 2007) |
|
From: Greg M. <bli...@us...> - 2008-01-23 04:30:18
|
Update of /cvsroot/phpwebsite-comm/modules/featuredphoto/locale/de_DE/LC_MESSAGES In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27883/LC_MESSAGES Log Message: Directory /cvsroot/phpwebsite-comm/modules/featuredphoto/locale/de_DE/LC_MESSAGES added to the repository |
|
From: Greg M. <bli...@us...> - 2008-01-23 04:29:56
|
Update of /cvsroot/phpwebsite-comm/modules/featuredphoto/locale/de_DE In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27486/de_DE Log Message: Directory /cvsroot/phpwebsite-comm/modules/featuredphoto/locale/de_DE added to the repository |
|
From: Greg M. <bli...@us...> - 2008-01-23 04:04:47
|
Update of /cvsroot/phpwebsite-comm/modules/featuredphoto/boost In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18355/boost Modified Files: dependency.xml Log Message: Using new addRadioAssoc form function. Index: dependency.xml =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/featuredphoto/boost/dependency.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** dependency.xml 7 Oct 2007 17:23:40 -0000 1.4 --- dependency.xml 23 Jan 2008 04:04:17 -0000 1.5 *************** *** 4,8 **** <title>core</title> <properName>phpWebSite Core</properName> ! <version>1.6.3</version> <url>http://phpwebsite.appstate.edu/downloads/modules/base/</url> </module> --- 4,8 ---- <title>core</title> <properName>phpWebSite Core</properName> ! <version>1.7.0</version> <url>http://phpwebsite.appstate.edu/downloads/modules/base/</url> </module> |
