Changeset 0fb8d7c9464f805d666366ee2f31f047ee138b3a
- Timestamp:
- 01/28/12 14:02:57 (4 months ago)
- Children:
- ee4c2b7fedeac65c7bf3af2de933963981702433
- Parents:
- 1a41ceaa48ef54a2a73176f8a6e3e1209dee2f52
- git-committer:
- Xemle <xemle@phtagr.org> / 2012-01-28T14:02:57Z+0100
- Location:
- View
- Files:
-
- 78 modified
-
Browser/folder.ctp (modified) (1 diff)
-
Browser/import.ctp (modified) (1 diff)
-
Browser/quickupload.ctp (modified) (3 diffs)
-
Browser/sync.ctp (modified) (1 diff)
-
Browser/upload.ctp (modified) (1 diff)
-
Browser/view.ctp (modified) (1 diff)
-
Comments/index.ctp (modified) (2 diffs)
-
Elements/Explorer/date.ctp (modified) (1 diff)
-
Elements/Explorer/description.ctp (modified) (1 diff)
-
Elements/Explorer/media.ctp (modified) (3 diffs)
-
Elements/Explorer/menu.ctp (modified) (2 diffs)
-
Elements/comment.ctp (modified) (3 diffs)
-
Elements/email/html/notify_new_media.ctp (modified) (3 diffs)
-
Elements/email/text/notify_new_media.ctp (modified) (3 diffs)
-
Elements/footer.ctp (modified) (1 diff)
-
Elements/header.ctp (modified) (1 diff)
-
Elements/menu.ctp (modified) (4 diffs)
-
Elements/single_acl_form.ctp (modified) (1 diff)
-
Elements/single_meta_form.ctp (modified) (2 diffs)
-
Elements/topnav.ctp (modified) (1 diff)
-
Explorer/editacl.ctp (modified) (1 diff)
-
Explorer/editmeta.ctp (modified) (1 diff)
-
Explorer/index.ctp (modified) (7 diffs)
-
Explorer/media.ctp (modified) (3 diffs)
-
Explorer/quicksearch.ctp (modified) (5 diffs)
-
Explorer/search.ctp (modified) (1 diff)
-
Explorer/updatemeta.ctp (modified) (1 diff)
-
Groups/create.ctp (modified) (1 diff)
-
Groups/dashboard_create.ctp (modified) (6 diffs)
-
Groups/dashboard_index.ctp (modified) (6 diffs)
-
Groups/dashboard_manage.ctp (modified) (12 diffs)
-
Groups/dashboard_search.ctp (modified) (18 diffs)
-
Groups/edit.ctp (modified) (1 diff)
-
Groups/index.ctp (modified) (5 diffs)
-
Groups/listmembers.ctp (modified) (3 diffs)
-
Groups/view.ctp (modified) (7 diffs)
-
Guests/create.ctp (modified) (1 diff)
-
Guests/edit.ctp (modified) (2 diffs)
-
Guests/index.ctp (modified) (4 diffs)
-
Guests/links.ctp (modified) (3 diffs)
-
Helper/BreadcrumbHelper.php (modified) (1 diff)
-
Helper/ExplorerMenuHelper.php (modified) (7 diffs)
-
Helper/ImageDataHelper.php (modified) (11 diffs)
-
Helper/MenuHelper.php (modified) (1 diff)
-
Helper/NavigatorHelper.php (modified) (5 diffs)
-
Images/notfound.ctp (modified) (1 diff)
-
Images/view.ctp (modified) (6 diffs)
-
Layouts/backend.ctp (modified) (1 diff)
-
Layouts/dashboard.ctp (modified) (4 diffs)
-
Options/acl.ctp (modified) (1 diff)
-
Options/profile.ctp (modified) (1 diff)
-
Options/rss.ctp (modified) (2 diffs)
-
Setup/admin_upgrade.ctp (modified) (1 diff)
-
Setup/admin_uptodate.ctp (modified) (1 diff)
-
Setup/config.ctp (modified) (1 diff)
-
Setup/configro.ctp (modified) (1 diff)
-
Setup/path.ctp (modified) (1 diff)
-
Setup/saltro.ctp (modified) (1 diff)
-
Setup/system.ctp (modified) (2 diffs)
-
Setup/user.ctp (modified) (1 diff)
-
System/delete_unused_meta_data.ctp (modified) (1 diff)
-
System/external.ctp (modified) (1 diff)
-
System/index.ctp (modified) (1 diff)
-
System/map.ctp (modified) (1 diff)
-
System/upgrade.ctp (modified) (1 diff)
-
Users/admin_add.ctp (modified) (1 diff)
-
Users/admin_edit.ctp (modified) (2 diffs)
-
Users/admin_index.ctp (modified) (4 diffs)
-
Users/admin_password.ctp (modified) (1 diff)
-
Users/admin_path.ctp (modified) (3 diffs)
-
Users/admin_register.ctp (modified) (1 diff)
-
Users/confirm.ctp (modified) (1 diff)
-
Users/index.ctp (modified) (3 diffs)
-
Users/login.ctp (modified) (2 diffs)
-
Users/password.ctp (modified) (1 diff)
-
Users/register.ctp (modified) (1 diff)
-
Users/view.ctp (modified) (7 diffs)
-
home/index.ctp (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
View/Browser/folder.ctp
re449ecc0 r0fb8d7c 1 <h1><?php __("Create Folder"); ?></h1>1 <h1><?php echo __("Create Folder"); ?></h1> 2 2 3 <?php echo $ session->flash(); ?>3 <?php echo $this->Session->flash(); ?> 4 4 5 <p><?php printf(__("Location %s", true), $fileList->location($path)); ?></p>5 <p><?php echo __("Location %s", $fileList->location($path)); ?></p> 6 6 7 <?php echo $ form->create(false, array('action' => 'folder/'.$path)); ?>7 <?php echo $this->Form->create(false, array('action' => 'folder/'.$path)); ?> 8 8 <fieldset> 9 <?php echo $ form->input('Folder.name', array ('label' => __("Folder Name", true))); ?>9 <?php echo $this->Form->input('Folder.name', array ('label' => __("Folder Name"))); ?> 10 10 </fieldset> 11 11 <?php 12 echo $ html->tag('ul',13 $ html->tag('li', $form->submit(__('Create', true)), array('escape' => false)),12 echo $this->Html->tag('ul', 13 $this->Html->tag('li', $this->Form->submit(__('Create')), array('escape' => false)), 14 14 array('class' => 'buttons', 'escape' => false)); 15 echo $ form->end();15 echo $this->Form->end(); 16 16 ?> -
View/Browser/import.ctp
re449ecc0 r0fb8d7c 1 <h1><?php __("Browser"); ?></h1>1 <h1><?php echo __("Browser"); ?></h1> 2 2 3 <?php echo $ session->flash(); ?>3 <?php echo $this->Session->flash(); ?> 4 4 5 <p><?php printf(__("View folder %s", true), $html->link($path, "index/$path")); ?></p>5 <p><?php echo __("View folder %s", $this->Html->link($path, "index/$path")); ?></p> -
View/Browser/quickupload.ctp
re449ecc0 r0fb8d7c 1 <h1><?php __("Media Upload"); ?></h1>1 <h1><?php echo __("Media Upload"); ?></h1> 2 2 3 <?php echo $ session->flash(); ?>3 <?php echo $this->Session->flash(); ?> 4 4 5 5 <?php if (count($imports)): ?> 6 <h2><?php __("Your uploaded media"); ?></h2>6 <h2><?php echo __("Your uploaded media"); ?></h2> 7 7 8 8 <p><?php $count = 1; foreach ($imports as $media): ?> 9 9 <?php 10 echo $ imageData->mediaLink($media, 'mini') . ' ';10 echo $this->ImageData->mediaLink($media, 'mini') . ' '; 11 11 if ($count >= 6) { 12 12 break; … … 15 15 ?> 16 16 <?php endforeach; ?></p> 17 <p><?php echo sprintf(__("See all uploaded media of today %s", true), $html->link(__("here", true), "/explorer/user/" . $session->read('User.username') . "/folder/" . date('Y/Y-m-d', time()))); ?>17 <p><?php echo __("See all uploaded media of today %s", $this->Html->link(__("here"), "/explorer/user/" . $this->Session->read('User.username') . "/folder/" . date('Y/Y-m-d', time()))); ?> 18 18 <?php endif; // imports ?> 19 19 20 20 <?php if ($free > 0): ?> 21 21 22 <?php echo $ form->create(false, array('action' => 'quickupload', 'type' => 'file')); ?>23 <p><?php __("Upload your photos, videos, GPS logs or ZIP archives here."); ?></p>22 <?php echo $this->Form->create(false, array('action' => 'quickupload', 'type' => 'file')); ?> 23 <p><?php echo __("Upload your photos, videos, GPS logs or ZIP archives here."); ?></p> 24 24 25 <fieldset><legend><?php __("Photos, Videos - ZIP Archives"); ?></legend>26 <?php echo $ form->input('File.upload][', array('type' => 'file', 'label' => __('File or archive', true), 'id' => 'FileUpload1')); ?>27 <?php echo $ form->input('File.upload][', array('type' => 'file', 'label' => __('File or archive', true), 'id' => 'FileUpload2')); ?>28 <?php echo $ form->input('File.upload][', array('type' => 'file', 'label' => __('File or archive', true), 'id' => 'FileUpload3')); ?>29 <?php echo $ form->input('File.upload][', array('type' => 'file', 'label' => __('File or archive', true), 'id' => 'FileUpload4')); ?>30 <?php echo $ form->input('File.upload][', array('type' => 'file', 'label' => __('File or archive', true), 'id' => 'FileUpload5')); ?>25 <fieldset><legend><?php echo __("Photos, Videos - ZIP Archives"); ?></legend> 26 <?php echo $this->Form->input('File.upload][', array('type' => 'file', 'label' => __('File or archive'), 'id' => 'FileUpload1')); ?> 27 <?php echo $this->Form->input('File.upload][', array('type' => 'file', 'label' => __('File or archive'), 'id' => 'FileUpload2')); ?> 28 <?php echo $this->Form->input('File.upload][', array('type' => 'file', 'label' => __('File or archive'), 'id' => 'FileUpload3')); ?> 29 <?php echo $this->Form->input('File.upload][', array('type' => 'file', 'label' => __('File or archive'), 'id' => 'FileUpload4')); ?> 30 <?php echo $this->Form->input('File.upload][', array('type' => 'file', 'label' => __('File or archive'), 'id' => 'FileUpload5')); ?> 31 31 </fieldset> 32 32 33 <?php echo $ form->end(__("Upload", true)); ?>33 <?php echo $this->Form->end(__("Upload")); ?> 34 34 <?php 35 35 $script = <<<'JS' … … 42 42 echo $this->Html->scriptBlock($script, array('inline' => false)); 43 43 ?> 44 <p><?php printf(__("You can upload maximal %s and %s at once. ZIP archives are extracted automatically.", true), $number->toReadableSize($free), $number->toReadableSize($max)); ?></p>44 <p><?php echo __("You can upload maximal %s and %s at once. ZIP archives are extracted automatically.", $this->Number->toReadableSize($free), $this->Number->toReadableSize($max)); ?></p> 45 45 <?php else: ?> 46 <p class="info"><?php __("You cannot upload files now. Your upload quota is exceeded."); ?></p>46 <p class="info"><?php echo __("You cannot upload files now. Your upload quota is exceeded."); ?></p> 47 47 <?php endif; ?> -
View/Browser/sync.ctp
r3605ef4 r0fb8d7c 8 8 9 9 <?php if ($this->data['action'] != 'run' && $this->data['unsynced'] > 0): ?> 10 <p><?php echo __("You have %d unsynchronized media. Click %s to start the synchronization (this might take some time)", $this->data['unsynced'], $this->Html->link(__("sync" , true), 'sync/run')); ?></p>10 <p><?php echo __("You have %d unsynchronized media. Click %s to start the synchronization (this might take some time)", $this->data['unsynced'], $this->Html->link(__("sync"), 'sync/run')); ?></p> 11 11 <?php endif; ?> 12 12 -
View/Browser/upload.ctp
re449ecc0 r0fb8d7c 1 <h1><?php __("File Upload"); ?></h1>1 <h1><?php echo __("File Upload"); ?></h1> 2 2 3 <?php echo $ session->flash(); ?>3 <?php echo $this->Session->flash(); ?> 4 4 5 5 <?php if ($free > 0): ?> 6 <p><?php printf(__("You upload files to folder %s", true), $fileList->location($path)); ?></p>7 <p><?php printf(__("You can upload maximal %s and %s at once", true), $number->toReadableSize($free), $number->toReadableSize($max)); ?></p>6 <p><?php echo __("You upload files to folder %s", $fileList->location($path)); ?></p> 7 <p><?php echo __("You can upload maximal %s and %s at once", $this->Number->toReadableSize($free), $this->Number->toReadableSize($max)); ?></p> 8 8 9 <?php echo $ form->create(false, array('action' => 'upload/'.$path, 'type' => 'file')); ?>10 <fieldset><legend><?php __("Upload files"); ?></legend>11 <?php echo $ form->input('File.upload][', array('type' => 'file', 'label' => __('File or archive', true), 'id' => 'FileUpload1')); ?>12 <?php echo $ form->input('File.upload][', array('type' => 'file', 'label' => __('File or archive', true), 'id' => 'FileUpload2')); ?>13 <?php echo $ form->input('File.upload][', array('type' => 'file', 'label' => __('File or archive', true), 'id' => 'FileUpload3')); ?>14 <?php echo $ form->input('File.upload][', array('type' => 'file', 'label' => __('File or archive', true), 'id' => 'FileUpload4')); ?>15 <?php echo $ form->input('File.upload][', array('type' => 'file', 'label' => __('File or archive', true), 'id' => 'FileUpload5')); ?>16 <?php echo $ form->input('File.extract', array('label' => __('Extract ZIP archive', true), 'checked' => true, 'type' => 'checkbox')); ?>9 <?php echo $this->Form->create(false, array('action' => 'upload/'.$path, 'type' => 'file')); ?> 10 <fieldset><legend><?php echo __("Upload files"); ?></legend> 11 <?php echo $this->Form->input('File.upload][', array('type' => 'file', 'label' => __('File or archive'), 'id' => 'FileUpload1')); ?> 12 <?php echo $this->Form->input('File.upload][', array('type' => 'file', 'label' => __('File or archive'), 'id' => 'FileUpload2')); ?> 13 <?php echo $this->Form->input('File.upload][', array('type' => 'file', 'label' => __('File or archive'), 'id' => 'FileUpload3')); ?> 14 <?php echo $this->Form->input('File.upload][', array('type' => 'file', 'label' => __('File or archive'), 'id' => 'FileUpload4')); ?> 15 <?php echo $this->Form->input('File.upload][', array('type' => 'file', 'label' => __('File or archive'), 'id' => 'FileUpload5')); ?> 16 <?php echo $this->Form->input('File.extract', array('label' => __('Extract ZIP archive'), 'checked' => true, 'type' => 'checkbox')); ?> 17 17 </fieldset> 18 18 19 19 <?php 20 echo $ html->tag('ul',21 $ html->tag('li', $form->submit(__('Upload', true)), array('escape' => false)),20 echo $this->Html->tag('ul', 21 $this->Html->tag('li', $this->Form->submit(__('Upload')), array('escape' => false)), 22 22 array('class' => 'buttons', 'escape' => false)); 23 echo $ form->end();23 echo $this->Form->end(); 24 24 ?> 25 25 26 26 <?php else: ?> 27 <p class="info"><?php __("You cannot upload files now. Your upload quota is exceeded."); ?></p>27 <p class="info"><?php echo __("You cannot upload files now. Your upload quota is exceeded."); ?></p> 28 28 <?php endif; ?> -
View/Browser/view.ctp
re449ecc0 r0fb8d7c 1 <h1><?php __("File Overview"); ?></h1>1 <h1><?php echo __("File Overview"); ?></h1> 2 2 3 3 <table class="default"> 4 4 <thead> 5 <?php echo $ html->tableHeaders(array(__('Description', true), __('Value', true))); ?>5 <?php echo $this->Html->tableHeaders(array(__('Description'), __('Value'))); ?> 6 6 </thead> 7 7 <tbody> 8 8 <?php 9 9 $cells = array(); 10 $cells[] = array(__('Files total' , true), $files['count']);11 $cells[] = array(__('Count of images/videos' , true), $files['active']);10 $cells[] = array(__('Files total'), $files['count']); 11 $cells[] = array(__('Count of images/videos'), $files['active']); 12 12 if ($files['external']) { 13 $cells[] = array(__('External images/videos' , true), $files['external']);14 $cells[] = array(__('Bytes total (with external sources)' , true), sprintf("%s (%s)", $number->toReadableSize($files['bytes']), $number->toReadableSize($files['bytesAll'])));13 $cells[] = array(__('External images/videos'), $files['external']); 14 $cells[] = array(__('Bytes total (with external sources)'), sprintf("%s (%s)", $this->Number->toReadableSize($files['bytes']), $this->Number->toReadableSize($files['bytesAll']))); 15 15 } else { 16 $cells[] = array(__('Bytes total' , true), $number->toReadableSize($files['bytes']));16 $cells[] = array(__('Bytes total'), $this->Number->toReadableSize($files['bytes'])); 17 17 } 18 18 if ($files['quota']) { 19 $cells[] = array(__('Quota (free)' , true), sprintf("%s (%s)", $number->toReadableSize($files['quota']), $number->toReadableSize($files['free'])));19 $cells[] = array(__('Quota (free)'), sprintf("%s (%s)", $this->Number->toReadableSize($files['quota']), $this->Number->toReadableSize($files['free']))); 20 20 } 21 $cells[] = array(__('Videos' , true), $files['video']);22 $cells[] = array(__('Public files' , true), $files['public']);23 $cells[] = array(__('Visible for users' , true), $files['user']);24 $cells[] = array(__('Visible for group members' , true), $files['group']);25 $cells[] = array(__('Private files' , true), $files['private']);26 $cells[] = array(__('Unsynced files' , true), $files['dirty']);27 echo $ html->tableCells($cells, array('class' => 'odd'), array('class' => 'even'));21 $cells[] = array(__('Videos'), $files['video']); 22 $cells[] = array(__('Public files'), $files['public']); 23 $cells[] = array(__('Visible for users'), $files['user']); 24 $cells[] = array(__('Visible for group members'), $files['group']); 25 $cells[] = array(__('Private files'), $files['private']); 26 $cells[] = array(__('Unsynced files'), $files['dirty']); 27 echo $this->Html->tableCells($cells, array('class' => 'odd'), array('class' => 'even')); 28 28 ?> 29 29 </tbody> -
View/Comments/index.ctp
r1a41cea r0fb8d7c 1 1 <h1>Comments</h1> 2 <?php echo $ session->flash(); ?>2 <?php echo $this->Session->flash(); ?> 3 3 4 4 <?php if ($comments): ?> … … 20 20 $img = '<img src="'.Router::url('/media/mini/'.$comment['Media']['id'].'/'.$comment['Media']['name']).'" />'; 21 21 $link = '/images/view/'.$comment['Media']['id']; 22 echo '<div class="image">'.$ html->link($img, $link, array('escape' => false)).'</div>';?>22 echo '<div class="image">'.$this->Html->link($img, $link, array('escape' => false)).'</div>';?> 23 23 <?php echo preg_replace('/\n/', '<br />', $text->truncate($comment['Comment']['text'], 220, array('ending' => '...', 'exact' => false, 'html' => false))); ?> 24 24 </div> -
View/Elements/Explorer/date.ctp
r1a41cea r0fb8d7c 1 1 <p class="single-media"> 2 <?php __("Date"); ?>2 <?php echo __("Date"); ?> 3 3 <span class="tooltip-anchor"> 4 <?php echo $ html->link($media['Media']['date'], $imageData->getDateLink($media, '3h')); ?>4 <?php echo $this->Html->link($media['Media']['date'], $this->ImageData->getDateLink($media, '3h')); ?> 5 5 <span class="tooltip-actions"><span class="sub"> 6 6 <?php 7 echo $ html->link($imageData->getIcon('date_previous', __("View media of previous dates", true)),8 $ imageData->getDateLink($media, 'to'), array('escape' => false));7 echo $this->Html->link($this->ImageData->getIcon('date_previous', __("View media of previous dates")), 8 $this->ImageData->getDateLink($media, 'to'), array('escape' => false)); 9 9 ?> 10 <?php if ($ search->getFrom()) : ?>10 <?php if ($this->Search->getFrom()) : ?> 11 11 <?php 12 if (!$ search->getTo()) {13 echo $ html->link($imageData->getIcon('date_interval', __("View media of interval", true)),14 $ search->getUri(false, array('to' => $media['Media']['date'])), array('escape' => false));12 if (!$this->Search->getTo()) { 13 echo $this->Html->link($this->ImageData->getIcon('date_interval', __("View media of interval")), 14 $this->Search->getUri(false, array('to' => $media['Media']['date'])), array('escape' => false)); 15 15 } else { 16 echo $ html->link($imageData->getIcon('date_interval_add_prev', __("Set new end date of interval", true)),17 $ search->getUri(false, array('to' => $media['Media']['date'])), array('escape' => false));16 echo $this->Html->link($this->ImageData->getIcon('date_interval_add_prev', __("Set new end date of interval")), 17 $this->Search->getUri(false, array('to' => $media['Media']['date'])), array('escape' => false)); 18 18 } 19 19 ?> 20 20 <?php endif; ?> 21 21 <?php 22 echo $ html->link($imageData->getIcon('calendar_view_day', __("View media of this day", true)),23 $ imageData->getDateLink($media, '12h'), array('escape' => false));24 echo $ html->link($imageData->getIcon('calendar_view_week', __("View media of this week", true)),25 $ imageData->getDateLink($media, '3.5d'), array('escape' => false));26 echo $ html->link($imageData->getIcon('calendar_view_month', __("View media of this month", true)),27 $ imageData->getDateLink($media, '15d'), array('escape' => false));22 echo $this->Html->link($this->ImageData->getIcon('calendar_view_day', __("View media of this day")), 23 $this->ImageData->getDateLink($media, '12h'), array('escape' => false)); 24 echo $this->Html->link($this->ImageData->getIcon('calendar_view_week', __("View media of this week")), 25 $this->ImageData->getDateLink($media, '3.5d'), array('escape' => false)); 26 echo $this->Html->link($this->ImageData->getIcon('calendar_view_month', __("View media of this month")), 27 $this->ImageData->getDateLink($media, '15d'), array('escape' => false)); 28 28 ?> 29 <?php if ($ search->getTo()) : ?>29 <?php if ($this->Search->getTo()) : ?> 30 30 <?php 31 if (!$ search->getFrom()) {32 echo $ html->link($imageData->getIcon('date_interval', __('View media of interval', true)),33 $ search->getUri(false, array('from' => $media['Media']['date'])), array('escape' => false));31 if (!$this->Search->getFrom()) { 32 echo $this->Html->link($this->ImageData->getIcon('date_interval', __('View media of interval')), 33 $this->Search->getUri(false, array('from' => $media['Media']['date'])), array('escape' => false)); 34 34 } else { 35 echo $ html->link($imageData->getIcon('date_interval_add_next', __('Set new start date for interval', true)),36 $ search->getUri(false, array('from' => $media['Media']['date'])), array('escape' => false));35 echo $this->Html->link($this->ImageData->getIcon('date_interval_add_next', __('Set new start date for interval')), 36 $this->Search->getUri(false, array('from' => $media['Media']['date'])), array('escape' => false)); 37 37 } 38 38 ?> 39 39 <?php endif; ?> 40 40 <?php 41 echo $ html->link($imageData->getIcon('date_next', __('View media of next dates', true)),42 $ imageData->getDateLink($media, 'from'), array('escape' => false));41 echo $this->Html->link($this->ImageData->getIcon('date_next', __('View media of next dates')), 42 $this->ImageData->getDateLink($media, 'from'), array('escape' => false)); 43 43 ?> 44 44 </span></span> -
View/Elements/Explorer/description.ctp
r1a41cea r0fb8d7c 1 1 <?php 2 $ search->initialize();2 $this->Search->initialize(); 3 3 echo $this->element('explorer/date', array('media' => $media)); 4 4 if (count($media['Tag'])) { 5 5 echo $this->Html->tag('p', 6 __("Tags" , true).' '.implode(', ', $imageData->linkList('/explorer/tag', Set::extract('/Tag/name', $media))),6 __("Tags").' '.implode(', ', $this->ImageData->linkList('/explorer/tag', Set::extract('/Tag/name', $media))), 7 7 array('class' => 'tag list', 'escape' => false)); 8 8 } 9 9 if (count($media['Category'])) { 10 10 echo $this->Html->tag('p', 11 __("Categories" , true).' '.implode(', ', $imageData->linkList('/explorer/category', Set::extract('/Category/name', $media))),11 __("Categories").' '.implode(', ', $this->ImageData->linkList('/explorer/category', Set::extract('/Category/name', $media))), 12 12 array('class' => 'category list', 'escape' => false)); 13 13 } 14 14 if (count($media['Location'])) { 15 15 echo $this->Html->tag('p', 16 __("Locations" , true).' '.implode(', ', $imageData->linkList('/explorer/location', Set::extract('/Location/name', $media))),16 __("Locations").' '.implode(', ', $this->ImageData->linkList('/explorer/location', Set::extract('/Location/name', $media))), 17 17 array('class' => 'location list', 'escape' => false)); 18 18 } 19 if ($ search->getUser() == $currentUser['User']['username'] && !empty($media['Group']['name'])) {19 if ($this->Search->getUser() == $currentUser['User']['username'] && !empty($media['Group']['name'])) { 20 20 echo $this->Html->tag('p', 21 __("Group" , true).' '.implode(', ', $imageData->linkList('/explorer/group', Set::extract('/Group/name', $media))),21 __("Group").' '.implode(', ', $this->ImageData->linkList('/explorer/group', Set::extract('/Group/name', $media))), 22 22 array('class' => 'group list', 'escape' => false)); 23 23 } 24 if ($ search->getUser() == $currentUser['User']['username'] && $currentUser['User']['role'] >= ROLE_USER) {24 if ($this->Search->getUser() == $currentUser['User']['username'] && $currentUser['User']['role'] >= ROLE_USER) { 25 25 echo $this->Html->tag('p', 26 __("Access" , true).' '27 .$ imageData->_acl2icon($media['Media']['gacl'], __('Group members', true)) . ', '28 .$ imageData->_acl2icon($media['Media']['uacl'], __('Users', true)) . ', '29 .$ imageData->_acl2icon($media['Media']['oacl'], __('All', true)),26 __("Access").' ' 27 .$this->ImageData->_acl2icon($media['Media']['gacl'], __('Group members')) . ', ' 28 .$this->ImageData->_acl2icon($media['Media']['uacl'], __('Users')) . ', ' 29 .$this->ImageData->_acl2icon($media['Media']['oacl'], __('All')), 30 30 array('class' => 'access list', 'escape' => false)); 31 31 } -
View/Elements/Explorer/media.ctp
r1a41cea r0fb8d7c 1 1 <h2><?php 2 if (!$ search->getUser() || $search->getUser() != $session->read('User.username')) {3 printf(__("%s by %s", true), h($media['Media']['name']), $html->link($media['User']['username'], "/explorer/user/".$media['User']['username']));2 if (!$this->Search->getUser() || $this->Search->getUser() != $this->Session->read('User.username')) { 3 __("%s by %s", h($media['Media']['name']), $this->Html->link($media['User']['username'], "/explorer/user/".$media['User']['username'])); 4 4 } else { 5 5 echo h($media['Media']['name']); … … 7 7 ?></h2> 8 8 <?php 9 $size = $ imageData->getimagesize($media, OUTPUT_SIZE_THUMB);10 $imageCrumbs = $this->Breadcrumb->replace($crumbs, 'page', $ search->getPage());9 $size = $this->ImageData->getimagesize($media, OUTPUT_SIZE_THUMB); 10 $imageCrumbs = $this->Breadcrumb->replace($crumbs, 'page', $this->Search->getPage()); 11 11 $imageCrumbs = $this->Breadcrumb->replace($imageCrumbs, 'pos', ($pos + $index)); 12 if ($ search->getShow(12) != 12) {13 $imageCrumbs = $this->Breadcrumb->replace($imageCrumbs, 'show', $ search->getShow());12 if ($this->Search->getShow(12) != 12) { 13 $imageCrumbs = $this->Breadcrumb->replace($imageCrumbs, 'show', $this->Search->getShow()); 14 14 } 15 15 16 16 // image centrering from http://www.brunildo.org/test/img_center.html 17 17 echo '<div class="p-explorer-media-image"><span></span>'; 18 echo $ html->tag('a',19 $ html->tag('img', false, array(18 echo $this->Html->tag('a', 19 $this->Html->tag('img', false, array( 20 20 'src' => Router::url("/media/thumb/".$media['Media']['id']), 21 21 'width' => $size[0], 'height' => $size[1], 22 22 'alt' => $media['Media']['name'])), 23 array('href' => Router::url("/images/view/".$media['Media']['id'].'/'.$ breadcrumb->params($imageCrumbs))));23 array('href' => Router::url("/images/view/".$media['Media']['id'].'/'.$this->Breadcrumb->params($imageCrumbs)))); 24 24 echo "</div>"; 25 25 ?> … … 30 30 <?php 31 31 if ($media['Media']['canWriteTag']) { 32 $addIcon = $ imageData->getIcon('add', __('Select media', true));33 echo $ html->tag('li',34 $ html->link($addIcon, 'javascript:void', array('escape' => false, 'class' => 'add')),32 $addIcon = $this->ImageData->getIcon('add', __('Select media')); 33 echo $this->Html->tag('li', 34 $this->Html->link($addIcon, 'javascript:void', array('escape' => false, 'class' => 'add')), 35 35 array('escape' => false)); 36 $delIcon = $ imageData->getIcon('delete', __('Deselect media', true));37 echo $ html->tag('li',38 $ html->link($delIcon, 'javascript:void', array('escape' => false, 'class' => 'del')),36 $delIcon = $this->ImageData->getIcon('delete', __('Deselect media')); 37 echo $this->Html->tag('li', 38 $this->Html->link($delIcon, 'javascript:void', array('escape' => false, 'class' => 'del')), 39 39 array('escape' => false)); 40 $editIcon = $ imageData->getIcon('tag', __('Edit meta data', true));41 echo $ html->tag('li',42 $ html->link($editIcon, 'javascript:void', array('escape' => false, 'class' => 'edit')),40 $editIcon = $this->ImageData->getIcon('tag', __('Edit meta data')); 41 echo $this->Html->tag('li', 42 $this->Html->link($editIcon, 'javascript:void', array('escape' => false, 'class' => 'edit')), 43 43 array('escape' => false)); 44 44 } 45 if ($ search->getUser() == $currentUser['User']['username'] && $media['Media']['canWriteAcl']) {46 $keyIcon = $this->Html->image('icons/key.png', array('title' => __('Edit access rights' , true), 'alt' => 'Edit ACL'));47 echo $ html->tag('li',48 $ html->link($keyIcon, 'javascript:void', array('escape' => false, 'class' => 'acl')),45 if ($this->Search->getUser() == $currentUser['User']['username'] && $media['Media']['canWriteAcl']) { 46 $keyIcon = $this->Html->image('icons/key.png', array('title' => __('Edit access rights'), 'alt' => 'Edit ACL')); 47 echo $this->Html->tag('li', 48 $this->Html->link($keyIcon, 'javascript:void', array('escape' => false, 'class' => 'acl')), 49 49 array('escape' => false)); 50 50 } 51 51 if ($media['Media']['canReadOriginal']) { 52 52 foreach ($media['File'] as $file) { 53 $diskIcon = $this->Html->image('icons/disk.png', array('title' => sprintf(__('Download file %s', true), $file['file']), 'alt' => 'download'));54 echo $ html->tag('li',55 $ html->link($diskIcon, Router::url('/media/file/' . $file['id'] . '/' . $file['file'], true), array('escape' => false, 'class' => 'download')),53 $diskIcon = $this->Html->image('icons/disk.png', array('title' => __('Download file %s', $file['file']), 'alt' => 'download')); 54 echo $this->Html->tag('li', 55 $this->Html->link($diskIcon, Router::url('/media/file/' . $file['id'] . '/' . $file['file'], true), array('escape' => false, 'class' => 'download')), 56 56 array('escape' => false)); 57 57 } -
View/Elements/Explorer/menu.ctp
r1a41cea r0fb8d7c 10 10 <div id="p-explorer-menu"> 11 11 <ul> 12 <li id="p-explorer-button-all-meta"><a><?php __("View Filter"); ?></a></li>12 <li id="p-explorer-button-all-meta"><a><?php echo __("View Filter"); ?></a></li> 13 13 <?php if ($canWriteTag): ?> 14 <li id="p-explorer-button-meta"><a><?php __("Edit Metadata"); ?></a></li>14 <li id="p-explorer-button-meta"><a><?php echo __("Edit Metadata"); ?></a></li> 15 15 <?php if ($canWriteAcl): ?> 16 <li id="p-explorer-button-access"><a><?php __("Edit Access Rights"); ?></a></li>16 <li id="p-explorer-button-access"><a><?php echo __("Edit Access Rights"); ?></a></li> 17 17 <?php endif; // canWriteAcl ?> 18 18 <?php endif; // canWriteTag ?> 19 <li id="p-explorer-button-slideshow"><a><?php __("Slideshow"); ?></a></li>19 <li id="p-explorer-button-slideshow"><a><?php echo __("Slideshow"); ?></a></li> 20 20 </ul> 21 21 <div class="pages"> 22 22 <ul> 23 <?php if ($ navigator->hasPrev()): ?>24 <li><?php echo $ navigator->prev(); ?></li>23 <?php if ($this->Navigator->hasPrev()): ?> 24 <li><?php echo $this->Navigator->prev(); ?></li> 25 25 <?php endif; ?> 26 <li><?php printf(__("Page %d of %d", true), $navigator->getCurrentPage(), $navigator->getPageCount()); ?></li>27 <?php if ($ navigator->hasNext()): ?>28 <li><?php echo $ navigator->next(); ?></li>26 <li><?php echo __("Page %d of %d", $this->Navigator->getCurrentPage(), $this->Navigator->getPageCount()); ?></li> 27 <?php if ($this->Navigator->hasNext()): ?> 28 <li><?php echo $this->Navigator->next(); ?></li> 29 29 <?php endif; ?> 30 30 </ul> … … 33 33 <div id="p-explorer-all-meta"> 34 34 <?php 35 $user = $ search->getUser();36 $tagUrls = $ imageData->getAllExtendSearchUrls($crumbs, $user, 'tag', array_unique(Set::extract('/Tag/name', $this->data)));35 $user = $this->Search->getUser(); 36 $tagUrls = $this->ImageData->getAllExtendSearchUrls($crumbs, $user, 'tag', array_unique(Set::extract('/Tag/name', $this->data))); 37 37 ksort($tagUrls); 38 $categoryUrls = $ imageData->getAllExtendSearchUrls($crumbs, $user, 'category', array_unique(Set::extract('/Category/name', $this->data)));38 $categoryUrls = $this->ImageData->getAllExtendSearchUrls($crumbs, $user, 'category', array_unique(Set::extract('/Category/name', $this->data))); 39 39 ksort($categoryUrls); 40 $locationUrls = $ imageData->getAllExtendSearchUrls($crumbs, $user, 'location', array_unique(Set::extract('/Location/name', $this->data)));40 $locationUrls = $this->ImageData->getAllExtendSearchUrls($crumbs, $user, 'location', array_unique(Set::extract('/Location/name', $this->data))); 41 41 ksort($locationUrls); 42 42 43 43 if (count($tagUrls)) { 44 echo "<p>" . __("Tags" , true) . " \n";44 echo "<p>" . __("Tags") . " \n"; 45 45 foreach ($tagUrls as $name => $urls) { 46 echo $ imageData->getExtendSearchLinks($urls, $name) . "\n";46 echo $this->ImageData->getExtendSearchLinks($urls, $name) . "\n"; 47 47 } 48 48 echo "</p>\n"; 49 49 } 50 50 if (count($categoryUrls)) { 51 echo "<p>" . __("Categories" , true) . " \n";51 echo "<p>" . __("Categories") . " \n"; 52 52 foreach ($categoryUrls as $name => $urls) { 53 echo $ imageData->getExtendSearchLinks($urls, $name) . "\n";53 echo $this->ImageData->getExtendSearchLinks($urls, $name) . "\n"; 54 54 } 55 55 echo "</p>\n"; 56 56 } 57 57 if (count($locationUrls)) { 58 echo "<p>" . __("Locations" , true) . " \n";58 echo "<p>" . __("Locations") . " \n"; 59 59 foreach ($locationUrls as $name => $urls) { 60 echo $ imageData->getExtendSearchLinks($urls, $name) . "\n";60 echo $this->ImageData->getExtendSearchLinks($urls, $name) . "\n"; 61 61 } 62 62 echo "</p>\n"; 63 63 } 64 64 ?> 65 <p><?php echo __('Users' , true) . " "; ?>65 <p><?php echo __('Users') . " "; ?> 66 66 <?php 67 $userUrls = $ imageData->getAllExtendSearchUrls($crumbs, false, 'user', array_unique(Set::extract('/User/username', $this->data)));67 $userUrls = $this->ImageData->getAllExtendSearchUrls($crumbs, false, 'user', array_unique(Set::extract('/User/username', $this->data))); 68 68 foreach ($userUrls as $name => $urls) { 69 echo $ imageData->getExtendSearchLinks($urls, $name, ($name == $user)) . ' ';69 echo $this->ImageData->getExtendSearchLinks($urls, $name, ($name == $user)) . ' '; 70 70 } 71 71 ?></p> 72 <p><?php echo __('Pagesize' , true) . " "; ?>72 <p><?php echo __('Pagesize') . " "; ?> 73 73 <?php $links = array(); 74 74 foreach (array(6, 12, 24, 60, 120, 240) as $size) { 75 $links[] = $ html->link($size, $breadcrumb->crumbUrl($breadcrumb->replace($crumbs, 'show', $size)));75 $links[] = $this->Html->link($size, $this->Breadcrumb->crumbUrl($this->Breadcrumb->replace($crumbs, 'show', $size))); 76 76 } 77 77 echo implode($links); 78 78 ?></p> 79 <p><?php echo __('Sort' , true) . " "; ?>79 <p><?php echo __('Sort') . " "; ?> 80 80 <?php $links = array(); 81 $links[] = $ html->link(__('newest', true), $breadcrumb->crumbUrl($breadcrumb->replace($crumbs, 'sort', 'newest')));82 $links[] = $ html->link(__('date', true), $breadcrumb->crumbUrl($breadcrumb->replace($crumbs, 'sort', 'date')));83 $links[] = $ html->link(__('date (reverse)', true), $breadcrumb->crumbUrl($breadcrumb->replace($crumbs, 'sort', '-date')));84 $links[] = $ html->link(__('name', true), $breadcrumb->crumbUrl($breadcrumb->replace($crumbs, 'sort', 'name')));85 $links[] = $ html->link(__('modified', true), $breadcrumb->crumbUrl($breadcrumb->replace($crumbs, 'sort', 'changes')));86 $links[] = $ html->link(__('view count', true), $breadcrumb->crumbUrl($breadcrumb->replace($crumbs, 'sort', 'viewed')));87 $links[] = $ html->link(__('random', true), $breadcrumb->crumbUrl($breadcrumb->replace($crumbs, 'sort', 'random')));81 $links[] = $this->Html->link(__('newest'), $this->Breadcrumb->crumbUrl($this->Breadcrumb->replace($crumbs, 'sort', 'newest'))); 82 $links[] = $this->Html->link(__('date'), $this->Breadcrumb->crumbUrl($this->Breadcrumb->replace($crumbs, 'sort', 'date'))); 83 $links[] = $this->Html->link(__('date (reverse)'), $this->Breadcrumb->crumbUrl($this->Breadcrumb->replace($crumbs, 'sort', '-date'))); 84 $links[] = $this->Html->link(__('name'), $this->Breadcrumb->crumbUrl($this->Breadcrumb->replace($crumbs, 'sort', 'name'))); 85 $links[] = $this->Html->link(__('modified'), $this->Breadcrumb->crumbUrl($this->Breadcrumb->replace($crumbs, 'sort', 'changes'))); 86 $links[] = $this->Html->link(__('view count'), $this->Breadcrumb->crumbUrl($this->Breadcrumb->replace($crumbs, 'sort', 'viewed'))); 87 $links[] = $this->Html->link(__('random'), $this->Breadcrumb->crumbUrl($this->Breadcrumb->replace($crumbs, 'sort', 'random'))); 88 88 echo implode(' ', $links); 89 89 ?></p> 90 90 </div><!-- all meta --> 91 91 <?php 92 $url = $ breadcrumb->params($crumbs);93 echo $ form->create(null, array('id' => 'explorer', 'action' => 'edit/'.$url, 'class' => 'explorer-menu'));92 $url = $this->Breadcrumb->params($crumbs); 93 echo $this->Form->create(null, array('id' => 'explorer', 'action' => 'edit/'.$url, 'class' => 'explorer-menu')); 94 94 ?> 95 95 <div id="p-explorer-edit-meta"> 96 <fieldset><legend><?php __("Metadata"); ?></legend>96 <fieldset><legend><?php echo __("Metadata"); ?></legend> 97 97 <?php 98 echo $ form->hidden('Media.ids', array('id' => 'MediaIds'));98 echo $this->Form->hidden('Media.ids', array('id' => 'MediaIds')); 99 99 if ($canWriteTag) { 100 echo $ form->input('Tag.names', array('label' => __('Tags', true), 'after' => $html->tag('div', __('E.g. newtag, -oldtag', true), array('class' => 'description'))));100 echo $this->Form->input('Tag.names', array('label' => __('Tags'), 'after' => $this->Html->tag('div', __('E.g. newtag, -oldtag'), array('class' => 'description')))); 101 101 echo $autocomplete->autoComplete('Tag.names', 'autocomplete/tag', array('split' => true)); 102 102 } 103 103 if ($canWriteMeta) { 104 echo $ form->input('Category.names', array('label' => __('Categories', true)));104 echo $this->Form->input('Category.names', array('label' => __('Categories'))); 105 105 echo $autocomplete->autoComplete('Category.names', 'autocomplete/category', array('split' => true)); 106 echo $ form->input('Location.city', array('label' => __('City', true)));106 echo $this->Form->input('Location.city', array('label' => __('City'))); 107 107 echo $autocomplete->autoComplete('Location.city', 'autocomplete/city'); 108 echo $ form->input('Location.sublocation', array('label' => __('Sublocation', true)));108 echo $this->Form->input('Location.sublocation', array('label' => __('Sublocation'))); 109 109 echo $autocomplete->autoComplete('Location.sublocation', 'autocomplete/sublocation'); 110 echo $ form->input('Location.state', array('label' => __('State', true)));110 echo $this->Form->input('Location.state', array('label' => __('State'))); 111 111 echo $autocomplete->autoComplete('Location.state', 'autocomplete/state'); 112 echo $ form->input('Location.country', array('label' => __('Country', true)));112 echo $this->Form->input('Location.country', array('label' => __('Country'))); 113 113 echo $autocomplete->autoComplete('Location.country', 'autocomplete/country'); 114 echo $ form->input('Media.geo', array('label' => __('Geo data', true), 'maxlength' => 32, 'after' => $html->tag('div', __('latitude, longitude', true), array('class' => 'description'))));114 echo $this->Form->input('Media.geo', array('label' => __('Geo data'), 'maxlength' => 32, 'after' => $this->Html->tag('div', __('latitude, longitude'), array('class' => 'description')))); 115 115 } 116 116 if ($canWriteCaption) { 117 echo $ form->input('Media.date', array('type' => 'text', 'after' => $html->tag('div', __('E.g. 2008-08-07 15:30', true), array('class' => 'description'))));118 echo $ form->input('Media.name', array('type' => 'text'));119 echo $ form->input('Media.caption', array('type' => 'textarea'));117 echo $this->Form->input('Media.date', array('type' => 'text', 'after' => $this->Html->tag('div', __('E.g. 2008-08-07 15:30'), array('class' => 'description')))); 118 echo $this->Form->input('Media.name', array('type' => 'text')); 119 echo $this->Form->input('Media.caption', array('type' => 'textarea')); 120 120 $rotations = array( 121 '0' => __("Keep" , true),122 '90' => __("90 CW" , true),123 '180' => __("180 CW" , true),124 '270' => __("90 CCW" , true)121 '0' => __("Keep"), 122 '90' => __("90 CW"), 123 '180' => __("180 CW"), 124 '270' => __("90 CCW") 125 125 ); 126 echo $ html->tag('div', $html->tag('label', __("Rotate", true)) .127 $ html->tag('div', $form->radio('Media.rotation', $rotations, array('legend' => false, 'value' => '0')), array('escape' => false, 'class' => 'radioSet')), array('escape' => false, 'class' => 'input radio'));126 echo $this->Html->tag('div', $this->Html->tag('label', __("Rotate")) . 127 $this->Html->tag('div', $this->Form->radio('Media.rotation', $rotations, array('legend' => false, 'value' => '0')), array('escape' => false, 'class' => 'radioSet')), array('escape' => false, 'class' => 'input radio')); 128 128 } 129 129 ?> 130 130 </fieldset> 131 <?php echo $ form->submit(__('Apply', true)); ?>131 <?php echo $this->Form->submit(__('Apply')); ?> 132 132 </div> 133 133 <?php if ($canWriteAcl): ?> 134 134 <div id="p-explorer-edit-access"> 135 <fieldset><legend><?php __("Access Rights"); ?></legend>135 <fieldset><legend><?php echo __("Access Rights"); ?></legend> 136 136 <?php 137 137 $aclSelect = array( 138 ACL_LEVEL_PRIVATE => __('Me' , true),139 ACL_LEVEL_GROUP => __('Group' , true),140 ACL_LEVEL_USER => __('Users' , true),141 ACL_LEVEL_OTHER => __('All' , true),142 ACL_LEVEL_KEEP => __('Keep' , true));143 echo $ html->tag('div',144 $ html->tag('label', __("Who can view the image", true)).145 $ html->tag('div', $form->radio('Media.readPreview', $aclSelect, array('legend' => false, 'value' => ACL_LEVEL_KEEP)), array('escape' => false, 'class' => 'radioSet')),138 ACL_LEVEL_PRIVATE => __('Me'), 139 ACL_LEVEL_GROUP => __('Group'), 140 ACL_LEVEL_USER => __('Users'), 141 ACL_LEVEL_OTHER => __('All'), 142 ACL_LEVEL_KEEP => __('Keep')); 143 echo $this->Html->tag('div', 144 $this->Html->tag('label', __("Who can view the image")). 145 $this->Html->tag('div', $this->Form->radio('Media.readPreview', $aclSelect, array('legend' => false, 'value' => ACL_LEVEL_KEEP)), array('escape' => false, 'class' => 'radioSet')), 146 146 array('escape' => false, 'class' => 'input radio')); 147 echo $ html->tag('div',148 $ html->tag('label', __("Who can download the image?", true)).149 $ html->tag('div', $form->radio('Media.readOriginal', $aclSelect, array('legend' => false, 'value' => ACL_LEVEL_KEEP)), array('escape' => false, 'class' => 'radioSet')),147 echo $this->Html->tag('div', 148 $this->Html->tag('label', __("Who can download the image?")). 149 $this->Html->tag('div', $this->Form->radio('Media.readOriginal', $aclSelect, array('legend' => false, 'value' => ACL_LEVEL_KEEP)), array('escape' => false, 'class' => 'radioSet')), 150 150 array('escape' => false, 'class' => 'input radio')); 151 echo $ html->tag('div',152 $ html->tag('label', __("Who can add tags?", true)).153 $ html->tag('div', $form->radio('Media.writeTag', $aclSelect, array('legend' => false, 'value' => ACL_LEVEL_KEEP)), array('escape' => false, 'class' => 'radioSet')),151 echo $this->Html->tag('div', 152 $this->Html->tag('label', __("Who can add tags?")). 153 $this->Html->tag('div', $this->Form->radio('Media.writeTag', $aclSelect, array('legend' => false, 'value' => ACL_LEVEL_KEEP)), array('escape' => false, 'class' => 'radioSet')), 154 154 array('escape' => false, 'class' => 'input radio')); 155 echo $ html->tag('div',156 $ html->tag('label', __("Who can edit all meta data?", true)).157 $ html->tag('div', $form->radio('Media.writeMeta', $aclSelect, array('legend' => false, 'value' => ACL_LEVEL_KEEP)), array('escape' => false, 'class' => 'radioSet')),155 echo $this->Html->tag('div', 156 $this->Html->tag('label', __("Who can edit all meta data?")). 157 $this->Html->tag('div', $this->Form->radio('Media.writeMeta', $aclSelect, array('legend' => false, 'value' => ACL_LEVEL_KEEP)), array('escape' => false, 'class' => 'radioSet')), 158 158 array('escape' => false, 'class' => 'input radio')); 159 echo $ form->input('Group.id', array('type' => 'select', 'options' => $groups, 'selected' => 0, 'label' => __("Default image group?", true)));159 echo $this->Form->input('Group.id', array('type' => 'select', 'options' => $groups, 'selected' => 0, 'label' => __("Default image group?"))); 160 160 ?> 161 161 </fieldset> 162 <?php echo $ form->submit(__('Apply', true)); ?>162 <?php echo $this->Form->submit(__('Apply')); ?> 163 163 </div> 164 164 <?php endif; // canWriteAcl==true ?> 165 <?php echo $ form->end(); ?>165 <?php echo $this->Form->end(); ?> 166 166 </div> 167 167 </div><!-- explorer menu --> -
View/Elements/comment.ctp
r1a41cea r0fb8d7c 1 1 <?php 2 $ search->initialize();3 $ searchParams = $search->serialize(false, false, false, array('defaults' => array('pos' => 1)));2 $this->Search->initialize(); 3 $this->SearchParams = $this->Search->serialize(false, false, false, array('defaults' => array('pos' => 1))); 4 4 ?> 5 5 <div id="comments"> 6 6 <?php if (count($this->data['Comment'])): ?> 7 <h3><?php echo __('Comments' , true); ?></h3>7 <h3><?php echo __('Comments'); ?></h3> 8 8 <?php $count = 0; ?> 9 9 <?php foreach ($this->data['Comment'] as $key => $comment): ?> … … 14 14 $name = $comment['name']; 15 15 if (!empty($comment['url'])) { 16 $name = $ html->link($comment['name'], $comment['url']);16 $name = $this->Html->link($comment['name'], $comment['url']); 17 17 } 18 $time = $ html->tag('span', $this->Time->relativeTime($comment['date']), array('class' => 'date'));19 printf(__("%s said %s", true), $name, $time);18 $time = $this->Html->tag('span', $this->Time->relativeTime($comment['date']), array('class' => 'date')); 19 __("%s said %s", $name, $time); 20 20 ?> 21 21 <?php 22 22 if ($this->data['Media']['isOwner'] || $comment['user_id'] == $userId) { 23 echo $ html->link(__('(delete)', true), '/comments/delete/'.$comment['id'].'/'.$searchParams);23 echo $this->Html->link(__('(delete)'), '/comments/delete/'.$comment['id'].'/'.$this->SearchParams); 24 24 } 25 25 ?>: … … 33 33 <?php endif; /* has comments */ ?> 34 34 35 <h3><?php __("Add new Comment", true); ?></h3>36 <?php echo $ form->create('Comment', array('action' => 'add/'.$searchParams, 'id' => 'comment-add')); ?>35 <h3><?php echo __("Add new Comment"); ?></h3> 36 <?php echo $this->Form->create('Comment', array('action' => 'add/'.$this->SearchParams, 'id' => 'comment-add')); ?> 37 37 <fieldset> 38 38 <?php 39 echo $ form->hidden('Media.id', array('value' => $this->data['Media']['id']));39 echo $this->Form->hidden('Media.id', array('value' => $this->data['Media']['id'])); 40 40 ?> 41 41 <?php 42 42 if (($commentAuth & COMMENT_AUTH_NAME) > 0) { 43 echo $ form->input('Comment.name', array('label' => __('Name', true)));44 echo $ form->input('Comment.email', array('after' => '<span class="description">' . __('Will not be published', true) . '</span>'));45 echo $ form->input('Comment.url', array('after' => '<span class="description">' . __('Optional', true) . '</span>', 'required' => false));43 echo $this->Form->input('Comment.name', array('label' => __('Name'))); 44 echo $this->Form->input('Comment.email', array('after' => '<span class="description">' . __('Will not be published') . '</span>')); 45 echo $this->Form->input('Comment.url', array('after' => '<span class="description">' . __('Optional') . '</span>', 'required' => false)); 46 46 } 47 47 if (($commentAuth & COMMENT_AUTH_CAPTCHA) > 0) { 48 echo '<div class="input text"><label> </label><img src="'.$ html->url('/comments/captcha/verify.jpg').'" /></div>';49 echo $ form->input('Captcha.verification', array('label' => __('Verification', true)));48 echo '<div class="input text"><label> </label><img src="'.$this->Html->url('/comments/captcha/verify.jpg').'" /></div>'; 49 echo $this->Form->input('Captcha.verification', array('label' => __('Verification'))); 50 50 } 51 51 ?> 52 52 <?php 53 echo $ form->input('Comment.text', array('label' => __('Comment', true)));54 echo $ form->input('Comment.notify', array('type' => 'checkbox', 'label' => __('Notify me on new comments', true), 'checked' => 'checked'));53 echo $this->Form->input('Comment.text', array('label' => __('Comment'))); 54 echo $this->Form->input('Comment.notify', array('type' => 'checkbox', 'label' => __('Notify me on new comments'), 'checked' => 'checked')); 55 55 ?> 56 56 </fieldset> 57 <?php echo $ form->end(__('Add Comment', true)); ?>57 <?php echo $this->Form->end(__('Add Comment')); ?> 58 58 </div><!-- comments --> -
View/Elements/email/html/notify_new_media.ctp
r1a41cea r0fb8d7c 1 <p><?php printf(__("Hi %s!", true), $user['User']['username']); ?></p>1 <p><?php echo __("Hi %s!", $user['User']['username']); ?></p> 2 2 3 <p><?php printf(__("New media available at %s", true), $html->link($url, $url)); ?>.</p>3 <p><?php echo __("New media available at %s", $this->Html->link($url, $url)); ?>.</p> 4 4 5 5 <?php … … 14 14 15 15 foreach ($userToMedia as $user => $userMedia) { 16 echo "<p>" . sprintf(__("User %s published following media", true), $html->link($user, $url . '/explorer/user/' . $user)) . "</p>";16 echo "<p>" . __("User %s published following media", $this->Html->link($user, $url . '/explorer/user/' . $user)) . "</p>"; 17 17 echo "<p>"; 18 18 foreach ($userMedia as $m) { 19 echo $ html->link(20 $ html->tag('img', null, array(19 echo $this->Html->link( 20 $this->Html->tag('img', null, array( 21 21 'src' => 'cid:media-' . $m['Media']['id'] . '.jpg', 22 22 'alt' => $m['Media']['name'])), … … 27 27 ?> 28 28 29 <p><?php printf(__("See all new media at %s", true), $html->link('media explorer', $url . '/explorer/view/sort:newest')); ?></p>29 <p><?php echo __("See all new media at %s", $this->Html->link('media explorer', $url . '/explorer/view/sort:newest')); ?></p> 30 30 <p></p> 31 <p><?php __("Sincerly, your phTagr agent"); ?></p>31 <p><?php echo __("Sincerly, your phTagr agent"); ?></p> 32 32 33 <p><i><?php __("PS: If you do not like to receive this notification again, please configure the notification interval in your user profile.") ?></i></p>33 <p><i><?php echo __("PS: If you do not like to receive this notification again, please configure the notification interval in your user profile.") ?></i></p> -
View/Elements/email/text/notify_new_media.ctp
r1a41cea r0fb8d7c 1 <?php printf(__("Hi %s!", true), $user['User']['username']); ?>1 <?php echo __("Hi %s!", $user['User']['username']); ?> 2 2 3 3 4 <?php printf(__("New media available at %s", true), $html->link($url, $url)); ?>4 <?php echo __("New media available at %s", $this->Html->link($url, $url)); ?> 5 5 6 6 … … 16 16 17 17 foreach ($userToMedia as $user => $userMedia) { 18 echo sprintf(__("User %s published following media", true), $user) . "\r\n";18 echo __("User %s published following media", $user) . "\r\n"; 19 19 foreach ($userMedia as $m) { 20 20 echo "{$m['Media']['name']} (Link: $url/images/view/{$m['Media']['id']})\r\n"; … … 24 24 ?> 25 25 26 <?php printf(__("See all new media at %s", true), $url . '/explorer/view/sort:newest'); ?>26 <?php echo __("See all new media at %s", $url . '/explorer/view/sort:newest'); ?> 27 27 28 28 29 <?php __("Sincerly, your phTagr agent"); ?>29 <?php echo __("Sincerly, your phTagr agent"); ?> 30 30 31 31 32 <?php __("PS: If you do not like to receive this notification again, please configure the notification interval in your user profile.") ?>32 <?php echo __("PS: If you do not like to receive this notification again, please configure the notification interval in your user profile.") ?> -
View/Elements/footer.ctp
r1a41cea r0fb8d7c 1 1 <?php 2 2 global $TIME_START; 3 $time = getMicrotime() - $TIME_START;4 printf(__("%s Social Web Gallery %s in %.3fs. Layout based on %s, Icons by %s", true), '© 2006-2010', $html->link('phtagr.org', 'http://www.phtagr.org'), $time, $html->link('YAML', 'http://www.yaml.de'), $html->link('FamFamFam', 'http://www.famfamfam.com'));3 $time = microtime(true) - $TIME_START; 4 __("%s Social Web Gallery %s in %.3fs. Layout based on %s, Icons by %s", '© 2006-2010', $this->Html->link('phtagr.org', 'http://www.phtagr.org'), $time, $this->Html->link('YAML', 'http://www.yaml.de'), $this->Html->link('FamFamFam', 'http://www.famfamfam.com')); 5 5 ?> -
View/Elements/header.ctp
r1a41cea r0fb8d7c 1 <h1><?php echo $ html->image("logo.png"); ?> <?php echo $option->get('general.title', 'phTagr.'); ?></h1>1 <h1><?php echo $this->Html->image("logo.png"); ?> <?php echo $option->get('general.title', 'phTagr.'); ?></h1> -
View/Elements/menu.ctp
r1a41cea r0fb8d7c 4 4 $items = array(); 5 5 $items[] = array( 6 'text' => __('Home' , true),6 'text' => __('Home'), 7 7 'link' => '/', 8 8 'type' => ($controller == 'home'?'current':'')); 9 if ($ session->check('User.id')) {10 $userId = $ session->read('User.id');11 $role = $ session->read('User.role');9 if ($this->Session->check('User.id')) { 10 $userId = $this->Session->read('User.id'); 11 $role = $this->Session->read('User.role'); 12 12 $myImages = false; 13 if (isset($ search) &&13 if (isset($this->Search) && 14 14 ($controller == 'explorer' || $controller == 'images') && 15 $ search->getUser() == $session->read('User.username')) {15 $this->Search->getUser() == $this->Session->read('User.username')) { 16 16 $myImages = true; 17 17 } 18 18 $items[] = array( 19 'text' => __('Explorer' , true),19 'text' => __('Explorer'), 20 20 'link' => '/explorer', 21 21 'type' => ($controller == 'explorer' && !$myImages?'current':'')); … … 23 23 if ($role >= ROLE_GUEST) { 24 24 $items[] = array('text' => 25 __('My Photos' , true),26 'link' => "/explorer/user/".$ session->read('User.username'),25 __('My Photos'), 26 'link' => "/explorer/user/".$this->Session->read('User.username'), 27 27 'type' => ($controller == 'explorer' && $myImages?'current':'')); 28 28 } … … 30 30 if (!$option->get('user.browser.full', 0)) { 31 31 $items[] = array( 32 'text' => __('Upload' , true),32 'text' => __('Upload'), 33 33 'link' => '/browser/quickupload', 34 34 'type' => ($controller == 'browser' && $action == 'quickupload'?'current':'')); 35 35 } else { 36 36 $items[] = array( 37 'text' => __('My Files' , true),37 'text' => __('My Files'), 38 38 'link' => '/browser', 39 39 'type' => ($controller == 'browser' && $action != 'quickupload'?'current':'')); … … 42 42 } else { 43 43 $items[] = array( 44 'text' => __('Explorer' , true),44 'text' => __('Explorer'), 45 45 'link' => '/explorer', 46 46 'type' => ($controller == 'explorer'?'current':'')); -
View/Elements/single_acl_form.ctp
r1a41cea r0fb8d7c 1 1 <?php 2 echo $ imageData->acl2select('Media.readPreview', $this->data, ACL_READ_PREVIEW, ACL_READ_MASK, array('label' => __("Who can view image?", true)));3 echo $ imageData->acl2select('Media.readOriginal', $this->data, ACL_READ_ORIGINAL, ACL_READ_MASK, array('label' => __("Who can download the image?", true)));4 echo $ imageData->acl2select('Media.writeTag', $this->data, ACL_WRITE_TAG, ACL_WRITE_MASK, array('label' => __("Who can edit the tags?", true)));5 echo $ imageData->acl2select('Media.writeMeta', $this->data, ACL_WRITE_META, ACL_WRITE_MASK, array('label' => __("Who can edit all meta data?", true)));6 echo $ form->input('Group.id', array('type' => 'select', 'options' => $groups, 'selected' => $this->data['Media']['group_id'], 'label' => __('Group', true)));2 echo $this->ImageData->acl2select('Media.readPreview', $this->data, ACL_READ_PREVIEW, ACL_READ_MASK, array('label' => __("Who can view image?"))); 3 echo $this->ImageData->acl2select('Media.readOriginal', $this->data, ACL_READ_ORIGINAL, ACL_READ_MASK, array('label' => __("Who can download the image?"))); 4 echo $this->ImageData->acl2select('Media.writeTag', $this->data, ACL_WRITE_TAG, ACL_WRITE_MASK, array('label' => __("Who can edit the tags?"))); 5 echo $this->ImageData->acl2select('Media.writeMeta', $this->data, ACL_WRITE_META, ACL_WRITE_MASK, array('label' => __("Who can edit all meta data?"))); 6 echo $this->Form->input('Group.id', array('type' => 'select', 'options' => $groups, 'selected' => $this->data['Media']['group_id'], 'label' => __('Group'))); 7 7 ?> -
View/Elements/single_meta_form.ctp
r1a41cea r0fb8d7c 1 1 <?php 2 2 if ($this->data['Media']['canWriteTag']) { 3 echo $ form->input('Tag.names', array('label' => __('Tags', true), 'value' => join(', ', Set::extract('/Tag/name', $this->data))));3 echo $this->Form->input('Tag.names', array('label' => __('Tags'), 'value' => join(', ', Set::extract('/Tag/name', $this->data)))); 4 4 echo $autocomplete->autoComplete('Tag.names', '/explorer/autocomplete/tag', array('split' => true)); 5 5 } 6 6 if ($this->data['Media']['canWriteMeta']) { 7 echo $ form->input('Category.names', array('label' => __('Categories', true), 'value' => join(', ', Set::extract('/Category/name', $this->data))));7 echo $this->Form->input('Category.names', array('label' => __('Categories'), 'value' => join(', ', Set::extract('/Category/name', $this->data)))); 8 8 echo $autocomplete->autoComplete('Category.names', '/explorer/autocomplete/category', array('split' => true)); 9 echo $ form->input('Location.city', array('label' => __('City', true), 'value' => join('', Set::extract('/Location[type='.LOCATION_CITY.']/name', $this->data))));9 echo $this->Form->input('Location.city', array('label' => __('City'), 'value' => join('', Set::extract('/Location[type='.LOCATION_CITY.']/name', $this->data)))); 10 10 echo $autocomplete->autoComplete('Locations.city', '/explorer/autocomplete/city'); 11 echo $ form->input('Location.sublocation', array('label' => __('Sublocation', true), 'value' => join('', Set::extract('/Location[type='.LOCATION_SUBLOCATION.']/name', $this->data))));11 echo $this->Form->input('Location.sublocation', array('label' => __('Sublocation'), 'value' => join('', Set::extract('/Location[type='.LOCATION_SUBLOCATION.']/name', $this->data)))); 12 12 echo $autocomplete->autoComplete('Location.sublocation', '/explorer/autocomplete/sublocation'); 13 echo $ form->input('Location.state', array('label' => __('State', true), 'value' => join('', Set::extract('/Location[type='.LOCATION_STATE.']/name', $this->data))));13 echo $this->Form->input('Location.state', array('label' => __('State'), 'value' => join('', Set::extract('/Location[type='.LOCATION_STATE.']/name', $this->data)))); 14 14 echo $autocomplete->autoComplete('Location.state', '/explorer/autocomplete/state'); 15 echo $ form->input('Location.country', array('label' => __('Country', true), 'value' => join('', Set::extract('/Location[type='.LOCATION_COUNTRY.']/name', $this->data))));15 echo $this->Form->input('Location.country', array('label' => __('Country'), 'value' => join('', Set::extract('/Location[type='.LOCATION_COUNTRY.']/name', $this->data)))); 16 16 echo $autocomplete->autoComplete('Location.country', '/explorer/autocomplete/country'); 17 17 $geo = ""; … … 19 19 $geo = $this->data['Media']['latitude'] . ', ' . $this->data['Media']['longitude']; 20 20 } 21 echo $ form->input('Media.geo', array('label' => __('Geo data', true), 'value' => $geo, 'maxlength' => 32));21 echo $this->Form->input('Media.geo', array('label' => __('Geo data'), 'value' => $geo, 'maxlength' => 32)); 22 22 } 23 23 if ($this->data['Media']['canWriteCaption']) { 24 echo $ form->input('Media.date', array('type' => 'text', 'after' => $html->tag('div', __('E.g. 2008-08-07 15:30', true), array('class' => 'description'))));25 echo $ form->input('Media.name', array('type' => 'text'));26 echo $ form->input('Media.caption', array('type' => 'text'));24 echo $this->Form->input('Media.date', array('type' => 'text', 'after' => $this->Html->tag('div', __('E.g. 2008-08-07 15:30'), array('class' => 'description')))); 25 echo $this->Form->input('Media.name', array('type' => 'text')); 26 echo $this->Form->input('Media.caption', array('type' => 'text')); 27 27 } 28 28 ?> -
View/Elements/topnav.ctp
r3605ef4 r0fb8d7c 1 1 <?php 2 if ($ session->check('User.id')) {3 $userId = $ session->read('User.id');4 $role = $ session->read('User.role');5 $name = $ session->read('User.username');2 if ($this->Session->check('User.id')) { 3 $userId = $this->Session->read('User.id'); 4 $role = $this->Session->read('User.role'); 5 $name = $this->Session->read('User.username'); 6 6 if ($role >= ROLE_SYSOP) { 7 echo $ html->link(__('System'), "/admin/system/general")." | ";7 echo $this->Html->link(__('System'), "/admin/system/general")." | "; 8 8 } 9 9 if ($role >= ROLE_USER) { 10 echo $ html->link(__('Preferences'), "/options/profile")." | ";10 echo $this->Html->link(__('Preferences'), "/options/profile")." | "; 11 11 } 12 echo $ html->link(__("Logout"), "/users/logout"). " ($name)";12 echo $this->Html->link(__("Logout"), "/users/logout"). " ($name)"; 13 13 } else { 14 echo $ html->link(__("Login"), "/users/login");14 echo $this->Html->link(__("Login"), "/users/login"); 15 15 if ($option->get('user.register.enable', 0)) { 16 echo ' | '.$ html->link(__("Register", true), "/users/register");16 echo ' | '.$this->Html->link(__("Register"), "/users/register"); 17 17 } 18 18 } 19 19 20 20 echo "\n<div class=\"searchBox\" ><div class=\"searchBoxSub\" >"; 21 echo $ form->create(null, array('url' => '/explorer/quicksearch'));22 echo $ form->input('Media.quicksearch', array ('label' => false, 'div' => false));21 echo $this->Form->create(null, array('url' => '/explorer/quicksearch')); 22 echo $this->Form->input('Media.quicksearch', array ('label' => false, 'div' => false)); 23 23 $icon = Router::url("/img/icons/zoom.png"); 24 24 echo "<input type=\"image\" src=\"$icon\" width=\"16\" height=\"16\" id=\"go\" alt=\"Search\" title=\"Search\" />"; 25 echo $ form->end();25 echo $this->Form->end(); 26 26 echo "</div></div>\n"; 27 27 ?> -
View/Explorer/editacl.ctp
r1a41cea r0fb8d7c 1 1 <?php 2 2 $mediaId = $this->data['Media']['id']; 3 $crumbUrl = '/'.$ breadcrumb->params($crumbs);4 echo $ form->create(null, array('url' => 'saveacl/'.$mediaId.$crumbUrl, 'id' => 'form-acl-'.$mediaId));3 $crumbUrl = '/'.$this->Breadcrumb->params($crumbs); 4 echo $this->Form->create(null, array('url' => 'saveacl/'.$mediaId.$crumbUrl, 'id' => 'form-acl-'.$mediaId)); 5 5 ?> 6 6 <fieldset> -
View/Explorer/editmeta.ctp
r1a41cea r0fb8d7c 1 1 <?php 2 2 $mediaId = $this->data['Media']['id']; 3 $crumbUrl = '/'.$ breadcrumb->params($crumbs);4 echo $ form->create(null, array('url' => 'savemeta/'.$mediaId.$crumbUrl, 'id' => 'form-meta-'.$mediaId));3 $crumbUrl = '/'.$this->Breadcrumb->params($crumbs); 4 echo $this->Form->create(null, array('url' => 'savemeta/'.$mediaId.$crumbUrl, 'id' => 'form-meta-'.$mediaId)); 5 5 ?> 6 6 <fieldset> -
View/Explorer/index.ctp
r1a41cea r0fb8d7c 1 <?php $ search->initialize(); ?>2 3 <?php echo $this->element(' explorer/menu'); ?>4 5 <?php echo $ session->flash(); ?>6 <?php echo $ breadcrumb->breadcrumb($crumbs); ?>1 <?php $this->Search->initialize(); ?> 2 3 <?php echo $this->element('Explorer/menu'); ?> 4 5 <?php echo $this->Session->flash(); ?> 6 <?php echo $this->Breadcrumb->breadcrumb($crumbs); ?> 7 7 8 8 <?php … … 32 32 buttons: { 33 33 ':SAVE': function() { 34 var $ form = $('#form-meta-' + id);35 $.post($ form.attr('action'), $form.serialize(), function(data) {34 var $this->Form = $('#form-meta-' + id); 35 $.post($this->Form.attr('action'), $this->Form.serialize(), function(data) { 36 36 $('#media-' + id).html(data); 37 37 $('#media-' + id).mediaAction(); … … 59 59 buttons: { 60 60 ':SAVE': function() { 61 var $ form = $('#form-acl-' + id);62 $.post($ form.attr('action'), $form.serialize(), function(data) {61 var $this->Form = $('#form-acl-' + id); 62 $.post($this->Form.attr('action'), $this->Form.serialize(), function(data) { 63 63 $('#media-' + id).html(data); 64 64 $('#media-' + id).mediaAction(); … … 165 165 $vars = array( 166 166 'BASE_URL' => Router::url('/', true), 167 'EDIT_TITLE' => __("Edit Meta Data" , true),168 'ACL_TITLE' => __("Edit Access Rights" , true),169 'SAVE' => __("Update" , true),170 'CANCEL' => __("Cancel" , true));167 'EDIT_TITLE' => __("Edit Meta Data"), 168 'ACL_TITLE' => __("Edit Access Rights"), 169 'SAVE' => __("Update"), 170 'CANCEL' => __("Cancel")); 171 171 foreach ($vars as $name => $value) { 172 172 $script = preg_replace("/:$name/", $value, $script); 173 173 } 174 echo $this-> Javascript->link('/piclenslite/piclens_optimized', false);174 echo $this->Html->script('/piclenslite/piclens_optimized'); 175 175 echo $this->Html->scriptBlock($script, array('inline' => false)); 176 176 ?> … … 180 180 $canWriteTag = count($this->data) ? max(Set::extract('/Media/canWriteTag', $this->data)) : 0; 181 181 $index = 0; 182 $pos = ($ search->getPage(1)-1) * $search->getShow(12) + 1;182 $pos = ($this->Search->getPage(1)-1) * $this->Search->getShow(12) + 1; 183 183 184 184 echo '<div class="row">'; … … 186 186 $editable = $media['Media']['canWriteTag'] ? 'editable' : ''; 187 187 $cell = "cell" . ($index %4); 188 echo $ html->tag('div',189 $this->element(' explorer/media', array('media' => $media, 'index' => $index, 'pos' => $pos)),188 echo $this->Html->tag('div', 189 $this->element('Explorer/media', array('media' => $media, 'index' => $index, 'pos' => $pos)), 190 190 array('class' => "p-explorer-media $editable $cell", 'id' => 'media-' . $media['Media']['id'], 'escape' => false)); 191 191 $index++; … … 202 202 if ($canWriteTag): ?> 203 203 <div class="p-navigator-pages"><div class="sub"> 204 <a id="select-all"><?php __('Select All'); ?></a>205 <a id="invert-selection"><?php __('Invert Selection'); ?></a>204 <a id="select-all"><?php echo __('Select All'); ?></a> 205 <a id="invert-selection"><?php echo __('Invert Selection'); ?></a> 206 206 </div></div> 207 207 <?php endif; ?> 208 208 209 <?php echo $ navigator->pages() ?>209 <?php echo $this->Navigator->pages() ?> 210 210 211 211 <div id="dialog"></div> -
View/Explorer/media.ctp
r1a41cea r0fb8d7c 5 5 <description>Media RSS of phTagr (<?php echo Router::url('/', true); ?>)</description> 6 6 <?php 7 $ search->initialize(array('baseUri' => '/explorer/media', 'afterUri' => '/media.rss', 'defaults' => array('pos' => 1)));7 $this->Search->initialize(array('baseUri' => '/explorer/media', 'afterUri' => '/media.rss', 'defaults' => array('pos' => 1))); 8 8 ?> 9 9 <?php 10 10 $keyParam = ''; 11 if ($ session->check('Authentication.key')) {12 $ search->setKey($session->read('Authentication.key'));13 $keyParam = '/key:' . $ session->read('Authentication.key');11 if ($this->Session->check('Authentication.key')) { 12 $this->Search->setKey($this->Session->read('Authentication.key')); 13 $keyParam = '/key:' . $this->Session->read('Authentication.key'); 14 14 } 15 15 $quality = 'preview'; 16 16 if (isset($this->params['named']['quality']) && 17 17 $this->params['named']['quality'] == 'high') { 18 $ search->setQuality('high');18 $this->Search->setQuality('high'); 19 19 $quality = 'high'; 20 20 } 21 21 ?> 22 <atom:link rel="self" href="<?php echo Router::url($ search->getUri(), true); ?>" />22 <atom:link rel="self" href="<?php echo Router::url($this->Search->getUri(), true); ?>" /> 23 23 <?php if ($navigator->hasPrev()): ?> 24 <atom:link rel="previous" href="<?php echo Router::url($ search->getUri(false, array('page' => $search->getPage(1) - 1)), true); ?>" />24 <atom:link rel="previous" href="<?php echo Router::url($this->Search->getUri(false, array('page' => $this->Search->getPage(1) - 1)), true); ?>" /> 25 25 <?php endif; ?> 26 26 <?php if ($navigator->hasNext()): ?> 27 <atom:link rel="next" href="<?php echo Router::url($ search->getUri(false, array('page' => $search->getPage(1) + 1)), true); ?>" />27 <atom:link rel="next" href="<?php echo Router::url($this->Search->getUri(false, array('page' => $this->Search->getPage(1) + 1)), true); ?>" /> 28 28 <?php endif; ?> 29 29 <?php 30 $offset = $ search->getShow() * ($search->getPage(1) - 1) + 1;30 $offset = $this->Search->getShow() * ($this->Search->getPage(1) - 1) + 1; 31 31 foreach ($this->data as $media): ?> 32 32 <item> … … 34 34 <link><?php 35 35 $url = "/images/view/{$media['Media']['id']}/"; 36 echo Router::url($url . $ search->serialize(false, array('pos' => $offset++), array('quality')), true); ?></link>36 echo Router::url($url . $this->Search->serialize(false, array('pos' => $offset++), array('quality')), true); ?></link> 37 37 <?php 38 $thumbSize = $ imageData->getimagesize($media, OUTPUT_SIZE_THUMB);38 $thumbSize = $this->ImageData->getimagesize($media, OUTPUT_SIZE_THUMB); 39 39 $thumbUrl = sprintf("/media/thumb/%d%s/%s", $media['Media']['id'], $keyParam, $media['Media']['name']); 40 40 41 41 if ($media['Media']['canReadOriginal'] && $quality == 'high') { 42 42 $contentUrl = sprintf("/media/high/%d%s/%s", $media['Media']['id'], $keyParam, $media['Media']['name']); 43 $previewSize = $ imageData->getimagesize($media, OUTPUT_SIZE_HIGH);43 $previewSize = $this->ImageData->getimagesize($media, OUTPUT_SIZE_HIGH); 44 44 } else { 45 45 $contentUrl = sprintf("/media/preview/%d%s/%s", $media['Media']['id'], $keyParam, $media['Media']['name']); 46 $previewSize = $ imageData->getimagesize($media, OUTPUT_SIZE_PREVIEW);46 $previewSize = $this->ImageData->getimagesize($media, OUTPUT_SIZE_PREVIEW); 47 47 } 48 48 ?><media:thumbnail url="<?php echo Router::url($thumbUrl, true); ?>" <?php echo $thumbSize[3]; ?> /> … … 51 51 <?php 52 52 if ($media['Media']['caption']) { 53 echo $ html->tag('description', $media['Media']['caption']);53 echo $this->Html->tag('description', $media['Media']['caption']); 54 54 } else { 55 55 echo "<description />\n"; -
View/Explorer/quicksearch.ctp
r1a41cea r0fb8d7c 1 1 <h1>Quick Search Results</h1> 2 <?php echo $ session->flash(); ?>2 <?php echo $this->Session->flash(); ?> 3 3 4 4 5 5 <?php 6 $ search->initialize();6 $this->Search->initialize(); 7 7 $cell=0; 8 8 9 9 if (!count($this->data)): ?> 10 10 <div class="info"> 11 <?php printf(__("Sorry, nothing was found for %s", true), h($quicksearch)); ?>11 <?php echo __("Sorry, nothing was found for %s", h($quicksearch)); ?> 12 12 </div> 13 13 <?php else: ?> 14 14 15 <h2><?php printf(__('Results of %s', true), h($quicksearch)); ?></h2>15 <h2><?php echo __('Results of %s', h($quicksearch)); ?></h2> 16 16 <div class="minis" align="left"> 17 17 <script type="text/javascript"> … … 21 21 <?php 22 22 foreach($this->data as $media) { 23 echo $ imageData->mediaLink($media, 'mini').' ';23 echo $this->ImageData->mediaLink($media, 'mini').' '; 24 24 } 25 25 ?> … … 29 29 $tags = Set::extract('/Tag/name', $this->data); 30 30 if (count($tags)) { 31 echo '<p>' . __('See more results of tag' , true) . ': ';31 echo '<p>' . __('See more results of tag') . ': '; 32 32 $tags = array_unique($tags); 33 33 $links = array(); 34 34 foreach ($tags as $name) { 35 $links[] = $ html->link($name, '/explorer/tag/'.$name);35 $links[] = $this->Html->link($name, '/explorer/tag/'.$name); 36 36 } 37 37 echo implode(', ', $links) . '</p>'; … … 40 40 $categories = Set::extract('/Category/name', $this->data); 41 41 if (count($categories)) { 42 echo '<p>' . __('See more results of category' , true) . ': ';42 echo '<p>' . __('See more results of category') . ': '; 43 43 $categories = array_unique($categories); 44 44 $links = array(); 45 45 foreach ($categories as $name) { 46 $links[] = $ html->link($name, '/explorer/category/'.$name);46 $links[] = $this->Html->link($name, '/explorer/category/'.$name); 47 47 } 48 48 echo implode(', ', $links) . '</p>'; … … 51 51 $locations = Set::extract('/Location/name', $this->data); 52 52 if (count($locations)) { 53 echo '<p>' . __('See more results of location' , true) . ': ';53 echo '<p>' . __('See more results of location') . ': '; 54 54 $locations = array_unique($locations); 55 55 $links = array(); 56 56 foreach ($locations as $name) { 57 $links[] = $ html->link($name, '/explorer/location/'.$name);57 $links[] = $this->Html->link($name, '/explorer/location/'.$name); 58 58 } 59 59 echo implode(', ', $links) . '</p>'; -
View/Explorer/search.ctp
r1a41cea r0fb8d7c 1 <h1><?php __('Advanced Search'); ?></h1>1 <h1><?php echo __('Advanced Search'); ?></h1> 2 2 3 <?php echo $ form->create(null, array('action' => 'query')); ?>4 <fieldset><legend><?php __('Metadata'); ?></legend>3 <?php echo $this->Form->create(null, array('action' => 'query')); ?> 4 <fieldset><legend><?php echo __('Metadata'); ?></legend> 5 5 <?php 6 echo $ form->input('Media.tags', array('label' => __('Tags', true), 'after' => '<span class="hint">' . __('E.g. includeTag, -excludeTag', true) . '</span>'));7 echo $ form->input('Media.categories', array('label' => __('Categories', true)));8 echo $ form->input('Media.locations', array('label' => __('Locations', true)));6 echo $this->Form->input('Media.tags', array('label' => __('Tags'), 'after' => '<span class="hint">' . __('E.g. includeTag, -excludeTag') . '</span>')); 7 echo $this->Form->input('Media.categories', array('label' => __('Categories'))); 8 echo $this->Form->input('Media.locations', array('label' => __('Locations'))); 9 9 10 echo $ form->input('Media.from', array('label' => __('Date from', true), 'after' => '<span class="hint">' . __('E.g. 2008-08-07', true) . '</span>'));11 echo $ form->input('Media.to', array('label' => __('Date to', true)));10 echo $this->Form->input('Media.from', array('label' => __('Date from'), 'after' => '<span class="hint">' . __('E.g. 2008-08-07') . '</span>')); 11 echo $this->Form->input('Media.to', array('label' => __('Date to'))); 12 12 ?> 13 13 </fieldset> 14 <fieldset><legend><?php __('Options'); ?></legend>14 <fieldset><legend><?php echo __('Options'); ?></legend> 15 15 <?php 16 16 $pages = array(6 => 6, 12 => 12, 24 => 24, 60 => 60, 120 => 120, 240 => 240); 17 echo $ form->input('Option.show', array('type' => 'select', 'options' => $pages, 'selected' => 12, 'label' => __('Page size', true)));17 echo $this->Form->input('Option.show', array('type' => 'select', 'options' => $pages, 'selected' => 12, 'label' => __('Page size'))); 18 18 19 $order = array('default' => __('Default', true), 'date' => __('Date', true), 'newest' => __('Newest', true), 'changes' => __('Changes', true), 'random' => __('Random' , true), 'popularity' => __('Popularity', true));20 echo $ form->input('Option.sort', array('type' => 'select', 'options' => $order, 'selected' => 'default', 'label' => __('Sort by', true)));19 $order = array('default' => __('Default', true), 'date' => __('Date', true), 'newest' => __('Newest', true), 'changes' => __('Changes', true), 'random' => __('Random'), 'popularity' => __('Popularity')); 20 echo $this->Form->input('Option.sort', array('type' => 'select', 'options' => $order, 'selected' => 'default', 'label' => __('Sort by'))); 21 21 ?> 22 22 </fieldset> 23 23 <?php if ($userRole >= ROLE_GUEST): ?> 24 <fieldset><legend><?php __('Advanced'); ?></legend>24 <fieldset><legend><?php echo __('Advanced'); ?></legend> 25 25 <?php 26 26 if ($userId) { 27 echo $ form->hidden('User.username', array('value' => $userId));27 echo $this->Form->hidden('User.username', array('value' => $userId)); 28 28 } 29 29 if ($userRole >= ROLE_GUEST) { 30 echo $ form->input('Media.name', array('label' => __('Name', true)));31 $type = array('any' => __('Any Type', true), 'image' => __('Image or Photos' , true), 'video' => __('Video', true));32 echo $ form->input('Media.type', array('type' => 'select', 'options' => $type, 'selected' => 'any', 'label' => __('File Type', true)));30 echo $this->Form->input('Media.name', array('label' => __('Name'))); 31 $type = array('any' => __('Any Type', true), 'image' => __('Image or Photos'), 'video' => __('Video')); 32 echo $this->Form->input('Media.type', array('type' => 'select', 'options' => $type, 'selected' => 'any', 'label' => __('File Type'))); 33 33 } 34 34 if ($userRole >= ROLE_USER) { 35 35 if (!$userId) { 36 echo $ form->input('User.username', array('label' => __('Username', true)));36 echo $this->Form->input('User.username', array('label' => __('Username'))); 37 37 } 38 echo $ form->input('Group.name', array('type' => 'select', 'options' => $groups, 'selected' => -1, 'label' => __('Group', true)));38 echo $this->Form->input('Group.name', array('type' => 'select', 'options' => $groups, 'selected' => -1, 'label' => __('Group'))); 39 39 40 $visibility = array('any' => __('Any', true), 'private' => __('Private', true), 'group' => __('Group members', true), 'user' => __('User' , true), 'public' => __('Public', true));41 echo $ form->input('Media.visibility', array('type' => 'select', 'options' => $visibility, 'label' => __('Media visibility', true)));40 $visibility = array('any' => __('Any', true), 'private' => __('Private', true), 'group' => __('Group members', true), 'user' => __('User'), 'public' => __('Public')); 41 echo $this->Form->input('Media.visibility', array('type' => 'select', 'options' => $visibility, 'label' => __('Media visibility'))); 42 42 } 43 43 44 $op = array(0 => 'default', 'AND' => __('AND' , true), 'OR' => __('OR', true));45 echo $ form->input('Media.operand', array('type' => 'select', 'options' => $op, 'selected' => 'default', 'label' => __('General Operand', true)));46 echo $ form->input('Media.tag_op', array('type' => 'select', 'options' => $op, 'selected' => 'default', 'label' => __('Tag operand', true)));47 echo $ form->input('Media.category_op', array('type' => 'select', 'options' => $op, 'selected' => 'default', 'label' => __('Category operand', true)));48 echo $ form->input('Media.location_op', array('type' => 'select', 'options' => $op, 'selected' => 'default', 'label' => __('Location operand', true)));44 $op = array(0 => 'default', 'AND' => __('AND'), 'OR' => __('OR')); 45 echo $this->Form->input('Media.operand', array('type' => 'select', 'options' => $op, 'selected' => 'default', 'label' => __('General Operand'))); 46 echo $this->Form->input('Media.tag_op', array('type' => 'select', 'options' => $op, 'selected' => 'default', 'label' => __('Tag operand'))); 47 echo $this->Form->input('Media.category_op', array('type' => 'select', 'options' => $op, 'selected' => 'default', 'label' => __('Category operand'))); 48 echo $this->Form->input('Media.location_op', array('type' => 'select', 'options' => $op, 'selected' => 'default', 'label' => __('Location operand'))); 49 49 50 50 ?> 51 51 </fieldset> 52 52 <?php endif; ?> 53 <?php echo $ form->end(__('Search', true)); ?>53 <?php echo $this->Form->end(__('Search')); ?> -
View/Explorer/updatemeta.ctp
r1a41cea r0fb8d7c 1 1 <?php 2 $ search->initialize();3 $pos = $ search->getPos();2 $this->Search->initialize(); 3 $pos = $this->Search->getPos(); 4 4 $index = 0; 5 5 echo $this->element('explorer/media', array('media' => $this->data, 'index' => $index, 'pos' => $pos)); -
View/Groups/create.ctp
r1a41cea r0fb8d7c 1 <h1><?php __('New Group'); ?></h1>1 <h1><?php echo __('New Group'); ?></h1> 2 2 3 <?php echo $ session->flash(); ?>3 <?php echo $this->Session->flash(); ?> 4 4 5 <?php echo $ form->create(null, array('action' => 'create')); ?>5 <?php echo $this->Form->create(null, array('action' => 'create')); ?> 6 6 7 <fieldset><legend><?php __('Create new group'); ?></legend>7 <fieldset><legend><?php echo __('Create new group'); ?></legend> 8 8 <?php 9 echo $ form->input('Group.name', array('label' => __('Name', true)));10 echo $ form->input('Group.description', array('label' => __('Description', true), 'type' => 'blob'));11 echo $ form->input('Group.is_hidden', array('label' => __('This group is hidden', true), 'type' => 'checkbox'));12 echo $ form->input('Group.is_moderated', array('label' => __('New group members are moderated', true), 'type' => 'checkbox'));13 echo $ form->input('Group.is_shared', array('label' => __('This group is shared and other group members can use this group', true), 'type' => 'checkbox'));9 echo $this->Form->input('Group.name', array('label' => __('Name'))); 10 echo $this->Form->input('Group.description', array('label' => __('Description'), 'type' => 'blob')); 11 echo $this->Form->input('Group.is_hidden', array('label' => __('This group is hidden'), 'type' => 'checkbox')); 12 echo $this->Form->input('Group.is_moderated', array('label' => __('New group members are moderated'), 'type' => 'checkbox')); 13 echo $this->Form->input('Group.is_shared', array('label' => __('This group is shared and other group members can use this group'), 'type' => 'checkbox')); 14 14 ?> 15 15 </fieldset> 16 <?php echo $ form->end(__('Create', true)); ?>16 <?php echo $this->Form->end(__('Create')); ?> -
View/Groups/dashboard_create.ctp
r1a41cea r0fb8d7c 1 1 <h1>Create Group</h1> 2 2 3 <?php echo $ session->flash(); ?>4 <?php echo $ form->create(null, array('action' => 'create')); ?>3 <?php echo $this->Session->flash(); ?> 4 <?php echo $this->Form->create(null, array('action' => 'create')); ?> 5 5 6 <fieldset><legend><?php __('Create new group'); ?></legend>6 <fieldset><legend><?php echo __('Create new group'); ?></legend> 7 7 <?php 8 echo $ form->input('Group.name', array('label' => __('Name', true)));9 echo $ form->input('Group.description', array('label' => __('Description', true), 'type' => 'blob'));10 echo $ form->input('Group.is_hidden', array('label' => __('This group is hidden', true), 'type' => 'checkbox'));11 echo $ form->input('Group.is_moderated', array('label' => __('New group members are moderated', true), 'type' => 'checkbox'));12 echo $ form->input('Group.is_shared', array('label' => __('This group is shared and other group members can use this group', true), 'type' => 'checkbox'));8 echo $this->Form->input('Group.name', array('label' => __('Name'))); 9 echo $this->Form->input('Group.description', array('label' => __('Description'), 'type' => 'blob')); 10 echo $this->Form->input('Group.is_hidden', array('label' => __('This group is hidden'), 'type' => 'checkbox')); 11 echo $this->Form->input('Group.is_moderated', array('label' => __('New group members are moderated'), 'type' => 'checkbox')); 12 echo $this->Form->input('Group.is_shared', array('label' => __('This group is shared and other group members can use this group'), 'type' => 'checkbox')); 13 13 ?> 14 14 </fieldset> 15 <?php echo $ form->end(__('Create', true)); ?>15 <?php echo $this->Form->end(__('Create')); ?> 16 16 17 17 <?php … … 21 21 <h1>Create Group</h1> 22 22 23 <?php echo $ session->flash(); ?>24 <?php echo $ form->create(null, array('action' => 'create')); ?>23 <?php echo $this->Session->flash(); ?> 24 <?php echo $this->Form->create(null, array('action' => 'create')); ?> 25 25 26 <fieldset><legend><?php __('Create new group'); ?></legend>26 <fieldset><legend><?php echo __('Create new group'); ?></legend> 27 27 <?php 28 echo $ form->input('Group.name', array('label' => __('Name', true)));29 echo $ form->input('Group.description', array('label' => __('Description', true), 'type' => 'blob'));30 echo $ form->input('Group.is_hidden', array('label' => __('This group is hidden', true), 'type' => 'checkbox'));31 echo $ form->input('Group.is_moderated', array('label' => __('New group members are moderated', true), 'type' => 'checkbox'));32 echo $ form->input('Group.is_shared', array('label' => __('This group is shared and other group members can use this group', true), 'type' => 'checkbox'));28 echo $this->Form->input('Group.name', array('label' => __('Name'))); 29 echo $this->Form->input('Group.description', array('label' => __('Description'), 'type' => 'blob')); 30 echo $this->Form->input('Group.is_hidden', array('label' => __('This group is hidden'), 'type' => 'checkbox')); 31 echo $this->Form->input('Group.is_moderated', array('label' => __('New group members are moderated'), 'type' => 'checkbox')); 32 echo $this->Form->input('Group.is_shared', array('label' => __('This group is shared and other group members can use this group'), 'type' => 'checkbox')); 33 33 ?> 34 34 </fieldset> 35 <?php echo $ form->end(__('Create', true)); ?>35 <?php echo $this->Form->end(__('Create')); ?> 36 36 37 37 <?php … … 41 41 <h1>Create Group</h1> 42 42 43 <?php echo $ session->flash(); ?>44 <?php echo $ form->create(null, array('action' => 'create')); ?>43 <?php echo $this->Session->flash(); ?> 44 <?php echo $this->Form->create(null, array('action' => 'create')); ?> 45 45 46 <fieldset><legend><?php __('Create new group'); ?></legend>46 <fieldset><legend><?php echo __('Create new group'); ?></legend> 47 47 <?php 48 echo $ form->input('Group.name', array('label' => __('Name', true)));49 echo $ form->input('Group.description', array('label' => __('Description', true), 'type' => 'blob'));50 echo $ form->input('Group.is_hidden', array('label' => __('This group is hidden', true), 'type' => 'checkbox'));51 echo $ form->input('Group.is_moderated', array('label' => __('New group members are moderated', true), 'type' => 'checkbox'));52 echo $ form->input('Group.is_shared', array('label' => __('This group is shared and other group members can use this group', true), 'type' => 'checkbox'));48 echo $this->Form->input('Group.name', array('label' => __('Name'))); 49 echo $this->Form->input('Group.description', array('label' => __('Description'), 'type' => 'blob')); 50 echo $this->Form->input('Group.is_hidden', array('label' => __('This group is hidden'), 'type' => 'checkbox')); 51 echo $this->Form->input('Group.is_moderated', array('label' => __('New group members are moderated'), 'type' => 'checkbox')); 52 echo $this->Form->input('Group.is_shared', array('label' => __('This group is shared and other group members can use this group'), 'type' => 'checkbox')); 53 53 ?> 54 54 </fieldset> 55 <?php echo $ form->end(__('Create', true)); ?>55 <?php echo $this->Form->end(__('Create')); ?> 56 56 57 57 <?php … … 61 61 <h1>Create Group</h1> 62 62 63 <?php echo $ session->flash(); ?>64 <?php echo $ form->create(null, array('action' => 'create')); ?>63 <?php echo $this->Session->flash(); ?> 64 <?php echo $this->Form->create(null, array('action' => 'create')); ?> 65 65 66 <fieldset><legend><?php __('Create new group'); ?></legend>66 <fieldset><legend><?php echo __('Create new group'); ?></legend> 67 67 <?php 68 echo $ form->input('Group.name', array('label' => __('Name', true)));69 echo $ form->input('Group.description', array('label' => __('Description', true), 'type' => 'blob'));70 echo $ form->input('Group.is_hidden', array('label' => __('This group is hidden', true), 'type' => 'checkbox'));71 echo $ form->input('Group.is_moderated', array('label' => __('New group members are moderated', true), 'type' => 'checkbox'));72 echo $ form->input('Group.is_shared', array('label' => __('This group is shared and other group members can use this group', true), 'type' => 'checkbox'));68 echo $this->Form->input('Group.name', array('label' => __('Name'))); 69 echo $this->Form->input('Group.description', array('label' => __('Description'), 'type' => 'blob')); 70 echo $this->Form->input('Group.is_hidden', array('label' => __('This group is hidden'), 'type' => 'checkbox')); 71 echo $this->Form->input('Group.is_moderated', array('label' => __('New group members are moderated'), 'type' => 'checkbox')); 72 echo $this->Form->input('Group.is_shared', array('label' => __('This group is shared and other group members can use this group'), 'type' => 'checkbox')); 73 73 ?> 74 74 </fieldset> 75 <?php echo $ form->end(__('Create', true)); ?>75 <?php echo $this->Form->end(__('Create')); ?> 76 76 77 77 <?php … … 81 81 <h1>Create Group</h1> 82 82 83 <?php echo $ session->flash(); ?>84 <?php echo $ form->create(null, array('action' => 'create')); ?>83 <?php echo $this->Session->flash(); ?> 84 <?php echo $this->Form->create(null, array('action' => 'create')); ?> 85 85 86 <fieldset><legend><?php __('Create new group'); ?></legend>86 <fieldset><legend><?php echo __('Create new group'); ?></legend> 87 87 <?php 88 echo $ form->input('Group.name', array('label' => __('Name', true)));89 echo $ form->input('Group.description', array('label' => __('Description', true), 'type' => 'blob'));90 echo $ form->input('Group.is_hidden', array('label' => __('This group is hidden', true), 'type' => 'checkbox'));91 echo $ form->input('Group.is_moderated', array('label' => __('New group members are moderated', true), 'type' => 'checkbox'));92 echo $ form->input('Group.is_shared', array('label' => __('This group is shared and other group members can use this group', true), 'type' => 'checkbox'));88 echo $this->Form->input('Group.name', array('label' => __('Name'))); 89 echo $this->Form->input('Group.description', array('label' => __('Description'), 'type' => 'blob')); 90 echo $this->Form->input('Group.is_hidden', array('label' => __('This group is hidden'), 'type' => 'checkbox')); 91 echo $this->Form->input('Group.is_moderated', array('label' => __('New group members are moderated'), 'type' => 'checkbox')); 92 echo $this->Form->input('Group.is_shared', array('label' => __('This group is shared and other group members can use this group'), 'type' => 'checkbox')); 93 93 ?> 94 94 </fieldset> 95 <?php echo $ form->end(__('Create', true)); ?>95 <?php echo $this->Form->end(__('Create')); ?> 96 96 97 97 <?php … … 101 101 <h1>Create Group</h1> 102 102 103 <?php echo $ session->flash(); ?>104 <?php echo $ form->create(null, array('action' => 'create')); ?>103 <?php echo $this->Session->flash(); ?> 104 <?php echo $this->Form->create(null, array('action' => 'create')); ?> 105 105 106 <fieldset><legend><?php __('Create new group'); ?></legend>106 <fieldset><legend><?php echo __('Create new group'); ?></legend> 107 107 <?php 108 echo $ form->input('Group.name', array('label' => __('Name', true)));109 echo $ form->input('Group.description', array('label' => __('Description', true), 'type' => 'blob'));110 echo $ form->input('Group.is_hidden', array('label' => __('This group is hidden', true), 'type' => 'checkbox'));111 echo $ form->input('Group.is_moderated', array('label' => __('New group members are moderated', true), 'type' => 'checkbox'));112 echo $ form->input('Group.is_shared', array('label' => __('This group is shared and other group members can use this group', true), 'type' => 'checkbox'));108 echo $this->Form->input('Group.name', array('label' => __('Name'))); 109 echo $this->Form->input('Group.description', array('label' => __('Description'), 'type' => 'blob')); 110 echo $this->Form->input('Group.is_hidden', array('label' => __('This group is hidden'), 'type' => 'checkbox')); 111 echo $this->Form->input('Group.is_moderated', array('label' => __('New group members are moderated'), 'type' => 'checkbox')); 112 echo $this->Form->input('Group.is_shared', array('label' => __('This group is shared and other group members can use this group'), 'type' => 'checkbox')); 113 113 ?> 114 114 </fieldset> 115 <?php echo $ form->end(__('Create', true)); ?>115 <?php echo $this->Form->end(__('Create')); ?> 116 116 117 117 <?php -
View/Groups/dashboard_index.ctp
r1a41cea r0fb8d7c 1 <?php echo $ session->flash(); ?>1 <?php echo $this->Session->flash(); ?> 2 2 3 3 <h1>Group Dashboard</h1> … … 7 7 8 8 ?> 9 <?php echo $ session->flash(); ?>9 <?php echo $this->Session->flash(); ?> 10 10 11 11 <h1>Group Dashboard</h1> … … 15 15 16 16 ?> 17 <?php echo $ session->flash(); ?>17 <?php echo $this->Session->flash(); ?> 18 18 19 19 <h1>Group Dashboard</h1> … … 23 23 24 24 ?> 25 <?php echo $ session->flash(); ?>25 <?php echo $this->Session->flash(); ?> 26 26 27 27 <h1>Group Dashboard</h1> … … 31 31 32 32 ?> 33 <?php echo $ session->flash(); ?>33 <?php echo $this->Session->flash(); ?> 34 34 35 35 <h1>Group Dashboard</h1> … … 39 39 40 40 ?> 41 <?php echo $ session->flash(); ?>41 <?php echo $this->Session->flash(); ?> 42 42 43 43 <h1>Group Dashboard</h1> -
View/Groups/dashboard_manage.ctp
r1a41cea r0fb8d7c 1 1 <h1>Group Memberships</h1> 2 2 3 <?php echo $ session->flash(); ?>3 <?php echo $this->Session->flash(); ?> 4 4 5 5 <table class="default"> 6 6 <thead> 7 7 <?php 8 $headers = array(__('Group Name' , true), __('Action', true));9 echo $ html->tableHeaders($headers);8 $headers = array(__('Group Name'), __('Action')); 9 echo $this->Html->tableHeaders($headers); 10 10 ?> 11 11 </thead> … … 17 17 $cells = array(); 18 18 foreach ($allgroup_names as $group_name) { 19 $row = array($ html->link($group_name, "/groups/view/{$group_name}"), $html->link("unsubscribe", "/groups/unsubscribe/{$group_name}"));19 $row = array($this->Html->link($group_name, "/groups/view/{$group_name}"), $this->Html->link("unsubscribe", "/groups/unsubscribe/{$group_name}")); 20 20 $cells[] = $row; 21 21 } 22 22 23 echo $ html->tableCells($cells, array('class' => 'odd'), array('class' => 'even'));23 echo $this->Html->tableCells($cells, array('class' => 'odd'), array('class' => 'even')); 24 24 ?> 25 25 … … 33 33 <h1>Group Memberships</h1> 34 34 35 <?php echo $ session->flash(); ?>35 <?php echo $this->Session->flash(); ?> 36 36 37 37 <table class="default"> 38 38 <thead> 39 39 <?php 40 $headers = array(__('Group Name' , true), __('Action', true));41 echo $ html->tableHeaders($headers);40 $headers = array(__('Group Name'), __('Action')); 41 echo $this->Html->tableHeaders($headers); 42 42 ?> 43 43 </thead> … … 49 49 $cells = array(); 50 50 foreach ($allgroup_names as $group_name) { 51 $row = array($ html->link($group_name, "/groups/view/{$group_name}"), $html->link("unsubscribe", "/groups/unsubscribe/{$group_name}"));51 $row = array($this->Html->link($group_name, "/groups/view/{$group_name}"), $this->Html->link("unsubscribe", "/groups/unsubscribe/{$group_name}")); 52 52 $cells[] = $row; 53 53 } 54 54 55 echo $ html->tableCells($cells, array('class' => 'odd'), array('class' => 'even'));55 echo $this->Html->tableCells($cells, array('class' => 'odd'), array('class' => 'even')); 56 56 ?> 57 57 … … 65 65 <h1>Group Memberships</h1> 66 66 67 <?php echo $ session->flash(); ?>67 <?php echo $this->Session->flash(); ?> 68 68 69 69 <table class="default"> 70 70 <thead> 71 71 <?php 72 $headers = array(__('Group Name' , true), __('Action', true));73 echo $ html->tableHeaders($headers);72 $headers = array(__('Group Name'), __('Action')); 73 echo $this->Html->tableHeaders($headers); 74 74 ?> 75 75 </thead> … … 81 81 $cells = array(); 82 82 foreach ($allgroup_names as $group_name) { 83 $row = array($ html->link($group_name, "/groups/view/{$group_name}"), $html->link("unsubscribe", "/groups/unsubscribe/{$group_name}"));83 $row = array($this->Html->link($group_name, "/groups/view/{$group_name}"), $this->Html->link("unsubscribe", "/groups/unsubscribe/{$group_name}")); 84 84 $cells[] = $row; 85 85 } 86 86 87 echo $ html->tableCells($cells, array('class' => 'odd'), array('class' => 'even'));87 echo $this->Html->tableCells($cells, array('class' => 'odd'), array('class' => 'even')); 88 88 ?> 89 89 … … 97 97 <h1>Group Memberships</h1> 98 98 99 <?php echo $ session->flash(); ?>99 <?php echo $this->Session->flash(); ?> 100 100 101 101 <table class="default"> 102 102 <thead> 103 103 <?php 104 $headers = array(__('Group Name' , true), __('Action', true));105 echo $ html->tableHeaders($headers);104 $headers = array(__('Group Name'), __('Action')); 105 echo $this->Html->tableHeaders($headers); 106 106 ?> 107 107 </thead> … … 113 113 $cells = array(); 114 114 foreach ($allgroup_names as $group_name) { 115 $row = array($ html->link($group_name, "/groups/view/{$group_name}"), $html->link("unsubscribe", "/groups/unsubscribe/{$group_name}"));115 $row = array($this->Html->link($group_name, "/groups/view/{$group_name}"), $this->Html->link("unsubscribe", "/groups/unsubscribe/{$group_name}")); 116 116 $cells[] = $row; 117 117 } 118 118 119 echo $ html->tableCells($cells, array('class' => 'odd'), array('class' => 'even'));119 echo $this->Html->tableCells($cells, array('class' => 'odd'), array('class' => 'even')); 120 120 ?> 121 121 … … 129 129 <h1>Group Memberships</h1> 130 130 131 <?php echo $ session->flash(); ?>131 <?php echo $this->Session->flash(); ?> 132 132 133 133 <table class="default"> 134 134 <thead> 135 135 <?php 136 $headers = array(__('Group Name' , true), __('Action', true));137 echo $ html->tableHeaders($headers);136 $headers = array(__('Group Name'), __('Action')); 137 echo $this->Html->tableHeaders($headers); 138 138 ?> 139 139 </thead> … … 145 145 $cells = array(); 146 146 foreach ($allgroup_names as $group_name) { 147 $row = array($ html->link($group_name, "/groups/view/{$group_name}"), $html->link("unsubscribe", "/groups/unsubscribe/{$group_name}"));147 $row = array($this->Html->link($group_name, "/groups/view/{$group_name}"), $this->Html->link("unsubscribe", "/groups/unsubscribe/{$group_name}")); 148 148 $cells[] = $row; 149 149 } 150 150 151 echo $ html->tableCells($cells, array('class' => 'odd'), array('class' => 'even'));151 echo $this->Html->tableCells($cells, array('class' => 'odd'), array('class' => 'even')); 152 152 ?> 153 153 … … 161 161 <h1>Group Memberships</h1> 162 162 163 <?php echo $ session->flash(); ?>163 <?php echo $this->Session->flash(); ?> 164 164 165 165 <table class="default"> 166 166 <thead> 167 167 <?php 168 $headers = array(__('Group Name' , true), __('Action', true));169 echo $ html->tableHeaders($headers);168 $headers = array(__('Group Name'), __('Action')); 169 echo $this->Html->tableHeaders($headers); 170 170 ?> 171 171 </thead> … … 177 177 $cells = array(); 178 178 foreach ($allgroup_names as $group_name) { 179 $row = array($ html->link($group_name, "/groups/view/{$group_name}"), $html->link("unsubscribe", "/groups/unsubscribe/{$group_name}"));179 $row = array($this->Html->link($group_name, "/groups/view/{$group_name}"), $this->Html->link("unsubscribe", "/groups/unsubscribe/{$group_name}")); 180 180 $cells[] = $row; 181 181 } 182 182 183 echo $ html->tableCells($cells, array('class' => 'odd'), array('class' => 'even'));183 echo $this->Html->tableCells($cells, array('class' => 'odd'), array('class' => 'even')); 184 184 ?> 185 185 -
View/Groups/dashboard_search.ctp
r1a41cea r0fb8d7c 1 <?php echo $ session->flash(); ?>1 <?php echo $this->Session->flash(); ?> 2 2 3 3 <h1>Search Group</h1> 4 4 5 <h2><?php __('Results') ?></h2>5 <h2><?php echo __('Results') ?></h2> 6 6 <ul> 7 7 <?php if(!empty($groups)) { … … 9 9 foreach ($groups as $group) { 10 10 echo "<li>"; 11 echo $ html->link($group['Group']['name'], "/groups/view/{$group['Group']['name']}");11 echo $this->Html->link($group['Group']['name'], "/groups/view/{$group['Group']['name']}"); 12 12 echo "</li>"; 13 13 } … … 16 16 } 17 17 ?> 18 <?php echo $ form->create(null, array('action' => 'search')); ?>18 <?php echo $this->Form->create(null, array('action' => 'search')); ?> 19 19 <?php 20 echo $ form->input('Group.searchquery', array('label' => __('Find Group:', true)));20 echo $this->Form->input('Group.searchquery', array('label' => __('Find Group:'))); 21 21 ?> 22 <?php echo $ form->end(__('Search', true)); ?>22 <?php echo $this->Form->end(__('Search')); ?> 23 23 24 24 </ul> … … 27 27 28 28 ?> 29 <?php echo $ session->flash(); ?>29 <?php echo $this->Session->flash(); ?> 30 30 31 31 <h1>Search Group</h1> 32 32 33 <h2><?php __('Results') ?></h2>33 <h2><?php echo __('Results') ?></h2> 34 34 <ul> 35 35 <?php if(!empty($groups)) { … … 37 37 foreach ($groups as $group) { 38 38 echo "<li>"; 39 echo $ html->link($group['Group']['name'], "/groups/view/{$group['Group']['name']}");39 echo $this->Html->link($group['Group']['name'], "/groups/view/{$group['Group']['name']}"); 40 40 echo "</li>"; 41 41 } … … 44 44 } 45 45 ?> 46 <?php echo $ form->create(null, array('action' => 'search')); ?>46 <?php echo $this->Form->create(null, array('action' => 'search')); ?> 47 47 <?php 48 echo $ form->input('Group.searchquery', array('label' => __('Find Group:', true)));48 echo $this->Form->input('Group.searchquery', array('label' => __('Find Group:'))); 49 49 ?> 50 <?php echo $ form->end(__('Search', true)); ?>50 <?php echo $this->Form->end(__('Search')); ?> 51 51 52 52 </ul> … … 55 55 56 56 ?> 57 <?php echo $ session->flash(); ?>57 <?php echo $this->Session->flash(); ?> 58 58 59 59 <h1>Search Group</h1> 60 60 61 <h2><?php __('Results') ?></h2>61 <h2><?php echo __('Results') ?></h2> 62 62 <ul> 63 63 <?php if(!empty($groups)) { … … 65 65 foreach ($groups as $group) { 66 66 echo "<li>"; 67 echo $ html->link($group['Group']['name'], "/groups/view/{$group['Group']['name']}");67 echo $this->Html->link($group['Group']['name'], "/groups/view/{$group['Group']['name']}"); 68 68 echo "</li>"; 69 69 } … … 72 72 } 73 73 ?> 74 <?php echo $ form->create(null, array('action' => 'search')); ?>74 <?php echo $this->Form->create(null, array('action' => 'search')); ?> 75 75 <?php 76 echo $ form->input('Group.searchquery', array('label' => __('Find Group:', true)));76 echo $this->Form->input('Group.searchquery', array('label' => __('Find Group:'))); 77 77 ?> 78 <?php echo $ form->end(__('Search', true)); ?>78 <?php echo $this->Form->end(__('Search')); ?> 79 79 80 80 </ul> … … 83 83 84 84 ?> 85 <?php echo $ session->flash(); ?>85 <?php echo $this->Session->flash(); ?> 86 86 87 87 <h1>Search Group</h1> 88 88 89 <h2><?php __('Results') ?></h2>89 <h2><?php echo __('Results') ?></h2> 90 90 <ul> 91 91 <?php if(!empty($groups)) { … … 93 93 foreach ($groups as $group) { 94 94 echo "<li>"; 95 echo $ html->link($group['Group']['name'], "/groups/view/{$group['Group']['name']}");95 echo $this->Html->link($group['Group']['name'], "/groups/view/{$group['Group']['name']}"); 96 96 echo "</li>"; 97 97 } … … 100 100 } 101 101 ?> 102 <?php echo $ form->create(null, array('action' => 'search')); ?>102 <?php echo $this->Form->create(null, array('action' => 'search')); ?> 103 103 <?php 104 echo $ form->input('Group.searchquery', array('label' => __('Find Group:', true)));104 echo $this->Form->input('Group.searchquery', array('label' => __('Find Group:'))); 105 105 ?> 106 <?php echo $ form->end(__('Search', true)); ?>106 <?php echo $this->Form->end(__('Search')); ?> 107 107 108 108 </ul> … … 111 111 112 112 ?> 113 <?php echo $ session->flash(); ?>113 <?php echo $this->Session->flash(); ?> 114 114 115 115 <h1>Search Group</h1> 116 116 117 <h2><?php __('Results') ?></h2>117 <h2><?php echo __('Results') ?></h2> 118 118 <ul> 119 119 <?php if(!empty($groups)) { … … 121 121 foreach ($groups as $group) { 122 122 echo "<li>"; 123 echo $ html->link($group['Group']['name'], "/groups/view/{$group['Group']['name']}");123 echo $this->Html->link($group['Group']['name'], "/groups/view/{$group['Group']['name']}"); 124 124 echo "</li>"; 125 125 } … … 128 128 } 129 129 ?> 130 <?php echo $ form->create(null, array('action' => 'search')); ?>130 <?php echo $this->Form->create(null, array('action' => 'search')); ?> 131 131 <?php 132 echo $ form->input('Group.searchquery', array('label' => __('Find Group:', true)));132 echo $this->Form->input('Group.searchquery', array('label' => __('Find Group:'))); 133 133 ?> 134 <?php echo $ form->end(__('Search', true)); ?>134 <?php echo $this->Form->end(__('Search')); ?> 135 135 136 136 </ul> … … 139 139 140 140 ?> 141 <?php echo $ session->flash(); ?>141 <?php echo $this->Session->flash(); ?> 142 142 143 143 <h1>Search Group</h1> 144 144 145 <h2><?php __('Results') ?></h2>145 <h2><?php echo __('Results') ?></h2> 146 146 <ul> 147 147 <?php if(!empty($groups)) { … … 149 149 foreach ($groups as $group) { 150 150 echo "<li>"; 151 echo $ html->link($group['Group']['name'], "/groups/view/{$group['Group']['name']}");151 echo $this->Html->link($group['Group']['name'], "/groups/view/{$group['Group']['name']}"); 152 152 echo "</li>"; 153 153 } … … 156 156 } 157 157 ?> 158 <?php echo $ form->create(null, array('action' => 'search')); ?>158 <?php echo $this->Form->create(null, array('action' => 'search')); ?> 159 159 <?php 160 echo $ form->input('Group.searchquery', array('label' => __('Find Group:', true)));160 echo $this->Form->input('Group.searchquery', array('label' => __('Find Group:'))); 161 161 ?> 162 <?php echo $ form->end(__('Search', true)); ?>162 <?php echo $this->Form->end(__('Search')); ?> 163 163 164 164 </ul> -
View/Groups/edit.ctp
r1a41cea r0fb8d7c 1 <h1><?php printf(__('Group: %s', true), $this->data['Group']['name']); ?></h1>1 <h1><?php echo __('Group: %s', $this->data['Group']['name']); ?></h1> 2 2 3 <?php echo $ session->flash() ?>3 <?php echo $this->Session->flash() ?> 4 4 5 <?php echo $ form->create(null, array('action' => "edit/{$this->data['Group']['name']}")); ?>5 <?php echo $this->Form->create(null, array('action' => "edit/{$this->data['Group']['name']}")); ?> 6 6 7 <fieldset><legend><?php __('Edit Group'); ?></legend>7 <fieldset><legend><?php echo __('Edit Group'); ?></legend> 8 8 <?php 9 echo $ form->hidden('Group.id');10 echo $ form->input('Group.name', array('label' => __('Name', true)));11 echo $ form->input('Group.description', array('label' => __('Description', true), 'type' => 'blob'));12 echo $ form->input('Group.is_hidden', array('label' => __('This group is hidden', true), 'type' => 'checkbox'));13 echo $ form->input('Group.is_moderated', array('label' => __('New group members require a confirmation by the moderator', true), 'type' => 'checkbox'));14 echo $ form->input('Group.is_shared', array('label' => __('The group can be used by other members', true), 'type' => 'checkbox'));9 echo $this->Form->hidden('Group.id'); 10 echo $this->Form->input('Group.name', array('label' => __('Name'))); 11 echo $this->Form->input('Group.description', array('label' => __('Description'), 'type' => 'blob')); 12 echo $this->Form->input('Group.is_hidden', array('label' => __('This group is hidden'), 'type' => 'checkbox')); 13 echo $this->Form->input('Group.is_moderated', array('label' => __('New group members require a confirmation by the moderator'), 'type' => 'checkbox')); 14 echo $this->Form->input('Group.is_shared', array('label' => __('The group can be used by other members'), 'type' => 'checkbox')); 15 15 ?> 16 16 </fieldset> 17 <?php echo $ form->end(__('Save', true)); ?>17 <?php echo $this->Form->end(__('Save')); ?> -
View/Groups/index.ctp
r1a41cea r0fb8d7c 1 <h1><?php __('Groups'); ?></h1>1 <h1><?php echo __('Groups'); ?></h1> 2 2 3 <?php echo $ session->flash(); ?>3 <?php echo $this->Session->flash(); ?> 4 4 5 5 <?php if (!empty($this->data)): ?> … … 8 8 <?php 9 9 $headers = array( 10 __('Name' , true),11 __('From User' , true),12 __('Description' , true),13 __('Members' , true),14 __('Actions' , true));15 echo $ html->tableHeaders($headers);10 __('Name'), 11 __('From User'), 12 __('Description'), 13 __('Members'), 14 __('Actions')); 15 echo $this->Html->tableHeaders($headers); 16 16 ?> 17 17 </thead> … … 28 28 if ($currentUser['User']['id'] != $group['Group']['user_id']) { 29 29 if (!in_array($group['Group']['id'], $memberIds)) { 30 $actions[] = $ html->link(31 $ html->image('icons/group_add.png', array('alt' => __('Subscribe', true), 'title' => __('Subscribe', true))),30 $actions[] = $this->Html->link( 31 $this->Html->image('icons/group_add.png', array('alt' => __('Subscribe'), 'title' => __('Subscribe'))), 32 32 "subscribe/{$group['Group']['name']}", array('escape' => false)); 33 33 } else { 34 $actions[] = $ html->link(35 $ html->image('icons/group_delete.png', array('alt' => __('Unsubscribe', true), 'title' => __('Unsubscribe', true))),34 $actions[] = $this->Html->link( 35 $this->Html->image('icons/group_delete.png', array('alt' => __('Unsubscribe'), 'title' => __('Unsubscribe'))), 36 36 "unsubscribe/{$group['Group']['name']}", array('escape' => false)); 37 37 } … … 39 39 40 40 if (in_array($group['Group']['id'], $myGroupIds) || $isAdmin) { 41 $actions[] = $ html->link(42 $ html->image('icons/pencil.png', array('alt' => __('Edit', true), 'title' => __('Edit', true))),41 $actions[] = $this->Html->link( 42 $this->Html->image('icons/pencil.png', array('alt' => __('Edit'), 'title' => __('Edit'))), 43 43 "edit/{$group['Group']['name']}", array('escape' => false)); 44 $delConfirm = sprintf(__("Do you realy want to delete the group '%s'?", true), $group['Group']['name']);45 $actions[] = $ html->link(46 $ html->image('icons/delete.png', array('alt' => __('Delete', true), 'title' => __('Delete', true))),44 $delConfirm = __("Do you realy want to delete the group '%s'?", $group['Group']['name']); 45 $actions[] = $this->Html->link( 46 $this->Html->image('icons/delete.png', array('alt' => __('Delete'), 'title' => __('Delete'))), 47 47 'delete/'.$group['Group']['id'], array('escape' => false), $delConfirm); 48 48 } 49 49 $row = array( 50 $ html->link($group['Group']['name'], "view/{$group['Group']['name']}", array('title' => $group['Group']['description'])),51 $ html->link($group['User']['username'], "/users/view/{$group['User']['username']}"),50 $this->Html->link($group['Group']['name'], "view/{$group['Group']['name']}", array('title' => $group['Group']['description'])), 51 $this->Html->link($group['User']['username'], "/users/view/{$group['User']['username']}"), 52 52 $text->truncate($group['Group']['description'], 30, array('ending' => '...', 'exact' => false, 'html' => false)), 53 53 count($group['Member']), 54 $ html->tag('div', implode(' ', $actions), array('class' => 'actionlist'))54 $this->Html->tag('div', implode(' ', $actions), array('class' => 'actionlist')) 55 55 ); 56 56 $cells[] = $row; 57 57 } 58 echo $ html->tableCells($cells, array('class' => 'odd'), array('class' => 'even'));58 echo $this->Html->tableCells($cells, array('class' => 'odd'), array('class' => 'even')); 59 59 ?> 60 60 </tbody> … … 62 62 <?php else: ?> 63 63 <div class="info"> 64 <?php __('Currently no image groups are assigned. At the one hand each image could be assigned to a specific group. On the other hand a guest can be member of a set of groups. The guest is than able to view the images from his groups.'); ?>64 <?php echo __('Currently no image groups are assigned. At the one hand each image could be assigned to a specific group. On the other hand a guest can be member of a set of groups. The guest is than able to view the images from his groups.'); ?> 65 65 </div> 66 66 <?php endif; ?> -
View/Groups/listmembers.ctp
r1a41cea r0fb8d7c 1 <h1><?php printf(__('Group %s', true), $this->data['Group']['name']); ?></h1>1 <h1><?php echo __('Group %s', $this->data['Group']['name']); ?></h1> 2 2 3 <?php echo $ session->flash() ?>3 <?php echo $this->Session->flash() ?> 4 4 5 <h2><?php __('Member List'); ?></h2>5 <h2><?php echo __('Member List'); ?></h2> 6 6 <table class="default"> 7 7 <thead> 8 8 <?php 9 9 $headers = array( 10 __('Member' , true),10 __('Member'), 11 11 ); 12 12 if ($this->data['Group']['is_admin']) { 13 $headers[] = __('Action' , true);13 $headers[] = __('Action'); 14 14 } 15 echo $ html->tableHeaders($headers);15 echo $this->Html->tableHeaders($headers); 16 16 ?> 17 17 </thead> … … 23 23 $actions = array(); 24 24 if ($this->data['Group']['is_admin']) { 25 $actions[] = $ html->link(26 $ html->image('icons/delete.png',25 $actions[] = $this->Html->link( 26 $this->Html->image('icons/delete.png', 27 27 array( 28 'alt' => __('Delete' , true),29 'title' => sprintf(__("Unsubscribe '%s'", true), $member['username'])28 'alt' => __('Delete'), 29 'title' => __("Unsubscribe '%s'", $member['username']) 30 30 ) 31 31 ), "deleteMember/{$this->data['Group']['name']}/{$member['username']}", array('escape' => false)); 32 32 } 33 33 $row = array( 34 $ html->link($member['username'], "/users/view/{$member['username']}"),34 $this->Html->link($member['username'], "/users/view/{$member['username']}"), 35 35 ); 36 36 if ($actions) { … … 39 39 $cells[] = $row; 40 40 } 41 echo $ html->tableCells($cells, array('class' => 'odd'), array('class' => 'even'));41 echo $this->Html->tableCells($cells, array('class' => 'odd'), array('class' => 'even')); 42 42 ?> 43 43 </tbody> -
View/Groups/view.ctp
r1a41cea r0fb8d7c 1 <h1><?php printf(__('Group %s', true), $this->data['Group']['name']); ?></h1>1 <h1><?php echo __('Group %s', $this->data['Group']['name']); ?></h1> 2 2 3 <?php echo $ session->flash() ?>3 <?php echo $this->Session->flash() ?> 4 4 5 <h2><?php __('Details'); ?></h2>5 <h2><?php echo __('Details'); ?></h2> 6 6 7 <h3><?php __('Description'); ?></h3>7 <h3><?php echo __('Description'); ?></h3> 8 8 9 9 <p><?php … … 14 14 } ?></p> 15 15 <p><?php 16 printf(__("The group is owned by user %s and has %d media in total.", true), $html->link($this->data['User']['username'], "/users/view/{$this->data['User']['username']}"), $mediaCount);16 __("The group is owned by user %s and has %d media in total.", $this->Html->link($this->data['User']['username'], "/users/view/{$this->data['User']['username']}"), $mediaCount); 17 17 if ($this->data['Group']['is_admin']) { 18 echo ' ' . $ html->link(__('Edit', true), "edit/{$this->data['Group']['name']}");18 echo ' ' . $this->Html->link(__('Edit'), "edit/{$this->data['Group']['name']}"); 19 19 } 20 20 ?></p> … … 22 22 <ul class="bare"> 23 23 <?php 24 $iconYes = $ html->image('icons/accept.png', array('alt' => '+', 'title' => '+')) . ' ';25 $iconNo = $ html->image('icons/delete.png', array('alt' => '-', 'title' => '-')) . ' ';24 $iconYes = $this->Html->image('icons/accept.png', array('alt' => '+', 'title' => '+')) . ' '; 25 $iconNo = $this->Html->image('icons/delete.png', array('alt' => '-', 'title' => '-')) . ' '; 26 26 if ($this->data['Group']['is_hidden']) { 27 echo $ html->tag('li', $iconNo . __("The group is hidden", true));27 echo $this->Html->tag('li', $iconNo . __("The group is hidden")); 28 28 } else { 29 echo $ html->tag('li', $iconYes . __("The group is shown with the media", true));29 echo $this->Html->tag('li', $iconYes . __("The group is shown with the media")); 30 30 } 31 31 if ($this->data['Group']['is_moderated']) { 32 echo $ html->tag('li', $iconNo . __("The group subscription requires a confirmation", true));32 echo $this->Html->tag('li', $iconNo . __("The group subscription requires a confirmation")); 33 33 } else { 34 echo $ html->tag('li', $iconYes . __("The group subscription is free and does not need a confirmation", true));34 echo $this->Html->tag('li', $iconYes . __("The group subscription is free and does not need a confirmation")); 35 35 } 36 36 if ($this->data['Group']['is_shared']) { 37 echo $ html->tag('li', $iconYes . __("This group is shared and can be used by other members", true));37 echo $this->Html->tag('li', $iconYes . __("This group is shared and can be used by other members")); 38 38 } else { 39 echo $ html->tag('li', $iconNo . __("This group is not shared", true));39 echo $this->Html->tag('li', $iconNo . __("This group is not shared")); 40 40 } 41 41 ?> 42 42 </ul> 43 43 44 <h2><?php __('Member List'); ?></h2>44 <h2><?php echo __('Member List'); ?></h2> 45 45 <table class="default"> 46 46 <thead> 47 47 <?php 48 48 $headers = array( 49 __('Member' , true),49 __('Member'), 50 50 ); 51 51 if ($this->data['Group']['is_admin']) { 52 $headers[] = __('Action' , true);52 $headers[] = __('Action'); 53 53 } 54 echo $ html->tableHeaders($headers);54 echo $this->Html->tableHeaders($headers); 55 55 ?> 56 56 </thead> … … 62 62 $actions = array(); 63 63 if ($this->data['Group']['is_admin']) { 64 $actions[] = $ html->link(65 $ html->image('icons/delete.png',64 $actions[] = $this->Html->link( 65 $this->Html->image('icons/delete.png', 66 66 array( 67 'alt' => __('Delete' , true),68 'title' => sprintf(__("Unsubscribe '%s'", true), $member['username'])67 'alt' => __('Delete'), 68 'title' => __("Unsubscribe '%s'", $member['username']) 69 69 ) 70 70 ), "deleteMember/{$this->data['Group']['name']}/{$member['username']}", array('escape' => false)); 71 71 } 72 72 $row = array( 73 $ html->link($member['username'], "/users/view/{$member['username']}"),73 $this->Html->link($member['username'], "/users/view/{$member['username']}"), 74 74 ); 75 75 if ($actions) { … … 78 78 $cells[] = $row; 79 79 } 80 echo $ html->tableCells($cells, array('class' => 'odd'), array('class' => 'even'));80 echo $this->Html->tableCells($cells, array('class' => 'odd'), array('class' => 'even')); 81 81 ?> 82 82 </tbody> … … 85 85 <?php 86 86 if ($this->data['Group']['is_admin']) { 87 echo $ form->create('Group', array('action' => 'addMember'));88 echo "<fieldset><legend>" . __("Add user" , true) . "</legend>";89 echo $ form->input('Member.new', array('label' => __("Username", true), 'secure' => false));87 echo $this->Form->create('Group', array('action' => 'addMember')); 88 echo "<fieldset><legend>" . __("Add user") . "</legend>"; 89 echo $this->Form->input('Member.new', array('label' => __("Username"), 'secure' => false)); 90 90 echo "</fieldset>"; 91 echo $ html->tag('ul',92 $ html->tag('li', $form->submit(__('Add', true)), array('escape' => false)),91 echo $this->Html->tag('ul', 92 $this->Html->tag('li', $this->Form->submit(__('Add')), array('escape' => false)), 93 93 array('class' => 'buttons', 'escape' => false)); 94 echo $ form->end();94 echo $this->Form->end(); 95 95 } else { 96 96 $userId = $this->Session->read('User.id'); 97 97 $memberIds = Set::extract('/Member/id', $this->data); 98 98 if (in_array($userId, $memberIds)) { 99 echo $ html->link(__('Unsubscribe', true), "unsubscribe/{$this->data['Group']['name']}");99 echo $this->Html->link(__('Unsubscribe'), "unsubscribe/{$this->data['Group']['name']}"); 100 100 } else { 101 echo $ html->link(__('Subscribe', true), "subscribe/{$this->data['Group']['name']}");101 echo $this->Html->link(__('Subscribe'), "subscribe/{$this->data['Group']['name']}"); 102 102 } 103 103 } … … 105 105 106 106 <?php if ($media): ?> 107 <h2><?php __("Recent Media"); ?></h2>107 <h2><?php echo __("Recent Media"); ?></h2> 108 108 <p><?php 109 109 foreach($media as $m) { 110 echo $ imageData->mediaLink($m, 'mini');110 echo $this->ImageData->mediaLink($m, 'mini'); 111 111 } 112 112 ?></p> 113 <p><?php printf(__('See all media of the group %s', true), $html->link($this->data['Group']['name'], "/explorer/group/{$this->data['Group']['name']}")); ?></p>113 <p><?php echo __('See all media of the group %s', $this->Html->link($this->data['Group']['name'], "/explorer/group/{$this->data['Group']['name']}")); ?></p> 114 114 <?php endif; ?> -
View/Guests/create.ctp
r1a41cea r0fb8d7c 1 <h1><?php __('Guest Creation'); ?></h1>1 <h1><?php echo __('Guest Creation'); ?></h1> 2 2 3 <?php echo $ session->flash(); ?>3 <?php echo $this->Session->flash(); ?> 4 4 5 <?php echo $ form->create('Guest', array('action' => 'create')); ?>5 <?php echo $this->Form->create('Guest', array('action' => 'create')); ?> 6 6 7 <fieldset><legend><?php __('Create new guest account'); ?></legend>7 <fieldset><legend><?php echo __('Create new guest account'); ?></legend> 8 8 <?php 9 echo $ form->input('Guest.username', array('label' => __('Username', true)));10 echo $ form->input('Guest.email', array('label' => __('Email', true)));11 echo $ form->input('Guest.password', array('label' => __('Password', true)));12 echo $ form->input('Guest.confirm', array('type' => 'password', 'label' => __('Confirm', true)));9 echo $this->Form->input('Guest.username', array('label' => __('Username'))); 10 echo $this->Form->input('Guest.email', array('label' => __('Email'))); 11 echo $this->Form->input('Guest.password', array('label' => __('Password'))); 12 echo $this->Form->input('Guest.confirm', array('type' => 'password', 'label' => __('Confirm'))); 13 13 ?> 14 14 </fieldset> 15 <?php echo $ form->end(__('Create', true)); ?>15 <?php echo $this->Form->end(__('Create')); ?> -
View/Guests/edit.ctp
r1a41cea r0fb8d7c 1 <h1><?php printf(__('Guest: %s', true), $this->data['Guest']['username']); ?></h1>1 <h1><?php echo __('Guest: %s', $this->data['Guest']['username']); ?></h1> 2 2 3 <?php echo $ session->flash(); ?>3 <?php echo $this->Session->flash(); ?> 4 4 5 <?php echo $ form->create(null, array('action' => 'edit/'.$this->data['Guest']['id']));?>6 <fieldset><legend><?php __('Guest'); ?></legend>5 <?php echo $this->Form->create(null, array('action' => 'edit/'.$this->data['Guest']['id']));?> 6 <fieldset><legend><?php echo __('Guest'); ?></legend> 7 7 <?php 8 echo $ form->input('Guest.email', array('label' => __('Email', true)));9 echo $ form->input('Guest.expires', array('type' => 'text', 'label' => __('Expires', true)));10 echo $ form->input('Guest.webdav', array('type' => 'checkbox', 'checked' => ($this->data['Guest']['quota'] > 0 ? 'checked' : ''), 'label' => __('Enable WebDAV access', true)));8 echo $this->Form->input('Guest.email', array('label' => __('Email'))); 9 echo $this->Form->input('Guest.expires', array('type' => 'text', 'label' => __('Expires'))); 10 echo $this->Form->input('Guest.webdav', array('type' => 'checkbox', 'checked' => ($this->data['Guest']['quota'] > 0 ? 'checked' : ''), 'label' => __('Enable WebDAV access'))); 11 11 ?> 12 12 </fieldset> 13 <fieldset><legend><?php __('Password'); ?></legend>13 <fieldset><legend><?php echo __('Password'); ?></legend> 14 14 <?php 15 echo $ form->input('Guest.password', array('label' => __('Password', true)));16 echo $ form->input('Guest.confirm', array('type' => 'password', 'label' => __('Confirm', true)));15 echo $this->Form->input('Guest.password', array('label' => __('Password'))); 16 echo $this->Form->input('Guest.confirm', array('type' => 'password', 'label' => __('Confirm'))); 17 17 ?> 18 18 </fieldset> 19 <fieldset><legend><?php __('Comments'); ?></legend>19 <fieldset><legend><?php echo __('Comments'); ?></legend> 20 20 <?php 21 21 $options = array( 22 0 => __('None' , true),23 1 => __('Name' , true),24 3 => __('Name and captcha' , true)22 0 => __('None'), 23 1 => __('Name'), 24 3 => __('Name and captcha') 25 25 ); 26 26 $select = $this->data['Comment']['auth']; 27 27 echo '<div class="input select">'; 28 echo $ form->label(null, __('Authentication', true));29 echo $ form->select('Comment.auth', $options, $select, array('empty' => false));28 echo $this->Form->label(null, __('Authentication')); 29 echo $this->Form->select('Comment.auth', $options, $select, array('empty' => false)); 30 30 echo '</div>'; 31 31 ?> 32 32 </fieldset> 33 <?php echo $ form->submit(__('Save', true)); ?>33 <?php echo $this->Form->submit(__('Save')); ?> 34 34 </form> 35 35 36 36 <?php if(count($this->data['Member'])): ?> 37 <h2><?php __('Group List'); ?></h2>37 <h2><?php echo __('Group List'); ?></h2> 38 38 <table class="default"> 39 39 <thead> 40 40 <?php 41 41 $headers = array( 42 __('Group' , true),43 __('Actions' , true)42 __('Group'), 43 __('Actions') 44 44 ); 45 echo $ html->tableHeaders($headers);45 echo $this->Html->tableHeaders($headers); 46 46 ?> 47 47 </thead> … … 51 51 $cells = array(); 52 52 foreach($this->data['Member'] as $group) { 53 $delConfirm = sprintf(__("Do you really want to delete the group '%s' from this guest '%s'?", true), $group['name'], $this->data['Guest']['username']);53 $delConfirm = __("Do you really want to delete the group '%s' from this guest '%s'?", $group['name'], $this->data['Guest']['username']); 54 54 $cells[] = array( 55 $ html->link($group['name'], '/groups/view/'.$group['name']),56 $ html->link(57 $ html->image('icons/delete.png', array('alt' => 'Delete', 'title' => 'Delete')),55 $this->Html->link($group['name'], '/groups/view/'.$group['name']), 56 $this->Html->link( 57 $this->Html->image('icons/delete.png', array('alt' => 'Delete', 'title' => 'Delete')), 58 58 '/guests/deleteGroup/'.$this->data['Guest']['id'].'/'.$group['id'], array('escape' => false), $delConfirm) 59 59 ); 60 60 } 61 echo $ html->tableCells($cells, array('class' => 'odd'), array('class' => 'even'));61 echo $this->Html->tableCells($cells, array('class' => 'odd'), array('class' => 'even')); 62 62 ?> 63 63 </tbody> 64 64 </table> 65 65 <?php else: ?> 66 <div class="info"><?php __('Currently this guest account has no assigned groups. Please add groups to grant access to your personal images.'); ?></div>66 <div class="info"><?php echo __('Currently this guest account has no assigned groups. Please add groups to grant access to your personal images.'); ?></div> 67 67 <?php endif; ?> 68 68 69 <?php echo $ form->create(null, array('action' => 'addGroup/'.$this->data['Guest']['id']));?>70 <fieldset><legend><?php __('Group Assignements'); ?></legend>71 <div class="input"><label><?php __('Group'); ?></label>69 <?php echo $this->Form->create(null, array('action' => 'addGroup/'.$this->data['Guest']['id']));?> 70 <fieldset><legend><?php echo __('Group Assignements'); ?></legend> 71 <div class="input"><label><?php echo __('Group'); ?></label> 72 72 <?php echo $ajax->autocomplete('Group.name', '/guests/autocomplete'); ?></div> 73 73 </fieldset> 74 <?php echo $ form->submit(__('Add Group', true)); ?>74 <?php echo $this->Form->submit(__('Add Group')); ?> 75 75 </form> 76 76 -
View/Guests/index.ctp
r1a41cea r0fb8d7c 1 <h1><?php __('Guests'); ?></h1>1 <h1><?php echo __('Guests'); ?></h1> 2 2 3 <?php echo $ session->flash(); ?>3 <?php echo $this->Session->flash(); ?> 4 4 5 5 <?php if (!empty($this->data)): ?> … … 7 7 <thead> 8 8 <tr> 9 <td><?php __('Name'); ?></td>10 <td><?php __('Groups'); ?></td>11 <td><?php __('Actions'); ?></td>9 <td><?php echo __('Name'); ?></td> 10 <td><?php echo __('Groups'); ?></td> 11 <td><?php echo __('Actions'); ?></td> 12 12 </tr> 13 13 </thead> … … 16 16 <?php $row=0; foreach($this->data as $guest): ?> 17 17 <tr class="<?php echo ($row++%2)?"even":"odd";?>"> 18 <td><?php echo $ html->link($guest['Guest']['username'], 'edit/'.$guest['Guest']['id']); ?></td>18 <td><?php echo $this->Html->link($guest['Guest']['username'], 'edit/'.$guest['Guest']['id']); ?></td> 19 19 <td><?php echo count($guest['Member']);?></td> 20 20 <td><div class="actionlist"><?php 21 21 $delConfirm = "Do you realy want to delete the guest account '{$guest['Guest']['username']}'?"; 22 echo $ html->link(23 $ html->image('icons/pencil.png', array('alt' => 'Edit', 'title' => __('Edit', true))),22 echo $this->Html->link( 23 $this->Html->image('icons/pencil.png', array('alt' => 'Edit', 'title' => __('Edit'))), 24 24 'edit/'.$guest['Guest']['id'], array('escape' => false)).' '. 25 $ html->link(26 $ html->image('icons/delete.png', array('alt' => 'Delete', 'title' => __('Delete', true))),25 $this->Html->link( 26 $this->Html->image('icons/delete.png', array('alt' => 'Delete', 'title' => __('Delete'))), 27 27 'delete/'.$guest['Guest']['id'], array('escape' => false), $delConfirm); ?> 28 28 </div></td> … … 33 33 <?php else: ?> 34 34 <div class="info"> 35 <?php __('Currently, no guest accounts are set. You can create guests accounts to grant access to your images e.g. to your friends or family. Please add also some groups to the guest to grant access to this guest for these groups.'); ?>35 <?php echo __('Currently, no guest accounts are set. You can create guests accounts to grant access to your images e.g. to your friends or family. Please add also some groups to the guest to grant access to this guest for these groups.'); ?> 36 36 </div> 37 37 <?php endif; ?> -
View/Guests/links.ctp
r1a41cea r0fb8d7c 1 <h1><?php __('Authenticated Links'); ?></h1>1 <h1><?php echo __('Authenticated Links'); ?></h1> 2 2 3 3 <div class="info"> 4 <?php __('Following links contains an authentication key which should be used carefully. Copy the links with with right mouse click and select <i>Copy link address</i>.'); ?></i>4 <?php echo __('Following links contains an authentication key which should be used carefully. Copy the links with with right mouse click and select <i>Copy link address</i>.'); ?></i> 5 5 </div> 6 6 7 <p><?php __('The links are valid for the current session. For permanent login the user has to login via username and password.'); ?></p>7 <p><?php echo __('The links are valid for the current session. For permanent login the user has to login via username and password.'); ?></p> 8 8 9 <h2><?php __('Direct Link'); ?></h2>9 <h2><?php echo __('Direct Link'); ?></h2> 10 10 11 11 <p><?php echo __('Following link provides a direct link to <i>My Photos</i> of the guest which omits the login with username and password.'); ?></p> … … 15 15 ?> 16 16 <ul> 17 <li><?php printf(__('My Media of Guest %s (Link %s)', true), $html->link($this->data['Guest']['username'], $myMedia), '<code>' . $myMedia . '</code>'); ?></li>17 <li><?php echo __('My Media of Guest %s (Link %s)', $this->Html->link($this->data['Guest']['username'], $myMedia, '<code>' . $myMedia . '</code>'); ?></li> 18 18 </ul> 19 19 20 20 21 <h2><?php __('RSS'); ?></h2>21 <h2><?php echo __('RSS'); ?></h2> 22 22 23 <p><?php __('Following links provide a authenticated RSS and Media RSS links.'); ?></p>23 <p><?php echo __('Following links provide a authenticated RSS and Media RSS links.'); ?></p> 24 24 <?php 25 25 $recentMedia = Router::url('/explorer/rss/key:'.$this->data['Guest']['key'], true); … … 29 29 ?> 30 30 <ul> 31 <li><?php echo $ html->link(__('Recent Media', true), $recentMedia); ?> (Link: <code><?php echo $recentMedia; ?></code>)</li>32 <li><?php echo $ html->link(__('Recent Comments', true), $recentComments); ?> (Link: <code><?php echo $recentComments; ?></code>)</li>33 <li><?php echo $ html->link(__('Media RSS', true), $mediaRss); ?> (Link: <code><?php echo $mediaRss; ?></code>)</li>34 <li><?php echo $ html->link(__('Media RSS of My Media', true), $myMediaMediaRss); ?> (Link: <code><?php echo $myMediaMediaRss; ?></code>)</li>31 <li><?php echo $this->Html->link(__('Recent Media'), $recentMedia); ?> (Link: <code><?php echo $recentMedia; ?></code>)</li> 32 <li><?php echo $this->Html->link(__('Recent Comments'), $recentComments); ?> (Link: <code><?php echo $recentComments; ?></code>)</li> 33 <li><?php echo $this->Html->link(__('Media RSS'), $mediaRss); ?> (Link: <code><?php echo $mediaRss; ?></code>)</li> 34 <li><?php echo $this->Html->link(__('Media RSS of My Media'), $myMediaMediaRss); ?> (Link: <code><?php echo $myMediaMediaRss; ?></code>)</li> 35 35 </ul> 36 36 37 <p><?php printf(__('Click %s to renew the authentication key. All previous links become invalid.', true), $html->link(__('renew key', true), 'links/'.$this->data['Guest']['id'].'/renew')); ?></p>37 <p><?php echo __('Click %s to renew the authentication key. All previous links become invalid.', $this->Html->link(__('renew key'), 'links/'.$this->data['Guest']['id'].'/renew')); ?></p> -
View/Helper/BreadcrumbHelper.php
r1a41cea r0fb8d7c 179 179 180 180 return $this->Html->tag('ul', 181 $this->Html->tag('li', $this->Html->tag('span', __('Filter' , true)), array('class' => 'p-breadcrumb-header', 'escape' => false))181 $this->Html->tag('li', $this->Html->tag('span', __('Filter')), array('class' => 'p-breadcrumb-header', 'escape' => false)) 182 182 .implode("\n", $links) 183 183 .$this->Html->tag('li', $form, array('class' => 'p-breadcrumb-input'), array('escape' => false)), -
View/Helper/ExplorerMenuHelper.php
r1a41cea r0fb8d7c 60 60 $extra = " <div class=\"actionlist\" id=\"$id\">"; 61 61 $link = "javascript:startSlideshow('high');"; 62 $icon = $this->Html->image('icons/star.png', array('alt' => 'high', 'title' => __("Show media in high quality (if available)" , true)));62 $icon = $this->Html->image('icons/star.png', array('alt' => 'high', 'title' => __("Show media in high quality (if available)"))); 63 63 $extra .= $this->Html->link($icon, $link, array('escape' => false)); 64 64 $extra .= "</div>"; 65 65 66 $text = $this->Html->link(__('Start Slideshow' , true), "javascript:startSlideshow('');", array('escape' => false));66 $text = $this->Html->link(__('Start Slideshow'), "javascript:startSlideshow('');", array('escape' => false)); 67 67 $item = array( 68 68 'text' => $text.$extra, … … 123 123 function _getOrderItem() { 124 124 $link = $this->Search->getUri(false, array('sort' => 'date'), 'page'); 125 $out = $this->Html->link(__("Order" , true), $link);125 $out = $this->Html->link(__("Order"), $link); 126 126 127 127 $id = 'order-item'; … … 129 129 $crumbs = $this->Breadcrumb->filterCrumbs($this->params['crumbs']); 130 130 131 $icon = $this->Html->image('icons/date_previous.png', array('alt' => __('date asc', true), 'title' => __("Show oldest first" , true)));131 $icon = $this->Html->image('icons/date_previous.png', array('alt' => __('date asc', true), 'title' => __("Show oldest first"))); 132 132 $link = $this->Breadcrumb->crumbUrl($this->Breadcrumb->replace($crumbs, 'sort', '-date')); 133 133 $out .= $this->Html->link($icon, $link, array('escape' => false)); 134 134 135 $icon = $this->Html->image('icons/add.png', array('alt' => __('newest', true), 'title' => __("Show newest first" , true)));135 $icon = $this->Html->image('icons/add.png', array('alt' => __('newest', true), 'title' => __("Show newest first"))); 136 136 $link = $this->Breadcrumb->crumbUrl($this->Breadcrumb->replace($crumbs, 'sort', 'newest')); 137 137 $out .= $this->Html->link($icon, $link, array('escape' => false)); 138 138 139 $icon = $this->Html->image('icons/heart.png', array('alt' => __('pouplarity', true), 'title' => __("Show popular first" , true)));139 $icon = $this->Html->image('icons/heart.png', array('alt' => __('pouplarity', true), 'title' => __("Show popular first"))); 140 140 $link = $this->Breadcrumb->crumbUrl($this->Breadcrumb->replace($crumbs, 'sort', 'popularity')); 141 141 $out .= $this->Html->link($icon, $link, array('escape' => false)); 142 142 143 $icon = $this->Html->image('icons/images.png', array('alt' => __('random', true), 'title' => __("Show random order" , true)));143 $icon = $this->Html->image('icons/images.png', array('alt' => __('random', true), 'title' => __("Show random order"))); 144 144 $link = $this->Breadcrumb->crumbUrl($this->Breadcrumb->replace($crumbs, 'sort', 'random')); 145 145 $out .= $this->Html->link($icon, $link, array('escape' => false)); 146 146 147 $icon = $this->Html->image('icons/pencil.png', array('alt' => __('Changes', true), 'title' => __("Show changes first" , true)));147 $icon = $this->Html->image('icons/pencil.png', array('alt' => __('Changes', true), 'title' => __("Show changes first"))); 148 148 $link = $this->Breadcrumb->crumbUrl($this->Breadcrumb->replace($crumbs, 'sort', 'changes')); 149 149 $out .= $this->Html->link($icon, $link, array('escape' => false)); 150 150 151 $icon = $this->Html->image('icons/eye.png', array('alt' => __('Views', true), 'title' => __("Show last views first" , true)));151 $icon = $this->Html->image('icons/eye.png', array('alt' => __('Views', true), 'title' => __("Show last views first"))); 152 152 $link = $this->Breadcrumb->crumbUrl($this->Breadcrumb->replace($crumbs, 'sort', 'viewed')); 153 153 $out .= $this->Html->link($icon, $link, array('escape' => false)); 154 154 155 $icon = $this->Html->image('icons/folder_go.png', array('alt' => __('Name', true), 'title' => __("Order by name" , true)));155 $icon = $this->Html->image('icons/folder_go.png', array('alt' => __('Name', true), 'title' => __("Order by name"))); 156 156 $link = $this->Search->getUri(false, array('sort' => 'name'), 'page'); 157 157 $out .= $this->Html->link($icon, $link, array('escape' => false)); … … 172 172 173 173 $link = $this->Breadcrumb->crumbUrl($this->Breadcrumb->replace($crumbs, 'show', 12)); 174 $out = $this->Html->link(__("Pagesize" , true), $link);174 $out = $this->Html->link(__("Pagesize"), $link); 175 175 176 176 $pos = $this->Search->getPage(1) * $this->Search->getShow(1); … … 205 205 206 206 $search = '/explorer/search'; 207 $items[] = array('text' => $this->Html->link(__('Advanced Search' , true), $search));207 $items[] = array('text' => $this->Html->link(__('Advanced Search'), $search)); 208 208 209 209 $items[] = $this->_getSlideshowItem(); … … 212 212 $subMenu = $this->_getAssociationSubMenu('tag'); 213 213 if ($subMenu !== false) { 214 $items[] = array('text' => __('Tags' , true), 'type' => 'text', 'submenu' => array('items' => $subMenu));214 $items[] = array('text' => __('Tags'), 'type' => 'text', 'submenu' => array('items' => $subMenu)); 215 215 } 216 216 217 217 $subMenu = $this->_getAssociationSubMenu('category'); 218 218 if ($subMenu !== false) { 219 $items[] = array('text' => __('Categories' , true), 'type' => 'text', 'submenu' => array('items' => $subMenu));219 $items[] = array('text' => __('Categories'), 'type' => 'text', 'submenu' => array('items' => $subMenu)); 220 220 } 221 221 222 222 $subMenu = $this->_getAssociationSubMenu('location'); 223 223 if ($subMenu !== false) { 224 $items[] = array('text' => __('Locations' , true), 'type' => 'text', 'submenu' => array('items' => $subMenu));224 $items[] = array('text' => __('Locations'), 'type' => 'text', 'submenu' => array('items' => $subMenu)); 225 225 } 226 226 … … 228 228 $subItems[] = $this->_getOrderItem(); 229 229 $subItems[] = $this->_getPageItem(); 230 $items[] = array('text' => __('Options' , true), 'type' => 'text', 'submenu' => array('items' => $subItems));230 $items[] = array('text' => __('Options'), 'type' => 'text', 'submenu' => array('items' => $subItems)); 231 231 232 232 $menu = array('items' => $items); -
View/Helper/ImageDataHelper.php
r3605ef4 r0fb8d7c 294 294 // Write access 295 295 if (($acl & ACL_WRITE_MASK) == ACL_WRITE_META) { 296 $t .= $this->Html->image('icons/tag.png', array('alt' => 'm', 'title' => sprintf(__('%s can edit the meta data', true), $titlePrefix)));296 $t .= $this->Html->image('icons/tag.png', array('alt' => 'm', 'title' => __('%s can edit the meta data', $titlePrefix))); 297 297 } elseif (($acl & ACL_WRITE_MASK) == ACL_WRITE_TAG) { 298 $t .= $this->Html->image('icons/tag_blue.png', array('alt' => 't', 'title' => sprintf(__('%s can edit the tags', true), $titlePrefix)));298 $t .= $this->Html->image('icons/tag_blue.png', array('alt' => 't', 'title' => __('%s can edit the tags', $titlePrefix))); 299 299 } 300 300 301 301 // Read access 302 302 if (($acl & ACL_READ_MASK) == ACL_READ_ORIGINAL) { 303 $t .= $this->Html->image('icons/disk.png', array('alt' => 'o', 'title' => sprintf(__('%s can download this media', true), $titlePrefix)));303 $t .= $this->Html->image('icons/disk.png', array('alt' => 'o', 'title' => __('%s can download this media', $titlePrefix))); 304 304 } elseif (($acl & ACL_READ_MASK) == ACL_READ_PREVIEW) { 305 $t .= $this->Html->image('icons/picture.png', array('alt' => 'v', 'title' => sprintf(__('%s an view this media', true), $titlePrefix)));305 $t .= $this->Html->image('icons/picture.png', array('alt' => 'v', 'title' => __('%s an view this media', $titlePrefix))); 306 306 } 307 307 if ($t == '') { … … 313 313 /** Returns an text repesentation of the acl */ 314 314 function _acl2text($data) { 315 $output = $this->Html->tag('span', __('Group', true), array('title' => __('Access for group members' , true)));315 $output = $this->Html->tag('span', __('Group', true), array('title' => __('Access for group members'))); 316 316 if (isset($data['Group']['name'])) { 317 317 $name = $data['Group']['name']; 318 $output .= ' ('.$this->Html->link($name, $this->Search->getUri(array(), array('groups' => $data['Group']['name'])), array('title' => sprintf(__("This media belongs to the group '%s'", true), $name)))319 . ' ' . $this->Html->link(__("View" , true), "/groups/view/$name") . ')';318 $output .= ' ('.$this->Html->link($name, $this->Search->getUri(array(), array('groups' => $data['Group']['name'])), array('title' => __("This media belongs to the group '%s'", $name))) 319 . ' ' . $this->Html->link(__("View"), "/groups/view/$name") . ')'; 320 320 } 321 321 $output .= ': '; 322 $output .= $this->_acl2icon($data['Media']['gacl'], __('Group members' , true)).' ';323 324 $output .= $this->Html->tag('span', __('users:', true), array('title' => __('Access for users' , true)));325 $output .= $this->_acl2icon($data['Media']['uacl'], __('Users' , true)).' ';326 327 $output .= $this->Html->tag('span', __('public:', true), array('title' => __('Access for the public' , true)));328 $output .= $this->_acl2icon($data['Media']['oacl'], __('The public' , true));322 $output .= $this->_acl2icon($data['Media']['gacl'], __('Group members')).' '; 323 324 $output .= $this->Html->tag('span', __('users:', true), array('title' => __('Access for users'))); 325 $output .= $this->_acl2icon($data['Media']['uacl'], __('Users')).' '; 326 327 $output .= $this->Html->tag('span', __('public:', true), array('title' => __('Access for the public'))); 328 $output .= $this->_acl2icon($data['Media']['oacl'], __('The public')); 329 329 return $output; 330 330 } … … 339 339 340 340 $output .= '<div style="display: none;" class="actionlist" id="'.$id.'">'; 341 $icon = $this->Html->image('icons/date_previous.png', array('alt' => '<', 'title' => __("View media of previous dates" , true)));341 $icon = $this->Html->image('icons/date_previous.png', array('alt' => '<', 'title' => __("View media of previous dates"))); 342 342 $output .= $this->Html->link($icon, $this->getDateLink(&$data, 'to'), array('escape' => false)); 343 343 344 344 if ($this->Search->getFrom() && !$this->Search->getTo()) { 345 $icon = $this->Html->image('icons/date_interval.png', array('alt' => '<>', 'title' => __("View media of interval" , true)));345 $icon = $this->Html->image('icons/date_interval.png', array('alt' => '<>', 'title' => __("View media of interval"))); 346 346 $output .= $this->Html->link($icon, $this->getDateLink(&$data, 'addTo'), array('escape' => false)); 347 347 } 348 348 349 349 if ($this->Search->getFrom() && $this->Search->getTo()) { 350 $icon = $this->Html->image('icons/date_interval_add_prev.png', array('alt' => '<>', 'title' => __("Set new end date of interval" , true)));350 $icon = $this->Html->image('icons/date_interval_add_prev.png', array('alt' => '<>', 'title' => __("Set new end date of interval"))); 351 351 $output .= $this->Html->link($icon, $this->getDateLink(&$data, 'addTo'), array('escape' => false)); 352 352 } 353 353 354 $icon = $this->Html->image('icons/calendar_view_day.png', array('alt' => 'd', 'title' => __("View media of this day" , true)));354 $icon = $this->Html->image('icons/calendar_view_day.png', array('alt' => 'd', 'title' => __("View media of this day"))); 355 355 $output .= $this->Html->link($icon, $this->getDateLink(&$data, '12h'), array('escape' => false)); 356 356 357 $icon = $this->Html->image('icons/calendar_view_week.png', array('alt' => 'w', 'title' => __("View media of this week" , true)));357 $icon = $this->Html->image('icons/calendar_view_week.png', array('alt' => 'w', 'title' => __("View media of this week"))); 358 358 $output .= $this->Html->link($icon, $this->getDateLink(&$data, '3.5d'), array('escape' => false)); 359 359 360 $icon = $this->Html->image('icons/calendar_view_month.png', array('alt' => 'm', 'title' => __("View media of this month" , true)));360 $icon = $this->Html->image('icons/calendar_view_month.png', array('alt' => 'm', 'title' => __("View media of this month"))); 361 361 $output .= $this->Html->link($icon, $this->getDateLink(&$data, '15d'), array('escape' => false)); 362 362 363 363 if ($this->Search->getTo() && !$this->Search->getFrom()) { 364 $icon = $this->Html->image('icons/date_interval.png', array('alt' => '<>', 'title' => __("View media of interval" , true)));364 $icon = $this->Html->image('icons/date_interval.png', array('alt' => '<>', 'title' => __("View media of interval"))); 365 365 $output .= $this->Html->link($icon, $this->getDateLink(&$data, 'addFrom'), array('escape' => false)); 366 366 } 367 367 368 368 if ($this->Search->getTo() && $this->Search->getFrom()) { 369 $icon = $this->Html->image('icons/date_interval_add_next.png', array('alt' => '<>', 'title' => __("Set new start date for interval" , true)));369 $icon = $this->Html->image('icons/date_interval_add_next.png', array('alt' => '<>', 'title' => __("Set new start date for interval"))); 370 370 $output .= $this->Html->link($icon, $this->getDateLink(&$data, 'addFrom'), array('escape' => false)); 371 371 } 372 372 373 $icon = $this->Html->image('icons/date_next.png', array('alt' => '>', 'title' => __("View media of next dates" , true)));373 $icon = $this->Html->image('icons/date_next.png', array('alt' => '>', 'title' => __("View media of next dates"))); 374 374 $output .= $this->Html->link($icon, $this->getDateLink(&$data, 'from'), array('escape' => false)); 375 375 $output .= '</div></span>'; … … 404 404 if (isset($data['Group']['name'])) { 405 405 $name = $data['Group']['name']; 406 $output .= $this->Html->link($name, $this->Search->getUri(array(), array('groups' => $data['Group']['name'])), array('title' => sprintf(__("This media belongs to the group '%s'", true), $name)));406 $output .= $this->Html->link($name, $this->Search->getUri(array(), array('groups' => $data['Group']['name'])), array('title' => __("This media belongs to the group '%s'", $name))); 407 407 $output .= ' '; 408 $output .= '(' . $this->Html->link(__('View' , true), "/groups/view/{$data['Group']['name']}") . ')';408 $output .= '(' . $this->Html->link(__('View'), "/groups/view/{$data['Group']['name']}") . ')'; 409 409 } else { 410 $output .= __('No group assigned' , true);410 $output .= __('No group assigned'); 411 411 } 412 412 return $this->Html->tag('div', $output, array('class' => 'actionList')); … … 472 472 if (isset($urls['user'])) { 473 473 $output = $this->Html->link($value, $urls['user']); 474 $icons[] = $this->Html->link($this->getIcon('world', false, sprintf(__("Search global for %s", true), $value)), $urls['global'], array('escape' => false));474 $icons[] = $this->Html->link($this->getIcon('world', false, __("Search global for %s", $value)), $urls['global'], array('escape' => false)); 475 475 } else { 476 476 $output = $this->Html->link($value, $urls['global']); 477 477 } 478 $icons[] = $this->Html->link($this->getIcon('add', false, sprintf(__("Include %s from search", true), $value)), $urls['add'], array('escape' => false));478 $icons[] = $this->Html->link($this->getIcon('add', false, __("Include %s from search", $value)), $urls['add'], array('escape' => false)); 479 479 if ($withExclude) { 480 $icons[] = $this->Html->link($this->getIcon('delete', false, sprintf(__("Exclude %s from search", true), $value)), $urls['del'], array('escape' => false));480 $icons[] = $this->Html->link($this->getIcon('delete', false, __("Exclude %s from search", $value)), $urls['del'], array('escape' => false)); 481 481 } 482 482 return "<span class=\"tooltip-anchor\">" . $output . '<span class="tooltip-actions"><span class="sub">' . implode($icons) . '</span></span></span> '; … … 506 506 $this->Search->setUser($userId); 507 507 } 508 $cells[] = array(__("Date" , true), $this->_metaDate(&$data));508 $cells[] = array(__("Date"), $this->_metaDate(&$data)); 509 509 510 510 if (count($data['Tag'])) { 511 $cells[] = array(__('Tags' , true), $this->_metaHabtm(&$data, 'Tag'));511 $cells[] = array(__('Tags'), $this->_metaHabtm(&$data, 'Tag')); 512 512 } 513 513 if (count($data['Category'])) { 514 $cells[] = array(__('Categories' , true), $this->_metaHabtm(&$data, 'Category'));514 $cells[] = array(__('Categories'), $this->_metaHabtm(&$data, 'Category')); 515 515 } 516 516 … … 523 523 } 524 524 if (count($locations)) { 525 $cells[] = array(__('Locations' , true), implode(', ', $locations));525 $cells[] = array(__('Locations'), implode(', ', $locations)); 526 526 } 527 527 528 528 if ($data['Media']['isOwner'] || $this->Session->read('User.role') == ROLE_ADMIN) { 529 $cells[] = array(__('Access' , true), $this->_metaAccessFull($data));529 $cells[] = array(__('Access'), $this->_metaAccessFull($data)); 530 530 } elseif ($this->Session->read('User.role') >= ROLE_GUEST && !empty($data['Group']['name']) && !$data['Group']['is_hidden']) { 531 $cells[] = array(__('Group' , true), $this->_metaAccessGroup($data));531 $cells[] = array(__('Group'), $this->_metaAccessGroup($data)); 532 532 } 533 533 … … 540 540 if ($data['Media']['canWriteTag']) { 541 541 $output .= ' '.$this->Ajax->link( 542 $this->Html->image('icons/tag_blue_edit.png', array('alt' => __('Edit tags', true), 'title' => __('Edit tags' , true))),542 $this->Html->image('icons/tag_blue_edit.png', array('alt' => __('Edit tags', true), 'title' => __('Edit tags'))), 543 543 '/explorer/editmeta/'.$mediaId, 544 544 array('update' => 'meta-'.$mediaId, 'escape' => false)); … … 548 548 $output .= ' '.$this->Html->link( 549 549 $this->Html->image('icons/disk.png', 550 array('alt' => $file['file'], 'title' => sprintf(__('Save file %s', true), $file['file']))),550 array('alt' => $file['file'], 'title' => __('Save file %s', $file['file']))), 551 551 '/media/file/'.$file['id'].'/'.$file['file'], array('escape' => false)); 552 552 } … … 597 597 //$this->log("level=$level, flag=$flag, mask=$mask"); 598 598 $acl = array( 599 ACL_LEVEL_KEEP => __('Keep' , true),600 ACL_LEVEL_PRIVATE => __('Me only' , true),601 ACL_LEVEL_GROUP => __('Group members' , true),602 ACL_LEVEL_USER => __('Users' , true),603 ACL_LEVEL_OTHER => __('Everyone' , true));599 ACL_LEVEL_KEEP => __('Keep'), 600 ACL_LEVEL_PRIVATE => __('Me only'), 601 ACL_LEVEL_GROUP => __('Group members'), 602 ACL_LEVEL_USER => __('Users'), 603 ACL_LEVEL_OTHER => __('Everyone')); 604 604 $options = am($options, array('type' => 'select', 'options' => $acl, 'selected' => $level)); 605 605 //$this->log($options); … … 615 615 switch ($media['Media']['visibility']) { 616 616 case ACL_LEVEL_OTHER: 617 $icon = $this->Html->image('icons/world.png', array('title' => __('This media is public visible' , true)));617 $icon = $this->Html->image('icons/world.png', array('title' => __('This media is public visible'))); 618 618 break; 619 619 case ACL_LEVEL_USER: 620 $icon = $this->Html->image('icons/group.png', array('title' => __('This media is visible for users' , true)));620 $icon = $this->Html->image('icons/group.png', array('title' => __('This media is visible for users'))); 621 621 break; 622 622 case ACL_LEVEL_GROUP: 623 $icon = $this->Html->image('icons/user.png', array('title' => __('This media is visible for group members' , true)));623 $icon = $this->Html->image('icons/user.png', array('title' => __('This media is visible for group members'))); 624 624 break; 625 625 default: 626 $icon = $this->Html->image('icons/stop.png', array('title' => __('This media is private' , true)));626 $icon = $this->Html->image('icons/stop.png', array('title' => __('This media is private'))); 627 627 break; 628 628 } -
View/Helper/MenuHelper.php
r1a41cea r0fb8d7c 132 132 133 133 function getMainMenu($data) { 134 $data = am(array('id' => 'submenu', 'title' => __('Main Menu' , true), 'active' => false), $data);134 $data = am(array('id' => 'submenu', 'title' => __('Main Menu'), 'active' => false), $data); 135 135 136 136 // Get current url with action. If the default action 'index' is missing, -
View/Helper/NavigatorHelper.php
r1a41cea r0fb8d7c 63 63 $crumbs = $this->params['crumbs']; 64 64 $link = $this->Breadcrumb->crumbUrl($this->Breadcrumb->replace($crumbs, 'page', $prev)); 65 return $this->Html->link(__('prev' , true), $link, array('class' => 'prev'));65 return $this->Html->link(__('prev'), $link, array('class' => 'prev')); 66 66 } 67 67 … … 113 113 $crumbs = $this->params['crumbs']; 114 114 $link = $this->Breadcrumb->crumbUrl($this->Breadcrumb->replace($crumbs, 'page', $next)); 115 return $this->Html->link(__('next' , true), $link, array('class' => 'next'));115 return $this->Html->link(__('next'), $link, array('class' => 'next')); 116 116 } 117 117 … … 133 133 $crumbParams = $this->Breadcrumb->params($this->Breadcrumb->replace($this->Breadcrumb->replace($crumbs, 'page', $page), 'pos', $pos)); 134 134 $link = $baseUri . $crumbParams; 135 return $this->Html->link(__('prev' , true), $link, array('class' => 'prev'));135 return $this->Html->link(__('prev'), $link, array('class' => 'prev')); 136 136 } 137 137 … … 143 143 $link = $this->Breadcrumb->crumbUrl($this->params['crumbs'], false, array('pos')); 144 144 $link .= '#media-'.$params['current']; 145 return $this->Html->link(__('overview' , true), $link, array('class' => 'up'));145 return $this->Html->link(__('overview'), $link, array('class' => 'up')); 146 146 } 147 147 … … 166 166 return; 167 167 } 168 return $this->Html->link(__('next' , true), $this->getNextMediaUrl(), array('class' => 'next'));168 return $this->Html->link(__('next'), $this->getNextMediaUrl(), array('class' => 'next')); 169 169 } 170 170 -
View/Images/notfound.ctp
r1a41cea r0fb8d7c 1 <h1><?php __("No media Found"); ?></h1>2 <?php echo $ session->flash(); ?>3 <div class="info"><?php printf(__("No media found. Please goto the %s and try again", true), $html->link(__("Explorer", true), '/explorer')); ?></div>1 <h1><?php echo __("No media Found"); ?></h1> 2 <?php echo $this->Session->flash(); ?> 3 <div class="info"><?php echo __("No media found. Please goto the %s and try again", $this->Html->link(__("Explorer"), '/explorer')); ?></div> -
View/Images/view.ctp
r1a41cea r0fb8d7c 1 <?php echo $ session->flash(); ?>1 <?php echo $this->Session->flash(); ?> 2 2 3 3 <div id="p-media-preview"> … … 8 8 echo $flowplayer->video($this->data); 9 9 } else { 10 //$size = $ imageData->getimagesize($this->data, OUTPUT_SIZE_PREVIEW);11 $size = $ imageData->getimagesize($this->data, 960);10 //$size = $this->ImageData->getimagesize($this->data, OUTPUT_SIZE_PREVIEW); 11 $size = $this->ImageData->getimagesize($this->data, 960); 12 12 $src = Router::url("/media/preview/".$this->data['Media']['id']); 13 $img = $ html->tag('img', null, array('src' => $src, 'width' => $size[0], 'height' => $size[1], 'alt' => $this->data['Media']['name']));13 $img = $this->Html->tag('img', null, array('src' => $src, 'width' => $size[0], 'height' => $size[1], 'alt' => $this->data['Media']['name'])); 14 14 if ($navigator->hasNextMedia()) { 15 echo $ html->link($img, $navigator->getNextMediaUrl(), array('escape' => false));15 echo $this->Html->link($img, $navigator->getNextMediaUrl(), array('escape' => false)); 16 16 } else { 17 17 echo $img; … … 33 33 <div id="image-tabs"> 34 34 <?php 35 $items = array(__("General" , true), __("Media Details", true));35 $items = array(__("General"), __("Media Details")); 36 36 if ($map->hasApi() && $map->hasMediaGeo($this->data)) { 37 $items['map'] = __("Map" , true);37 $items['map'] = __("Map"); 38 38 } 39 39 if ($this->data['Media']['canWriteTag']) { 40 $items['edit'] = __("Edit" , true);40 $items['edit'] = __("Edit"); 41 41 } 42 42 if ($this->data['Media']['canWriteAcl']) { 43 $items['acl'] = __("Access Right" , true);43 $items['acl'] = __("Access Right"); 44 44 } 45 45 echo $tab->menu($items); … … 49 49 <div id="meta-<?php echo $this->data['Media']['id']; ?>"> 50 50 <table class="bare"> 51 <?php echo $ html->tableCells($imageData->metaTable(&$this->data)); ?>51 <?php echo $this->Html->tableCells($this->ImageData->metaTable(&$this->data)); ?> 52 52 </table> 53 53 </div> … … 60 60 <?php 61 61 $cells = array(); 62 $cells[] = array(__("User" , true), $html->link($this->data['User']['username'], '/explorer/user/'.$this->data['User']['username']));62 $cells[] = array(__("User"), $this->Html->link($this->data['User']['username'], '/explorer/user/'.$this->data['User']['username'])); 63 63 if ($this->data['Media']['isOwner']) { 64 64 $files = array(); 65 65 foreach ($this->data['File'] as $file) { 66 $link = $ imageData->getPathLink($file);67 $files[] = $ html->link($file['file'], $link).' ('.$number->toReadableSize($file['size']).')';66 $link = $this->ImageData->getPathLink($file); 67 $files[] = $this->Html->link($file['file'], $link).' ('.$this->Number->toReadableSize($file['size']).')'; 68 68 } 69 $cells[] = array(__("File(s)" , true), implode(', ', $files));69 $cells[] = array(__("File(s)"), implode(', ', $files)); 70 70 } 71 $folders = $ imageData->getFolderLinks($this->data);71 $folders = $this->ImageData->getFolderLinks($this->data); 72 72 if ($folders) { 73 $cells[] = array(__("Folder" , true), implode(' / ', $folders));73 $cells[] = array(__("Folder"), implode(' / ', $folders)); 74 74 } 75 $cells[] = array(__("View Count" , true), $this->data['Media']['clicks']);76 $cells[] = array(__("Created" , true), $time->relativeTime($this->data['Media']['created']));77 $cells[] = array(__("Last modified" , true), $time->relativeTime($this->data['Media']['modified']));78 $cells[] = array(__("Size" , true), $this->data['Media']['width'].'px * '.$this->data['Media']['height'].'px');75 $cells[] = array(__("View Count"), $this->data['Media']['clicks']); 76 $cells[] = array(__("Created"), $time->relativeTime($this->data['Media']['created'])); 77 $cells[] = array(__("Last modified"), $time->relativeTime($this->data['Media']['modified'])); 78 $cells[] = array(__("Size"), $this->data['Media']['width'].'px * '.$this->data['Media']['height'].'px'); 79 79 80 80 if ($this->data['Media']['model']) { 81 $cells[] = array(__("Model" , true), $this->data['Media']['model']);81 $cells[] = array(__("Model"), $this->data['Media']['model']); 82 82 } 83 83 if ($this->data['Media']['duration'] > 0) { 84 $cells[] = array(__("Duration" , true), $this->data['Media']['duration'].'s');84 $cells[] = array(__("Duration"), $this->data['Media']['duration'].'s'); 85 85 } else { 86 86 if ($this->data['Media']['aperture'] > 0) { 87 $cells[] = array(__("Aperture" , true), $this->data['Media']['aperture']);87 $cells[] = array(__("Aperture"), $this->data['Media']['aperture']); 88 88 } 89 89 if ($this->data['Media']['shutter'] > 0) { 90 $cells[] = array(__("Shutter" , true), $imageData->niceShutter($this->data['Media']['shutter']));90 $cells[] = array(__("Shutter"), $this->ImageData->niceShutter($this->data['Media']['shutter'])); 91 91 } 92 92 if ($this->data['Media']['iso'] > 0) { 93 $cells[] = array(__("ISO" , true), $this->data['Media']['iso']);93 $cells[] = array(__("ISO"), $this->data['Media']['iso']); 94 94 } 95 95 } 96 echo $ html->tableCells($cells);96 echo $this->Html->tableCells($cells); 97 97 ?> 98 98 </table> … … 108 108 if ($this->data['Media']['canWriteTag']) { 109 109 echo $tab->open('edit'); 110 echo $ form->create(null, array('url' => 'update/'.$this->data['Media']['id'].'/'.join('/', $crumbs), 'id' => 'edit'));110 echo $this->Form->create(null, array('url' => 'update/'.$this->data['Media']['id'].'/'.join('/', $crumbs), 'id' => 'edit')); 111 111 echo "<fieldset>"; 112 112 echo View::element('single_meta_form'); 113 113 echo "</fieldset>"; 114 echo $ form->end(__('Save', true));114 echo $this->Form->end(__('Save')); 115 115 echo $tab->close(); 116 116 } 117 117 if ($this->data['Media']['canWriteAcl']) { 118 118 echo $tab->open('acl'); 119 echo $ form->create(null, array('url' => 'updateAcl/'.$this->data['Media']['id'].'/'.join('/', $crumbs), 'id' => 'acl'));119 echo $this->Form->create(null, array('url' => 'updateAcl/'.$this->data['Media']['id'].'/'.join('/', $crumbs), 'id' => 'acl')); 120 120 echo "<fieldset>"; 121 121 echo View::element('single_acl_form'); 122 122 echo "</fieldset>"; 123 echo $ form->end(__('Save', true));123 echo $this->Form->end(__('Save')); 124 124 echo $tab->close(); 125 125 } -
View/Layouts/backend.ctp
r3605ef4 r0fb8d7c 18 18 19 19 <div id="header"><div class="sub"> 20 <?php echo $this->Html->link(__('Gallery' , true), '/'); ?>20 <?php echo $this->Html->link(__('Gallery'), '/'); ?> 21 21 </div></div> 22 22 -
View/Layouts/dashboard.ctp
r1a41cea r0fb8d7c 1 <?php echo $ html->docType('xhtml-strict'); ?>1 <?php echo $this->Html->docType('xhtml-strict'); ?> 2 2 <html xmlns="http://www.w3.org/1999/xhtml"> 3 3 … … 5 5 <title><?php echo $title_for_layout?></title> 6 6 <?php 7 echo $ html->charset('UTF-8')."\n";8 echo $ html->meta('icon')."\n";9 echo $ html->css('phtagr')."\n";10 echo $ html->script(array('prototype', 'event-selectors', 'effects', 'controls', 'phtagr'))."\n";7 echo $this->Html->charset('UTF-8')."\n"; 8 echo $this->Html->meta('icon')."\n"; 9 echo $this->Html->css('phtagr')."\n"; 10 echo $this->Html->script(array('prototype', 'event-selectors', 'effects', 'controls', 'phtagr'))."\n"; 11 11 12 12 echo $scripts_for_layout; … … 15 15 16 16 <!--[if lte IE 7]> 17 <?php echo $ html->css('patches/patch_phtagr')."\n"; ?>17 <?php echo $this->Html->css('patches/patch_phtagr')."\n"; ?> 18 18 <![endif]--> 19 19 </head> … … 54 54 <div id="col3_content" class="clearfix"> 55 55 <div id="spinner" style="display: none; float: right; "> 56 <?php echo $ html->image('spinner.gif'); ?>56 <?php echo $this->Html->image('spinner.gif'); ?> 57 57 </div> 58 58 <div id="main_content"> -
View/Options/acl.ctp
re449ecc0 r0fb8d7c 1 <h1><?php __('Access Rights'); ?></h1>2 <?php echo $ session->flash(); ?>1 <h1><?php echo __('Access Rights'); ?></h1> 2 <?php echo $this->Session->flash(); ?> 3 3 <?php 4 4 $aclSelect = array( 5 ACL_LEVEL_OTHER => __('Everyone' , true),6 ACL_LEVEL_USER => __('User' , true),7 ACL_LEVEL_GROUP => __('Group Members' , true),8 ACL_LEVEL_PRIVATE => __('Me only' , true));5 ACL_LEVEL_OTHER => __('Everyone'), 6 ACL_LEVEL_USER => __('User'), 7 ACL_LEVEL_GROUP => __('Group Members'), 8 ACL_LEVEL_PRIVATE => __('Me only')); 9 9 ?> 10 <?php echo $ form->create(null, array('action' => 'acl')); ?>11 <fieldset><legend><?php __('Default Access Rights'); ?></legend>12 <p><?php __('The following access rights are applied to new images.'); ?></p>10 <?php echo $this->Form->create(null, array('action' => 'acl')); ?> 11 <fieldset><legend><?php echo __('Default Access Rights'); ?></legend> 12 <p><?php echo __('The following access rights are applied to new images.'); ?></p> 13 13 <?php 14 echo $ form->input('acl.read.preview', array('type' => 'select', 'options' => $aclSelect, 'label' => __("Who can view the image?", true)));15 echo $ form->input('acl.read.original', array('type' => 'select', 'options' => $aclSelect, 'label' => __("Who can download the image?", true)));16 echo $ form->input('acl.write.tag', array('type' => 'select', 'options' => $aclSelect, 'label' => __("Who can add tags?", true)));17 echo $ form->input('acl.write.meta', array('type' => 'select', 'options' => $aclSelect, 'label' => __("Who can edit all meta data?", true)));18 echo $ form->input('acl.group', array('type' => 'select', 'options' => $groups, 'label' => __("Default image group?", true)));14 echo $this->Form->input('acl.read.preview', array('type' => 'select', 'options' => $aclSelect, 'label' => __("Who can view the image?"))); 15 echo $this->Form->input('acl.read.original', array('type' => 'select', 'options' => $aclSelect, 'label' => __("Who can download the image?"))); 16 echo $this->Form->input('acl.write.tag', array('type' => 'select', 'options' => $aclSelect, 'label' => __("Who can add tags?"))); 17 echo $this->Form->input('acl.write.meta', array('type' => 'select', 'options' => $aclSelect, 'label' => __("Who can edit all meta data?"))); 18 echo $this->Form->input('acl.group', array('type' => 'select', 'options' => $groups, 'label' => __("Default image group?"))); 19 19 ?> 20 20 </fieldset> 21 <?php echo $ form->end(__('Save', true)); ?>21 <?php echo $this->Form->end(__('Save')); ?> -
View/Options/profile.ctp
re449ecc0 r0fb8d7c 1 <h1><?php __('Profile'); ?></h1>1 <h1><?php echo __('Profile'); ?></h1> 2 2 3 <?php echo $ session->flash(); ?>3 <?php echo $this->Session->flash(); ?> 4 4 5 <?php echo $ form->create(null, array('action' => 'profile')); ?>6 <fieldset><legend><?php __('General'); ?></legend>5 <?php echo $this->Form->create(null, array('action' => 'profile')); ?> 6 <fieldset><legend><?php echo __('General'); ?></legend> 7 7 <?php 8 echo $ form->input('User.username', array('label' => __('Username', true)));9 echo $ form->input('User.firstname', array('label' => __('First name', true)));10 echo $ form->input('User.lastname', array('label' => __('Last name', true)));11 echo $ form->input('User.email', array('label' => __('Email', true)));8 echo $this->Form->input('User.username', array('label' => __('Username'))); 9 echo $this->Form->input('User.firstname', array('label' => __('First name'))); 10 echo $this->Form->input('User.lastname', array('label' => __('Last name'))); 11 echo $this->Form->input('User.email', array('label' => __('Email'))); 12 12 ?> 13 13 </fieldset> 14 14 15 <fieldset><legend><?php __('Password'); ?></legend>15 <fieldset><legend><?php echo __('Password'); ?></legend> 16 16 <?php 17 echo $ form->input('User.password', array('label' => __('Password', true)));18 echo $ form->input('User.confirm', array('type' => 'password', 'label' => __('Confirm', true)));17 echo $this->Form->input('User.password', array('label' => __('Password'))); 18 echo $this->Form->input('User.confirm', array('type' => 'password', 'label' => __('Confirm'))); 19 19 ?> 20 20 </fieldset> 21 <fieldset><legend><?php __('Others'); ?></legend>21 <fieldset><legend><?php echo __('Others'); ?></legend> 22 22 <?php 23 echo $ form->input('Option.user.browser.full', array('type' => 'checkbox', 'label' => __('Show advanced file browser', true)));23 echo $this->Form->input('Option.user.browser.full', array('type' => 'checkbox', 'label' => __('Show advanced file browser'))); 24 24 $options = array( 25 1 => __("Private" , true),26 2 => __("Group members" , true),27 3 => __("Users" , true),28 4 => __("Public" , true)25 1 => __("Private"), 26 2 => __("Group members"), 27 3 => __("Users"), 28 4 => __("Public") 29 29 ); 30 echo $ form->input('User.visible_level', array('type' => 'select', 'options' => $options, 'label' => __('Profile visibility', true)));30 echo $this->Form->input('User.visible_level', array('type' => 'select', 'options' => $options, 'label' => __('Profile visibility'))); 31 31 $options = array( 32 0 => __("Never" , true),33 1800 => __("Every 30 minutes" , true),34 3600 => __("Every hour" , true),35 86400 => __("Every day" , true),36 604800 => __("Every week" , true),37 2592000 => __("Every month" , true)32 0 => __("Never"), 33 1800 => __("Every 30 minutes"), 34 3600 => __("Every hour"), 35 86400 => __("Every day"), 36 604800 => __("Every week"), 37 2592000 => __("Every month") 38 38 ); 39 echo $ form->input('User.notify_interval', array('type' => 'select', 'options' => $options, 'label' => __('Send new media notifications', true)));39 echo $this->Form->input('User.notify_interval', array('type' => 'select', 'options' => $options, 'label' => __('Send new media notifications'))); 40 40 ?> 41 41 </fieldset> 42 <?php echo $ form->end(__('Save', true)); ?>42 <?php echo $this->Form->end(__('Save')); ?> -
View/Options/rss.ctp
re449ecc0 r0fb8d7c 1 <h1><?php __('Authenticated RSS') ?></h1>1 <h1><?php echo __('Authenticated RSS') ?></h1> 2 2 3 3 <div class="info"> 4 <?php __('Following links contain authentication keys of your account. Using these links you are authenticated directly without username and password. The links could be spoofed easily and should be used carefully.'); ?>4 <?php echo __('Following links contain authentication keys of your account. Using these links you are authenticated directly without username and password. The links could be spoofed easily and should be used carefully.'); ?> 5 5 </div> 6 6 7 <p><?php __('The links are valid for the current session. For permanent login the user has to login via username and password.'); ?></p>7 <p><?php echo __('The links are valid for the current session. For permanent login the user has to login via username and password.'); ?></p> 8 8 9 9 <?php … … 14 14 ?> 15 15 <ul> 16 <li><?php echo $ html->link(__('Recent Media', true), $recentMedia); ?> (Link: <code><?php echo $recentMedia; ?></code>)</li>17 <li><?php echo $ html->link(__('Recent Comments', true), $recentComments); ?> (Link: <code><?php echo $recentComments; ?></code>)</li>18 <li><?php echo $ html->link(__('Media RSS', true), $mediaRss); ?> (Link: <code><?php echo $mediaRss; ?></code>)</li>19 <li><?php echo $ html->link(__('Media RSS of My Media', true), $myMediaMediaRss); ?> (Link: <code><?php echo $myMediaMediaRss; ?></code>)</li>16 <li><?php echo $this->Html->link(__('Recent Media'), $recentMedia); ?> (Link: <code><?php echo $recentMedia; ?></code>)</li> 17 <li><?php echo $this->Html->link(__('Recent Comments'), $recentComments); ?> (Link: <code><?php echo $recentComments; ?></code>)</li> 18 <li><?php echo $this->Html->link(__('Media RSS'), $mediaRss); ?> (Link: <code><?php echo $mediaRss; ?></code>)</li> 19 <li><?php echo $this->Html->link(__('Media RSS of My Media'), $myMediaMediaRss); ?> (Link: <code><?php echo $myMediaMediaRss; ?></code>)</li> 20 20 </ul> 21 21 22 <p><?php printf(__("Click %s to renew the authentication key. All previous keys become invalid.", true), $html->link(__('renew key', true), 'rss/renew')); ?></p>22 <p><?php echo __("Click %s to renew the authentication key. All previous keys become invalid.", $this->Html->link(__('renew key'), 'rss/renew')); ?></p> -
View/Setup/admin_upgrade.ctp
rbbc826a r0fb8d7c 7 7 </div> 8 8 9 <?php echo $this->Html->link(__("Upgrade" , true), '/admin/setup/upgrade/run'); ?> or10 <?php echo $this->Html->link(__("Cancel" , true), '/'); ?>9 <?php echo $this->Html->link(__("Upgrade"), '/admin/setup/upgrade/run'); ?> or 10 <?php echo $this->Html->link(__("Cancel"), '/'); ?> 11 11 -
View/Setup/admin_uptodate.ctp
rbbc826a r0fb8d7c 7 7 </div> 8 8 9 <?php echo $this->Html->link(__("Continue" , true), '/');9 <?php echo $this->Html->link(__("Continue"), '/'); -
View/Setup/config.ctp
rbbc826a r0fb8d7c 9 9 <fieldset><legend><?php echo __("Database"); ?></legend> 10 10 <?php 11 echo $this->Form->input('db.host', array('label' => __('Host' , true)));12 echo $this->Form->input('db.database', array('label' => __('Database' , true)));13 echo $this->Form->input('db.login', array('label' => __('Username' , true)));14 echo $this->Form->input('db.password', array('label' => __('Password' , true), 'type' => 'password'));15 echo $this->Form->input('db.prefix', array('label' => __('Prefix' , true)));11 echo $this->Form->input('db.host', array('label' => __('Host'))); 12 echo $this->Form->input('db.database', array('label' => __('Database'))); 13 echo $this->Form->input('db.login', array('label' => __('Username'))); 14 echo $this->Form->input('db.password', array('label' => __('Password'), 'type' => 'password')); 15 echo $this->Form->input('db.prefix', array('label' => __('Prefix'))); 16 16 ?> 17 17 </fieldset> 18 <?php echo $this->Form->submit(__('Continue' , true)); ?>18 <?php echo $this->Form->submit(__('Continue')); ?> 19 19 </form> 20 20 <?php -
View/Setup/configro.ctp
rbbc826a r0fb8d7c 28 28 ?></code></pre></p> 29 29 30 <?php echo $this->Html->link(__('Continue' , true), 'configro', array('class' => 'button')); ?>30 <?php echo $this->Html->link(__('Continue'), 'configro', array('class' => 'button')); ?> 31 31 32 32 <?php -
View/Setup/path.ctp
rbbc826a r0fb8d7c 27 27 <?php endif; ?> 28 28 29 <?php echo $this->Html->link(__('Retry' , true), 'path', array('class' => 'button')); ?>29 <?php echo $this->Html->link(__('Retry'), 'path', array('class' => 'button')); ?> 30 30 <?php 31 31 $script = <<<'JS' -
View/Setup/saltro.ctp
rbbc826a r0fb8d7c 14 14 15 15 <p></p> 16 <?php echo $this->Html->link(__('Continue' , true), 'saltro', array('class' => 'button')); ?>16 <?php echo $this->Html->link(__('Continue'), 'saltro', array('class' => 'button')); ?> 17 17 <?php 18 18 $script = <<<'JS' -
View/Setup/system.ctp
rbbc826a r0fb8d7c 9 9 <p><?php echo __("You can set the file path of these exteranl programs here or set them later in the system preferences."); ?></p> 10 10 11 <?php echo $this->Html->link(__("Skip these settings" , true), array("action" => "finish"), array('class' => 'button')); ?>11 <?php echo $this->Html->link(__("Skip these settings"), array("action" => "finish"), array('class' => 'button')); ?> 12 12 13 13 <?php if (count($missing)): ?> … … 31 31 ?> 32 32 </fieldset> 33 <?php echo $this->Form->end(__('Save' , true)); ?>33 <?php echo $this->Form->end(__('Save')); ?> 34 34 <?php 35 35 $script = <<<'JS' -
View/Setup/user.ctp
rbbc826a r0fb8d7c 7 7 <fieldset> 8 8 <?php 9 echo $this->Form->input('User.username', array('label' => __("Username" , true)));10 echo $this->Form->input('User.password', array('label' => __("Password" , true)));11 echo $this->Form->input('User.confirm', array('label' => __("Confirm" , true), 'type' => 'password'));12 echo $this->Form->input('User.email', array('label' => __("Email" , true)));9 echo $this->Form->input('User.username', array('label' => __("Username"))); 10 echo $this->Form->input('User.password', array('label' => __("Password"))); 11 echo $this->Form->input('User.confirm', array('label' => __("Confirm"), 'type' => 'password')); 12 echo $this->Form->input('User.email', array('label' => __("Email"))); 13 13 ?> 14 14 </fieldset> 15 <?php echo $this->Form->end(__('Create' , true)); ?>15 <?php echo $this->Form->end(__('Create')); ?> 16 16 <?php 17 17 $script = <<<'JS' -
View/System/delete_unused_meta_data.ctp
r1a41cea r0fb8d7c 1 <h1><?php __("Delete Unused Metadata"); ?></h1>2 <?php echo $ session->flash(); ?>3 <p><?php printf(__("Delete all unused meta data from database: %d tags, %d categories, %d locations.", true), $this->data['unusedTagCount'], $this->data['unusedCategoryCount'], $this->data['unusedLocationCount']); ?>4 </p><?php echo $this->Html->link(__('Delete' , true), 'deleteUnusedMetaData/delete', array('class' => 'button')); ?></p>1 <h1><?php echo __("Delete Unused Metadata"); ?></h1> 2 <?php echo $this->Session->flash(); ?> 3 <p><?php echo __("Delete all unused meta data from database: %d tags, %d categories, %d locations.", $this->data['unusedTagCount'], $this->data['unusedCategoryCount'], $this->data['unusedLocationCount']); ?> 4 </p><?php echo $this->Html->link(__('Delete'), 'deleteUnusedMetaData/delete', array('class' => 'button')); ?></p> -
View/System/external.ctp
r1a41cea r0fb8d7c 1 <h1><?php __('Sytem Settings'); ?></h1>1 <h1><?php echo __('Sytem Settings'); ?></h1> 2 2 3 <?php echo $ session->flash(); ?>3 <?php echo $this->Session->flash(); ?> 4 4 5 <?php echo $ form->create(null, array('action' => 'external')); ?>6 <fieldset><legend><?php __('External Programs'); ?></legend>5 <?php echo $this->Form->create(null, array('action' => 'external')); ?> 6 <fieldset><legend><?php echo __('External Programs'); ?></legend> 7 7 <?php 8 echo $ form->input('bin.exiftool', array('label' => sprintf(__("Path to %s", true), "exiftool")));9 echo $ form->input('bin.convert', array('label' => sprintf(__("Path to %s", true), "convert")));10 echo $ form->input('bin.ffmpeg', array('label' => sprintf(__("Path to %s", true), "ffmpeg")));11 echo $ form->input('bin.flvtool2', array('label' => sprintf(__("Path to %s", true), "flvtool2")));8 echo $this->Form->input('bin.exiftool', array('label' => __("Path to %s", "exiftool"))); 9 echo $this->Form->input('bin.convert', array('label' => __("Path to %s", "convert"))); 10 echo $this->Form->input('bin.ffmpeg', array('label' => __("Path to %s", "ffmpeg"))); 11 echo $this->Form->input('bin.flvtool2', array('label' => __("Path to %s", "flvtool2"))); 12 12 ?> 13 13 </fieldset> 14 <?php echo $ form->end(__('Save', true)); ?>14 <?php echo $this->Form->end(__('Save')); ?> -
View/System/index.ctp
r1a41cea r0fb8d7c 1 <h1><?php __('General'); ?></h1>1 <h1><?php echo __('General'); ?></h1> 2 2 3 <?php echo $ session->flash(); ?>3 <?php echo $this->Session->flash(); ?> 4 4 5 <?php echo $ form->create(null, array('action' => 'index')); ?>6 <fieldset><legend><?php __('General'); ?></legend>5 <?php echo $this->Form->create(null, array('action' => 'index')); ?> 6 <fieldset><legend><?php echo __('General'); ?></legend> 7 7 <?php 8 echo $ form->input('general.title', array('label' => __('Gallery title', true)));9 echo $ form->input('general.subtitle', array('label' => __('Gallery subtitle', true)));8 echo $this->Form->input('general.title', array('label' => __('Gallery title'))); 9 echo $this->Form->input('general.subtitle', array('label' => __('Gallery subtitle'))); 10 10 ?> 11 11 </fieldset> 12 12 13 <?php echo $ form->end(__('Save', true)); ?>13 <?php echo $this->Form->end(__('Save')); ?> -
View/System/map.ctp
r1a41cea r0fb8d7c 1 <h1><?php __('Map Settings'); ?></h1>1 <h1><?php echo __('Map Settings'); ?></h1> 2 2 3 <?php echo $ session->flash(); ?>3 <?php echo $this->Session->flash(); ?> 4 4 5 <?php echo $ form->create(null, array('action' => 'map')); ?>6 <fieldset><legend><?php __('Google Maps'); ?></legend>7 <p><?php printf(__('Enter here your API map key for %s. You can signup %s for a new key. No API map key is required for local setup with localhost.', true), $html->link('Google Maps', "http://maps.google.com"), $html->link(__('here', true), "http://code.google.com/apis/maps/signup.html")); ?></p>5 <?php echo $this->Form->create(null, array('action' => 'map')); ?> 6 <fieldset><legend><?php echo __('Google Maps'); ?></legend> 7 <p><?php echo __('Enter here your API map key for %s. You can signup %s for a new key. No API map key is required for local setup with localhost.', $this->Html->link('Google Maps', "http://maps.google.com"), $this->Html->link(__('here'), "http://code.google.com/apis/maps/signup.html")); ?></p> 8 8 <?php 9 echo $ form->input('google.map.key', array('label' => __("API key", true)));9 echo $this->Form->input('google.map.key', array('label' => __("API key"))); 10 10 ?> 11 11 </fieldset> 12 <?php echo $ form->end(__('Save', true)); ?>12 <?php echo $this->Form->end(__('Save')); ?> -
View/System/upgrade.ctp
r1a41cea r0fb8d7c 1 <h1><?php __('Database Upgrade'); ?></h1>2 <?php echo $ session->flash(); ?>1 <h1><?php echo __('Database Upgrade'); ?></h1> 2 <?php echo $this->Session->flash(); ?> 3 3 4 4 <?php if ($currentVersion < $maxVersion): ?> 5 <p><?php printf(__("Your database requires an update from version $currentVersion to $maxVersion! Please click %s to run to upgrade.", true), $html->link(__("here", true), 'upgrade/run')); ?></p>6 <p><?php __("Following database migrations will be done:"); ?>5 <p><?php echo __("Your database requires an update from version $currentVersion to $maxVersion! Please click %s to run to upgrade.", $this->Html->link(__("here"), 'upgrade/run')); ?></p> 6 <p><?php echo __("Following database migrations will be done:"); ?> 7 7 <ul> 8 8 <?php 9 9 foreach ($newMappingNames as $name) { 10 echo $ html->tag('li', $name);10 echo $this->Html->tag('li', $name); 11 11 } 12 12 ?> 13 13 </ul> 14 14 <?php else: ?> 15 <p><?php __("Your system has the newest database version $currentVersion."); ?></p>15 <p><?php echo __("Your system has the newest database version $currentVersion."); ?></p> 16 16 <?php endif; ?> 17 17 -
View/Users/admin_add.ctp
r1a41cea r0fb8d7c 1 <h1><?php __('Add new User'); ?></h1>1 <h1><?php echo __('Add new User'); ?></h1> 2 2 3 <?php echo $ session->flash(); ?>3 <?php echo $this->Session->flash(); ?> 4 4 5 <?php echo $ form->create('User', array('action' => 'add')); ?>6 <fieldset><legend><?php __('Create new user'); ?></legend>5 <?php echo $this->Form->create('User', array('action' => 'add')); ?> 6 <fieldset><legend><?php echo __('Create new user'); ?></legend> 7 7 <?php 8 echo $ form->input('User.username', array('label' => __('Username', true)));9 echo $ form->input('User.email', array('label' => __('Email', true)));10 echo $ form->input('User.password', array('label' => __('Password', true)));11 echo $ form->input('User.confirm', array('label' => __('Confirm', true), 'type' => 'password'));8 echo $this->Form->input('User.username', array('label' => __('Username'))); 9 echo $this->Form->input('User.email', array('label' => __('Email'))); 10 echo $this->Form->input('User.password', array('label' => __('Password'))); 11 echo $this->Form->input('User.confirm', array('label' => __('Confirm'), 'type' => 'password')); 12 12 ?> 13 13 </fieldset> 14 <?php echo $ form->end(__("Create", true)); ?>14 <?php echo $this->Form->end(__("Create")); ?> -
View/Users/admin_edit.ctp
r1a41cea r0fb8d7c 1 <h1><?php printf(__(" User: %s", true), $this->data['User']['username']); ?></h1>1 <h1><?php echo __(" User: %s", $this->data['User']['username']); ?></h1> 2 2 3 <?php echo $ session->flash(); ?>3 <?php echo $this->Session->flash(); ?> 4 4 5 <?php echo $ form->create(null, array('action' => 'edit/'.$this->data['User']['id'])); ?>6 <fieldset><legend><?php __('General'); ?></legend>5 <?php echo $this->Form->create(null, array('action' => 'edit/'.$this->data['User']['id'])); ?> 6 <fieldset><legend><?php echo __('General'); ?></legend> 7 7 <?php 8 echo $ form->input('User.firstname', array('label' => __('First name', true)));9 echo $ form->input('User.lastname', array('label' => __('Last name', true)));10 echo $ form->input('User.email', array('label' => __('Email', true)));11 $roles = array(ROLE_USER => __('User' , true), ROLE_SYSOP => __('System Operator', true));8 echo $this->Form->input('User.firstname', array('label' => __('First name'))); 9 echo $this->Form->input('User.lastname', array('label' => __('Last name'))); 10 echo $this->Form->input('User.email', array('label' => __('Email'))); 11 $roles = array(ROLE_USER => __('User'), ROLE_SYSOP => __('System Operator')); 12 12 if ($allowAdminRole) { 13 $roles[ROLE_ADMIN] = __('Admin' , true);13 $roles[ROLE_ADMIN] = __('Admin'); 14 14 } 15 echo $ form->input('User.role', array('type' => 'select', 'options' => $roles, 'selected' => $this->data['User']['role']));15 echo $this->Form->input('User.role', array('type' => 'select', 'options' => $roles, 'selected' => $this->data['User']['role'])); 16 16 ?> 17 17 </fieldset> … … 19 19 <fieldset><legend>Other</legend> 20 20 <?php 21 echo $ form->input('User.expires', array('label' => __('Expire date', true), 'type' => 'text'));22 echo $ form->input('User.quota', array('type' => 'text', 'label' => __('Upload Quota', true), 'value' => $number->toReadableSize($this->data['User']['quota'])));21 echo $this->Form->input('User.expires', array('label' => __('Expire date'), 'type' => 'text')); 22 echo $this->Form->input('User.quota', array('type' => 'text', 'label' => __('Upload Quota'), 'value' => $this->Number->toReadableSize($this->data['User']['quota']))); 23 23 ?> 24 24 </fieldset> 25 25 26 <?php echo $ form->end(__('Save', true)); ?>26 <?php echo $this->Form->end(__('Save')); ?> -
View/Users/admin_index.ctp
r1a41cea r0fb8d7c 1 1 <h1>Users</h1> 2 <?php echo $ session->flash(); ?>2 <?php echo $this->Session->flash(); ?> 3 3 4 4 <?php $paginator->options(array('update' => 'main_content', 'indicator' => 'spinner'));?> 5 5 6 <?php echo $paginator->prev(__('Prev' , true), null, null, array('class' => 'disabled')); ?>6 <?php echo $paginator->prev(__('Prev'), null, null, array('class' => 'disabled')); ?> 7 7 <?php echo " | "; echo $paginator->numbers(); ?> 8 <?php echo $paginator->next(__('Next' , true), null, null, array('class' => 'disabled')); ?>8 <?php echo $paginator->next(__('Next'), null, null, array('class' => 'disabled')); ?> 9 9 10 10 Page <?php echo $paginator->counter() ?> … … 13 13 <thead> 14 14 <tr> 15 <td><?php echo $paginator->sort(__('Username' , true), 'username'); ?></td>16 <td><?php echo $paginator->sort(__('Firstname' , true), 'firstname'); ?></td>17 <td><?php echo $paginator->sort(__('Lastname' , true), 'lastname'); ?></td>18 <td><?php __('Guests'); ?></td>19 <td><?php echo $paginator->sort(__('User role' , true), 'role'); ?></td>20 <td><?php __('Actions'); ?></td>15 <td><?php echo $paginator->sort(__('Username'), 'username'); ?></td> 16 <td><?php echo $paginator->sort(__('Firstname'), 'firstname'); ?></td> 17 <td><?php echo $paginator->sort(__('Lastname'), 'lastname'); ?></td> 18 <td><?php echo __('Guests'); ?></td> 19 <td><?php echo $paginator->sort(__('User role'), 'role'); ?></td> 20 <td><?php echo __('Actions'); ?></td> 21 21 </tr> 22 22 </thead> … … 25 25 <?php $row=0; foreach($this->data as $user): ?> 26 26 <tr class="<?php echo ($row++%2)?"even":"odd";?>"> 27 <td><?php echo $ html->link($user['User']['username'], '/admin/users/edit/'.$user['User']['id']);?></td>27 <td><?php echo $this->Html->link($user['User']['username'], '/admin/users/edit/'.$user['User']['id']);?></td> 28 28 <td><?php echo $user['User']['firstname'];?></td> 29 29 <td><?php echo $user['User']['lastname'];?></td> … … 37 37 case ROLE_NOBODY: __('Nobody'); break; 38 38 default: 39 echo __('Unknown' , true);39 echo __('Unknown'); 40 40 Logger::error("Unkown role of user: ".$user['User']['role']); 41 41 break; 42 42 };?></td> 43 43 <td><?php 44 $delConfirm = sprintf(__("Do you really want to detete the user '%s'? This action is irreversible! All the data of the users will be deleted!", true), $user['User']['username']);45 echo $ html->link(46 $ html->image('icons/pencil.png', array('alt' => __('Edit', true), 'title' => __('Edit', true))),44 $delConfirm = __("Do you really want to detete the user '%s'? This action is irreversible! All the data of the users will be deleted!", $user['User']['username']); 45 echo $this->Html->link( 46 $this->Html->image('icons/pencil.png', array('alt' => __('Edit'), 'title' => __('Edit'))), 47 47 '/admin/users/edit/'.$user['User']['id'], array('escape' => false)).' '. 48 $ html->link($html->image('icons/delete.png', array('alt' => __('Delete', true), 'title' => __('Delete', true))),48 $this->Html->link($this->Html->image('icons/delete.png', array('alt' => __('Delete'), 'title' => __('Delete'))), 49 49 '/admin/users/del/'.$user['User']['id'], array('escape' => false), $delConfirm);?></td> 50 50 </tr> -
View/Users/admin_password.ctp
r1a41cea r0fb8d7c 1 <h1><?php printf(__(" User: %s", true), $this->data['User']['username']); ?></h1>1 <h1><?php echo __(" User: %s", $this->data['User']['username']); ?></h1> 2 2 3 <?php echo $ session->flash(); ?>3 <?php echo $this->Session->flash(); ?> 4 4 5 <?php echo $ form->create(null, array('action' => 'password/'.$this->data['User']['id'])); ?>5 <?php echo $this->Form->create(null, array('action' => 'password/'.$this->data['User']['id'])); ?> 6 6 <fieldset><legend>Password</legend> 7 7 <?php 8 echo $ form->input('User.password', array('label' => __('Password', true)));9 echo $ form->input('User.confirm', array('label' => __('Confirm', true), 'type' => 'password'));8 echo $this->Form->input('User.password', array('label' => __('Password'))); 9 echo $this->Form->input('User.confirm', array('label' => __('Confirm'), 'type' => 'password')); 10 10 ?> 11 11 </fieldset> 12 12 13 <?php echo $ form->end(__('Save', true)); ?>13 <?php echo $this->Form->end(__('Save')); ?> -
View/Users/admin_path.ctp
r1a41cea r0fb8d7c 1 <h1><?php printf(__(" User: %s", true), $this->data['User']['username']); ?></h1>1 <h1><?php echo __(" User: %s", $this->data['User']['username']); ?></h1> 2 2 3 <?php echo $ session->flash(); ?>3 <?php echo $this->Session->flash(); ?> 4 4 5 5 6 6 <?php if (isset($fsroots['path']['fsroot'])): ?> 7 <p><?php __('The user can import media files from following external directories:'); ?></p>7 <p><?php echo __('The user can import media files from following external directories:'); ?></p> 8 8 9 9 <table class="default"> 10 10 <thead> 11 11 <tr> 12 <td><?php __('Directory'); ?></td>13 <td><?php __('Actions'); ?></td>12 <td><?php echo __('Directory'); ?></td> 13 <td><?php echo __('Actions'); ?></td> 14 14 </tr> 15 15 </thead> … … 19 19 <td><?php echo "$root"; ?></td> 20 20 <td><?php 21 $delConfirm = sprintf(__("Do you really want to detete the path '%s' of '%s'?", true), $root, $this->data['User']['username']);22 echo $ html->link($html->image('icons/delete.png', array('alt' => __('Delete', true), 'title' => sprintf(__("Delete path '%s'", true), $root))),21 $delConfirm = __("Do you really want to detete the path '%s' of '%s'?", $root, $this->data['User']['username']); 22 echo $this->Html->link($this->Html->image('icons/delete.png', array('alt' => __('Delete'), 'title' => __("Delete path '%s'", $root))), 23 23 '/admin/users/delpath/'.$this->data['User']['id'].'/'.$root, array('escape' => false), $delConfirm);?></td> 24 24 </tr> … … 29 29 <?php else: ?> 30 30 <div class="info"> 31 <p><?php __('Currently no external directories are set for this user.'); ?></p>31 <p><?php echo __('Currently no external directories are set for this user.'); ?></p> 32 32 33 <p><?php __('The user has a dedicated upload directory which is handled by phTagr itself. External directories can be added here to the user to allow the import of external media files from the local file system.'); ?></p>33 <p><?php echo __('The user has a dedicated upload directory which is handled by phTagr itself. External directories can be added here to the user to allow the import of external media files from the local file system.'); ?></p> 34 34 </div> 35 35 <?php endif; ?> 36 36 37 <?php echo $ form->create(null, array('action' => 'path/'.$this->data['User']['id'])); ?>38 <fieldset><legend><?php __('Add Directory'); ?></legend>39 <?php echo $ form->input('Option.path.fspath', array('label' => __('Directory', true))); ?>37 <?php echo $this->Form->create(null, array('action' => 'path/'.$this->data['User']['id'])); ?> 38 <fieldset><legend><?php echo __('Add Directory'); ?></legend> 39 <?php echo $this->Form->input('Option.path.fspath', array('label' => __('Directory'))); ?> 40 40 </fieldset> 41 <?php echo $ form->end(__('Add', true)); ?>41 <?php echo $this->Form->end(__('Add')); ?> -
View/Users/admin_register.ctp
r1a41cea r0fb8d7c 1 <h1><?php __('User Registration'); ?></h1>2 <?php echo $ session->flash(); ?>1 <h1><?php echo __('User Registration'); ?></h1> 2 <?php echo $this->Session->flash(); ?> 3 3 4 <?php echo $ form->create(null, array('action' => 'register')); ?>5 <fieldset><legend><?php __('Registration'); ?></legend>6 <?php echo $ form->input('user.register.enable', array('label' => __('Allow anonymous registration', true), 'type' => 'checkbox')); ?>7 <?php echo $ form->input('user.register.quota', array('label' => __('Initial quota limit', true), 'type' => 'text', 'value' => $number->toReadableSize($this->data['user']['register']['quota']))); ?>4 <?php echo $this->Form->create(null, array('action' => 'register')); ?> 5 <fieldset><legend><?php echo __('Registration'); ?></legend> 6 <?php echo $this->Form->input('user.register.enable', array('label' => __('Allow anonymous registration'), 'type' => 'checkbox')); ?> 7 <?php echo $this->Form->input('user.register.quota', array('label' => __('Initial quota limit'), 'type' => 'text', 'value' => $this->Number->toReadableSize($this->data['user']['register']['quota']))); ?> 8 8 </fieldset> 9 <?php echo $ form->end(__('Save', true)); ?>9 <?php echo $this->Form->end(__('Save')); ?> -
View/Users/confirm.ctp
r1a41cea r0fb8d7c 1 <?php echo $ session->flash(); ?>1 <?php echo $this->Session->flash(); ?> 2 2 3 <?php echo $ form->create('User', array('action' => 'confirm')); ?>3 <?php echo $this->Form->create('User', array('action' => 'confirm')); ?> 4 4 <fieldset> 5 <legend><?php __('Account Confirmation'); ?></legend>6 <p><?php __('Please insert your confirmation key to finalize the account creation.'); ?></p>5 <legend><?php echo __('Account Confirmation'); ?></legend> 6 <p><?php echo __('Please insert your confirmation key to finalize the account creation.'); ?></p> 7 7 <?php 8 echo $ form->input('User.key', array('label' => __('Key', true)));8 echo $this->Form->input('User.key', array('label' => __('Key'))); 9 9 ?> 10 10 </fieldset> 11 <?php echo $ form->end(__('Confirm', true)); ?>11 <?php echo $this->Form->end(__('Confirm')); ?> 12 12 -
View/Users/index.ctp
r1a41cea r0fb8d7c 2 2 __('Users'); 3 3 if ($isAdmin) { 4 echo ' ' . $ html->link(__('Admin List', true), array('admin' => true, 'action' => 'index'));4 echo ' ' . $this->Html->link(__('Admin List'), array('admin' => true, 'action' => 'index')); 5 5 } 6 6 ?></h1> 7 7 8 <?php echo $ session->flash(); ?>8 <?php echo $this->Session->flash(); ?> 9 9 10 10 <?php if (!empty($this->data)): ?> … … 13 13 <?php 14 14 $headers = array( 15 __('Name' , true),16 __('Member Since' , true)15 __('Name'), 16 __('Member Since') 17 17 ); 18 echo $ html->tableHeaders($headers);18 echo $this->Html->tableHeaders($headers); 19 19 ?> 20 20 </thead> … … 26 26 foreach($this->data as $user) { 27 27 $row = array( 28 $ html->link($user['User']['username'], "view/{$user['User']['username']}"),28 $this->Html->link($user['User']['username'], "view/{$user['User']['username']}"), 29 29 $time->relativeTime($user['User']['created']), 30 30 ); 31 31 $cells[] = $row; 32 32 } 33 echo $ html->tableCells($cells, array('class' => 'odd'), array('class' => 'even'));33 echo $this->Html->tableCells($cells, array('class' => 'odd'), array('class' => 'even')); 34 34 ?> 35 35 </tbody> 36 36 </table> 37 37 <?php else: ?> 38 <p><?php __('User list is empty'); ?></p>38 <p><?php echo __('User list is empty'); ?></p> 39 39 <?php endif; ?> -
View/Users/login.ctp
r3605ef4 r0fb8d7c 3 3 <?php echo $this->Form->create('User', array('action' => 'login', 'class' => 'login')); ?> 4 4 <fieldset> 5 <legend><?php __('Login'); ?></legend>5 <legend><?php echo __('Login'); ?></legend> 6 6 <?php 7 echo $this->Form->input('User.username', array('label' => __('Username' , true)));8 echo $this->Form->input('User.password', array('label' => __('Password' , true)));7 echo $this->Form->input('User.username', array('label' => __('Username'))); 8 echo $this->Form->input('User.password', array('label' => __('Password'))); 9 9 ?> 10 10 </fieldset> … … 13 13 $signup = ''; 14 14 15 echo $this->Form->submit(__('Login' , true), array('div' => false));15 echo $this->Form->submit(__('Login'), array('div' => false)); 16 16 if ($register) { 17 echo " ".$this->Html->link(__('Sign Up' , true), 'register', array('class' => 'button'))." ";17 echo " ".$this->Html->link(__('Sign Up'), 'register', array('class' => 'button'))." "; 18 18 } 19 echo "<br/>".$this->Html->link(__('Forgot your password' , true), 'password');19 echo "<br/>".$this->Html->link(__('Forgot your password'), 'password'); 20 20 ?> 21 21 </div> -
View/Users/password.ctp
r1a41cea r0fb8d7c 1 <h1><?php __('Password Request'); ?></h1>2 <?php echo $ session->flash(); ?>1 <h1><?php echo __('Password Request'); ?></h1> 2 <?php echo $this->Session->flash(); ?> 3 3 4 <p><?php __("Please insert your username and email address to request your lost password."); ?>4 <p><?php echo __("Please insert your username and email address to request your lost password."); ?> 5 5 6 <?php echo $ form->create('User', array('action' => 'password')); ?>7 <fieldset><legend><?php __('Account Data'); ?></legend>6 <?php echo $this->Form->create('User', array('action' => 'password')); ?> 7 <fieldset><legend><?php echo __('Account Data'); ?></legend> 8 8 <?php 9 echo $ form->input('User.username', array('label' => __('Username', true)));10 echo $ form->input('User.email', array('label' => __('Email', true)));9 echo $this->Form->input('User.username', array('label' => __('Username'))); 10 echo $this->Form->input('User.email', array('label' => __('Email'))); 11 11 ?> 12 12 </fieldset> 13 <?php echo $ form->end(__('Submit', true)); ?>13 <?php echo $this->Form->end(__('Submit')); ?> 14 14 <?php 15 15 $script = <<<'JS' -
View/Users/register.ctp
r1a41cea r0fb8d7c 1 <?php echo $ session->flash(); ?>1 <?php echo $this->Session->flash(); ?> 2 2 3 <?php echo $ form->create('User', array('action' => 'register')); ?>3 <?php echo $this->Form->create('User', array('action' => 'register')); ?> 4 4 <fieldset> 5 <legend><?php __('Create Account'); ?></legend>5 <legend><?php echo __('Create Account'); ?></legend> 6 6 <?php 7 echo $ form->input('User.username', array('label' => __('Username', true)));8 echo $ form->input('User.password', array('label' => __('Password', true)));9 echo $ form->input('User.confirm', array('label' => __('Confirm', true), 'type' => 'password'));10 echo $ form->input('User.email', array('label' => __('Email', true)));11 echo '<div class="input text"><label> </label><img src="'.$ html->url('/users/captcha/verify.jpg').'" /></div>';12 echo $ form->input('Captcha.verification');7 echo $this->Form->input('User.username', array('label' => __('Username'))); 8 echo $this->Form->input('User.password', array('label' => __('Password'))); 9 echo $this->Form->input('User.confirm', array('label' => __('Confirm'), 'type' => 'password')); 10 echo $this->Form->input('User.email', array('label' => __('Email'))); 11 echo '<div class="input text"><label> </label><img src="'.$this->Html->url('/users/captcha/verify.jpg').'" /></div>'; 12 echo $this->Form->input('Captcha.verification'); 13 13 ?> 14 14 </fieldset> 15 15 <?php 16 echo $ form->end(__('Sign Up', true));16 echo $this->Form->end(__('Sign Up')); 17 17 18 18 $script = <<<'JS' -
View/Users/view.ctp
r1a41cea r0fb8d7c 1 1 <h1><?php 2 printf(__('User %s', true), $this->data['User']['username']);2 __('User %s', $this->data['User']['username']); 3 3 if ($currentUser['User']['role'] >= ROLE_SYSOP) { 4 echo " " . $ html->link(__("Edit", true), array('action' => 'edit', 'admin' => true, $this->data['User']['id']));4 echo " " . $this->Html->link(__("Edit"), array('action' => 'edit', 'admin' => true, $this->data['User']['id'])); 5 5 } 6 6 ?></h1> 7 7 8 <?php echo $ session->flash() ?>8 <?php echo $this->Session->flash() ?> 9 9 10 <h2><?php __('User Details'); ?></h2>10 <h2><?php echo __('User Details'); ?></h2> 11 11 12 12 <table class="default"> … … 14 14 <?php 15 15 $headers = array( 16 __('Description' , true),17 __('Value' , true),16 __('Description'), 17 __('Value'), 18 18 ); 19 echo $ html->tableHeaders($headers);19 echo $this->Html->tableHeaders($headers); 20 20 ?> 21 21 </thead> … … 24 24 <?php 25 25 $cells = array(); 26 $cells[] = array(__("Member since" , true), $this->Time->relativeTime($this->data['User']['created']));27 $cells[] = array(__("Count of media" , true), $this->data['Media']['count']);28 $cells[] = array(__("Count of files" , true), $this->data['File']['count']);29 $cells[] = array(__("Size of files" , true), $this->Number->toReadableSize($this->data['File']['bytes']));30 echo $ html->tableCells($cells, array('class' => 'odd'), array('class' => 'even'));26 $cells[] = array(__("Member since"), $this->Time->relativeTime($this->data['User']['created'])); 27 $cells[] = array(__("Count of media"), $this->data['Media']['count']); 28 $cells[] = array(__("Count of files"), $this->data['File']['count']); 29 $cells[] = array(__("Size of files"), $this->Number->toReadableSize($this->data['File']['bytes'])); 30 echo $this->Html->tableCells($cells, array('class' => 'odd'), array('class' => 'even')); 31 31 ?> 32 32 </tbody> 33 33 </table> 34 34 35 <h2><?php __('Group List'); ?></h2>35 <h2><?php echo __('Group List'); ?></h2> 36 36 <table class="default"> 37 37 <thead> 38 38 <?php 39 39 $headers = array( 40 __('Group' , true),41 __('User' , true),42 __('Description' , true),43 __('Action' , true),40 __('Group'), 41 __('User'), 42 __('Description'), 43 __('Action'), 44 44 ); 45 echo $ html->tableHeaders($headers);45 echo $this->Html->tableHeaders($headers); 46 46 ?> 47 47 </thead> … … 54 54 $username = implode('', Set::extract("/User[id={$group['user_id']}]/username", $users)); 55 55 $cells[] = array( 56 $ html->link($group['name'], "/groups/view/{$group['name']}"),57 $ html->link($username, "/user/view/$username"),56 $this->Html->link($group['name'], "/groups/view/{$group['name']}"), 57 $this->Html->link($username, "/user/view/$username"), 58 58 $text->truncate($group['description'], 30, array('ending' => '...', 'exact' => false, 'html' => false)), 59 $ html->link("View media", "/explorer/group/{$group['name']}")59 $this->Html->link("View media", "/explorer/group/{$group['name']}") 60 60 ); 61 61 } … … 66 66 $username = implode('', Set::extract("/User[id={$group['user_id']}]/username", $users)); 67 67 $cells[] = array( 68 $ html->link($group['name'], "/groups/view/{$group['name']}"),69 $ html->link($username, "/users/view/$username"),68 $this->Html->link($group['name'], "/groups/view/{$group['name']}"), 69 $this->Html->link($username, "/users/view/$username"), 70 70 $text->truncate($group['description'], 30, array('ending' => '...', 'exact' => false, 'html' => false)), 71 $ html->link("View media", "/explorer/group/{$group['name']}")71 $this->Html->link("View media", "/explorer/group/{$group['name']}") 72 72 ); 73 73 } … … 83 83 } 84 84 usort($cells, 'compareCells'); 85 echo $ html->tableCells($cells, array('class' => 'odd'), array('class' => 'even'));85 echo $this->Html->tableCells($cells, array('class' => 'odd'), array('class' => 'even')); 86 86 ?> 87 87 </tbody> … … 89 89 90 90 <?php if ($media): ?> 91 <h2><?php __("Recent Media"); ?></h2>91 <h2><?php echo __("Recent Media"); ?></h2> 92 92 <p><?php 93 93 foreach($media as $m) { 94 echo $ imageData->mediaLink($m, 'mini');94 echo $this->ImageData->mediaLink($m, 'mini'); 95 95 } 96 96 ?></p> 97 <p><?php printf(__('See all media of user %s', true), $html->link($this->data['User']['username'], "/explorer/user/{$this->data['User']['username']}")); ?></p>97 <p><?php echo __('See all media of user %s', $this->Html->link($this->data['User']['username'], "/explorer/user/{$this->data['User']['username']}")); ?></p> 98 98 <?php endif; ?> -
View/home/index.ctp
r3605ef4 r0fb8d7c 13 13 14 14 $link = $this->Search->getUri(array('sort' => 'random')); 15 echo "<p>" . __("See more %s", $this->Html->link(__('random media...' , true), $link))."</p>";15 echo "<p>" . __("See more %s", $this->Html->link(__('random media...'), $link))."</p>"; 16 16 } 17 17 ?> … … 35 35 echo $this->Html->tag('div', implode("\n", $links), array('class' => 'images', 'escape' => false)); 36 36 $link = $this->Search->getUri(array('sort' => 'newest')); 37 echo "<p>" . __("See %s", $this->Html->link(__('all new media...' , true), $link))."</p>";37 echo "<p>" . __("See %s", $this->Html->link(__('all new media...'), $link))."</p>"; 38 38 ?> 39 39 </div>
