Changeset 0fb8d7c9464f805d666366ee2f31f047ee138b3a

Show
Ignore:
Timestamp:
01/28/12 14:02:57 (4 months ago)
Author:
Xemle <xemle@phtagr.org>
Children:
ee4c2b7fedeac65c7bf3af2de933963981702433
Parents:
1a41ceaa48ef54a2a73176f8a6e3e1209dee2f52
git-committer:
Xemle <xemle@phtagr.org> / 2012-01-28T14:02:57Z+0100
Message:

Migrate views to CakePHP 2.0

Location:
View
Files:
78 modified

Legend:

Unmodified
Added
Removed
  • View/Browser/folder.ctp

    re449ecc0 r0fb8d7c  
    1 <h1><?php __("Create Folder"); ?></h1> 
     1<h1><?php echo __("Create Folder"); ?></h1> 
    22 
    3 <?php echo $session->flash(); ?> 
     3<?php echo $this->Session->flash(); ?> 
    44 
    5 <p><?php printf(__("Location %s", true), $fileList->location($path)); ?></p> 
     5<p><?php echo __("Location %s", $fileList->location($path)); ?></p> 
    66 
    7 <?php echo $form->create(false, array('action' => 'folder/'.$path)); ?> 
     7<?php echo $this->Form->create(false, array('action' => 'folder/'.$path)); ?> 
    88<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"))); ?> 
    1010</fieldset> 
    1111<?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)), 
    1414    array('class' => 'buttons', 'escape' => false)); 
    15   echo $form->end(); 
     15  echo $this->Form->end(); 
    1616?> 
  • View/Browser/import.ctp

    re449ecc0 r0fb8d7c  
    1 <h1><?php __("Browser"); ?></h1> 
     1<h1><?php echo __("Browser"); ?></h1> 
    22 
    3 <?php echo $session->flash(); ?> 
     3<?php echo $this->Session->flash(); ?> 
    44 
    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> 
    22 
    3 <?php echo $session->flash(); ?> 
     3<?php echo $this->Session->flash(); ?> 
    44 
    55<?php if (count($imports)): ?> 
    6 <h2><?php __("Your uploaded media"); ?></h2> 
     6<h2><?php echo __("Your uploaded media"); ?></h2> 
    77 
    88<p><?php $count = 1; foreach ($imports as $media): ?> 
    99<?php  
    10   echo $imageData->mediaLink($media, 'mini') . ' ';  
     10  echo $this->ImageData->mediaLink($media, 'mini') . ' ';  
    1111  if ($count >= 6) { 
    1212    break; 
     
    1515?> 
    1616<?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()))); ?> 
    1818<?php endif; // imports ?> 
    1919 
    2020<?php if ($free > 0): ?> 
    2121 
    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> 
    2424 
    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')); ?> 
    3131</fieldset> 
    3232 
    33 <?php echo $form->end(__("Upload", true)); ?> 
     33<?php echo $this->Form->end(__("Upload")); ?> 
    3434<?php  
    3535    $script = <<<'JS' 
     
    4242  echo $this->Html->scriptBlock($script, array('inline' => false)); 
    4343?> 
    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> 
    4545<?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> 
    4747<?php endif; ?> 
  • View/Browser/sync.ctp

    r3605ef4 r0fb8d7c  
    88 
    99<?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> 
    1111<?php endif; ?> 
    1212 
  • View/Browser/upload.ctp

    re449ecc0 r0fb8d7c  
    1 <h1><?php __("File Upload"); ?></h1> 
     1<h1><?php echo __("File Upload"); ?></h1> 
    22 
    3 <?php echo $session->flash(); ?> 
     3<?php echo $this->Session->flash(); ?> 
    44 
    55<?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> 
    88 
    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')); ?> 
    1717</fieldset> 
    1818 
    1919<?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)), 
    2222    array('class' => 'buttons', 'escape' => false)); 
    23   echo $form->end(); 
     23  echo $this->Form->end(); 
    2424?> 
    2525 
    2626<?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> 
    2828<?php endif; ?> 
  • View/Browser/view.ctp

    re449ecc0 r0fb8d7c  
    1 <h1><?php __("File Overview"); ?></h1> 
     1<h1><?php echo __("File Overview"); ?></h1> 
    22 
    33<table class="default"> 
    44<thead> 
    5   <?php echo $html->tableHeaders(array(__('Description', true), __('Value', true))); ?> 
     5  <?php echo $this->Html->tableHeaders(array(__('Description'), __('Value'))); ?> 
    66</thead> 
    77<tbody> 
    88<?php 
    99  $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']); 
    1212  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']))); 
    1515  } else { 
    16     $cells[] = array(__('Bytes total', true), $number->toReadableSize($files['bytes'])); 
     16    $cells[] = array(__('Bytes total'), $this->Number->toReadableSize($files['bytes'])); 
    1717  }  
    1818  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']))); 
    2020  } 
    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')); 
    2828?> 
    2929</tbody> 
  • View/Comments/index.ctp

    r1a41cea r0fb8d7c  
    11<h1>Comments</h1> 
    2 <?php echo $session->flash(); ?> 
     2<?php echo $this->Session->flash(); ?> 
    33 
    44<?php if ($comments): ?> 
     
    2020  $img = '<img src="'.Router::url('/media/mini/'.$comment['Media']['id'].'/'.$comment['Media']['name']).'" />'; 
    2121  $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>';?> 
    2323<?php echo preg_replace('/\n/', '<br />', $text->truncate($comment['Comment']['text'], 220, array('ending' => '...', 'exact' => false, 'html' => false))); ?> 
    2424</div> 
  • View/Elements/Explorer/date.ctp

    r1a41cea r0fb8d7c  
    11<p class="single-media"> 
    2 <?php __("Date"); ?> 
     2<?php echo __("Date"); ?> 
    33<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')); ?> 
    55<span class="tooltip-actions"><span class="sub"> 
    66<?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));  
    99?> 
    10 <?php if ($search->getFrom()) : ?> 
     10<?php if ($this->Search->getFrom()) : ?> 
    1111<?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));  
    1515  } 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));  
    1818  } 
    1919?> 
    2020<?php endif; ?> 
    2121<?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));  
    2828?> 
    29 <?php if ($search->getTo()) : ?> 
     29<?php if ($this->Search->getTo()) : ?> 
    3030<?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));  
    3434  } 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));  
    3737  }  
    3838?> 
    3939<?php endif; ?> 
    4040<?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));  
    4343?> 
    4444</span></span> 
  • View/Elements/Explorer/description.ctp

    r1a41cea r0fb8d7c  
    11<?php  
    2   $search->initialize();  
     2  $this->Search->initialize();  
    33  echo $this->element('explorer/date', array('media' => $media)); 
    44  if (count($media['Tag'])) { 
    55    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))),  
    77      array('class' => 'tag list', 'escape' => false)); 
    88  } 
    99  if (count($media['Category'])) { 
    1010    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))), 
    1212      array('class' => 'category list', 'escape' => false)); 
    1313  } 
    1414  if (count($media['Location'])) { 
    1515    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))), 
    1717      array('class' => 'location list', 'escape' => false)); 
    1818  } 
    19   if ($search->getUser() == $currentUser['User']['username'] && !empty($media['Group']['name'])) { 
     19  if ($this->Search->getUser() == $currentUser['User']['username'] && !empty($media['Group']['name'])) { 
    2020    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))), 
    2222      array('class' => 'group list', 'escape' => false)); 
    2323  } 
    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) { 
    2525    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')), 
    3030      array('class' => 'access list', 'escape' => false)); 
    3131    } 
  • View/Elements/Explorer/media.ctp

    r1a41cea r0fb8d7c  
    11<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'])); 
    44  } else { 
    55    echo h($media['Media']['name']); 
     
    77?></h2> 
    88<?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()); 
    1111  $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()); 
    1414  } 
    1515   
    1616  // image centrering from http://www.brunildo.org/test/img_center.html 
    1717  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( 
    2020      'src' => Router::url("/media/thumb/".$media['Media']['id']), 
    2121      'width' => $size[0], 'height' => $size[1],  
    2222      '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)))); 
    2424  echo "</div>"; 
    2525?> 
     
    3030<?php 
    3131  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')), 
    3535      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')), 
    3939      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')), 
    4343      array('escape' => false)); 
    4444  } 
    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')), 
    4949      array('escape' => false)); 
    5050  } 
    5151  if ($media['Media']['canReadOriginal']) { 
    5252    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')), 
    5656        array('escape' => false)); 
    5757    } 
  • View/Elements/Explorer/menu.ctp

    r1a41cea r0fb8d7c  
    1010<div id="p-explorer-menu"> 
    1111<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> 
    1313  <?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> 
    1515  <?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> 
    1717  <?php endif; // canWriteAcl ?> 
    1818  <?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> 
    2020</ul> 
    2121<div class="pages"> 
    2222<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> 
    2525<?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> 
    2929<?php endif; ?> 
    3030</ul> 
     
    3333<div id="p-explorer-all-meta"> 
    3434<?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))); 
    3737  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))); 
    3939  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))); 
    4141  ksort($locationUrls); 
    4242 
    4343  if (count($tagUrls)) { 
    44     echo "<p>" . __("Tags", true) . " \n"; 
     44    echo "<p>" . __("Tags") . " \n"; 
    4545    foreach ($tagUrls as $name => $urls) { 
    46       echo $imageData->getExtendSearchLinks($urls, $name) . "\n"; 
     46      echo $this->ImageData->getExtendSearchLinks($urls, $name) . "\n"; 
    4747    } 
    4848    echo "</p>\n"; 
    4949  } 
    5050  if (count($categoryUrls)) { 
    51     echo "<p>" . __("Categories", true) . " \n"; 
     51    echo "<p>" . __("Categories") . " \n"; 
    5252    foreach ($categoryUrls as $name => $urls) { 
    53       echo $imageData->getExtendSearchLinks($urls, $name) . "\n"; 
     53      echo $this->ImageData->getExtendSearchLinks($urls, $name) . "\n"; 
    5454    } 
    5555    echo "</p>\n"; 
    5656  } 
    5757  if (count($locationUrls)) { 
    58     echo "<p>" . __("Locations", true) . " \n"; 
     58    echo "<p>" . __("Locations") . " \n"; 
    5959    foreach ($locationUrls as $name => $urls) { 
    60       echo $imageData->getExtendSearchLinks($urls, $name) . "\n"; 
     60      echo $this->ImageData->getExtendSearchLinks($urls, $name) . "\n"; 
    6161    } 
    6262    echo "</p>\n"; 
    6363  } 
    6464?> 
    65 <p><?php echo __('Users', true) . " "; ?> 
     65<p><?php echo __('Users') . " "; ?> 
    6666<?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))); 
    6868  foreach ($userUrls as $name => $urls) { 
    69     echo $imageData->getExtendSearchLinks($urls, $name, ($name == $user)) . ' '; 
     69    echo $this->ImageData->getExtendSearchLinks($urls, $name, ($name == $user)) . ' '; 
    7070  } 
    7171?></p> 
    72 <p><?php echo __('Pagesize', true) . " "; ?> 
     72<p><?php echo __('Pagesize') . " "; ?> 
    7373<?php  $links = array(); 
    7474  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))); 
    7676  } 
    7777  echo implode($links); 
    7878?></p> 
    79 <p><?php echo __('Sort', true) . " "; ?> 
     79<p><?php echo __('Sort') . " "; ?> 
    8080<?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'))); 
    8888  echo implode(' ', $links); 
    8989?></p> 
    9090</div><!-- all meta --> 
    9191<?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')); 
    9494?> 
    9595<div id="p-explorer-edit-meta"> 
    96 <fieldset><legend><?php __("Metadata"); ?></legend> 
     96<fieldset><legend><?php echo __("Metadata"); ?></legend> 
    9797<?php  
    98   echo $form->hidden('Media.ids', array('id' => 'MediaIds')); 
     98  echo $this->Form->hidden('Media.ids', array('id' => 'MediaIds')); 
    9999  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')))); 
    101101    echo $autocomplete->autoComplete('Tag.names', 'autocomplete/tag', array('split' => true)); 
    102102  } 
    103103  if ($canWriteMeta) { 
    104     echo $form->input('Category.names', array('label' => __('Categories', true))); 
     104    echo $this->Form->input('Category.names', array('label' => __('Categories'))); 
    105105    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'))); 
    107107    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'))); 
    109109    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'))); 
    111111    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'))); 
    113113    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')))); 
    115115  } 
    116116  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')); 
    120120    $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") 
    125125    ); 
    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')); 
    128128  } 
    129129?> 
    130130</fieldset> 
    131 <?php echo $form->submit(__('Apply', true)); ?> 
     131<?php echo $this->Form->submit(__('Apply')); ?> 
    132132</div> 
    133133<?php if ($canWriteAcl): ?> 
    134134<div id="p-explorer-edit-access"> 
    135 <fieldset><legend><?php __("Access Rights"); ?></legend> 
     135<fieldset><legend><?php echo __("Access Rights"); ?></legend> 
    136136<?php 
    137137  $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')),  
    146146    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')),  
    150150    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')),  
    154154    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')),  
    158158    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?"))); 
    160160?> 
    161161</fieldset> 
    162 <?php echo $form->submit(__('Apply', true)); ?> 
     162<?php echo $this->Form->submit(__('Apply')); ?> 
    163163</div> 
    164164<?php endif; // canWriteAcl==true ?> 
    165 <?php echo $form->end(); ?> 
     165<?php echo $this->Form->end(); ?> 
    166166</div> 
    167167</div><!-- explorer menu --> 
  • View/Elements/comment.ctp

    r1a41cea r0fb8d7c  
    11<?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))); 
    44?> 
    55<div id="comments"> 
    66<?php if (count($this->data['Comment'])): ?> 
    7 <h3><?php echo __('Comments', true); ?></h3> 
     7<h3><?php echo __('Comments'); ?></h3> 
    88<?php $count = 0; ?> 
    99<?php foreach ($this->data['Comment'] as $key => $comment): ?> 
     
    1414  $name = $comment['name']; 
    1515  if (!empty($comment['url'])) { 
    16     $name = $html->link($comment['name'], $comment['url']); 
     16    $name = $this->Html->link($comment['name'], $comment['url']); 
    1717  }   
    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); 
    2020?> 
    2121<?php 
    2222  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); 
    2424  } 
    2525?>: 
     
    3333<?php endif; /* has comments */ ?> 
    3434 
    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')); ?> 
    3737<fieldset> 
    3838<?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'])); 
    4040?> 
    4141<?php  
    4242  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)); 
    4646  } 
    4747  if (($commentAuth & COMMENT_AUTH_CAPTCHA) > 0) { 
    48     echo '<div class="input text"><label>&nbsp;</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>&nbsp;</label><img src="'.$this->Html->url('/comments/captcha/verify.jpg').'" /></div>'; 
     49    echo $this->Form->input('Captcha.verification', array('label' => __('Verification'))); 
    5050  } 
    5151?> 
    5252<?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')); 
    5555?> 
    5656</fieldset> 
    57 <?php echo $form->end(__('Add Comment', true)); ?> 
     57<?php echo $this->Form->end(__('Add Comment')); ?> 
    5858</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> 
    22 
    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> 
    44 
    55<?php  
     
    1414   
    1515  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>"; 
    1717    echo "<p>"; 
    1818    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( 
    2121          'src' => 'cid:media-' . $m['Media']['id'] . '.jpg',  
    2222          'alt' => $m['Media']['name'])),  
     
    2727?> 
    2828 
    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> 
    3030<p></p> 
    31 <p><?php __("Sincerly, your phTagr agent"); ?></p> 
     31<p><?php echo __("Sincerly, your phTagr agent"); ?></p> 
    3232 
    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']); ?> 
    22 
    33 
    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)); ?> 
    55 
    66 
     
    1616   
    1717  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"; 
    1919    foreach ($userMedia as $m) { 
    2020      echo "{$m['Media']['name']} (Link: $url/images/view/{$m['Media']['id']})\r\n"; 
     
    2424?> 
    2525 
    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'); ?> 
    2727 
    2828 
    29 <?php __("Sincerly, your phTagr agent"); ?> 
     29<?php echo __("Sincerly, your phTagr agent"); ?> 
    3030 
    3131 
    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  
    11<?php  
    22global $TIME_START;  
    3 $time = getMicrotime() - $TIME_START; 
    4 printf(__("%s Social Web Gallery %s in %.3fs. Layout based on %s, Icons by %s", true), '&copy; 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", '&copy; 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'));  
    55?> 
  • 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  
    44  $items = array(); 
    55  $items[] = array( 
    6     'text' => __('Home', true),  
     6    'text' => __('Home'),  
    77    'link' => '/',  
    88    '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'); 
    1212    $myImages = false; 
    13     if (isset($search) &&  
     13    if (isset($this->Search) &&  
    1414      ($controller == 'explorer' || $controller == 'images') &&  
    15       $search->getUser() == $session->read('User.username')) { 
     15      $this->Search->getUser() == $this->Session->read('User.username')) { 
    1616      $myImages = true; 
    1717    } 
    1818    $items[] = array( 
    19       'text' => __('Explorer', true),  
     19      'text' => __('Explorer'),  
    2020      'link' => '/explorer',  
    2121      'type' => ($controller == 'explorer' && !$myImages?'current':'')); 
     
    2323    if ($role >= ROLE_GUEST) { 
    2424      $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'),  
    2727        'type' => ($controller == 'explorer' && $myImages?'current':'')); 
    2828    } 
     
    3030      if (!$option->get('user.browser.full', 0)) { 
    3131        $items[] = array( 
    32           'text' => __('Upload', true),  
     32          'text' => __('Upload'),  
    3333          'link' => '/browser/quickupload',  
    3434          'type' => ($controller == 'browser' && $action == 'quickupload'?'current':'')); 
    3535      } else { 
    3636        $items[] = array( 
    37           'text' => __('My Files', true),  
     37          'text' => __('My Files'),  
    3838          'link' => '/browser',  
    3939          'type' => ($controller == 'browser' && $action != 'quickupload'?'current':'')); 
     
    4242  } else { 
    4343    $items[] = array( 
    44       'text' => __('Explorer', true),  
     44      'text' => __('Explorer'),  
    4545      'link' => '/explorer',  
    4646      'type' => ($controller == 'explorer'?'current':'')); 
  • View/Elements/single_acl_form.ctp

    r1a41cea r0fb8d7c  
    11<?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'))); 
    77?> 
  • View/Elements/single_meta_form.ctp

    r1a41cea r0fb8d7c  
    11<?php 
    22  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)))); 
    44    echo $autocomplete->autoComplete('Tag.names', '/explorer/autocomplete/tag', array('split' => true)); 
    55  } 
    66  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)))); 
    88    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)))); 
    1010    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)))); 
    1212    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)))); 
    1414    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)))); 
    1616    echo $autocomplete->autoComplete('Location.country', '/explorer/autocomplete/country'); 
    1717    $geo = ""; 
     
    1919      $geo = $this->data['Media']['latitude'] . ', ' . $this->data['Media']['longitude']; 
    2020    } 
    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)); 
    2222  } 
    2323  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')); 
    2727} 
    2828?> 
  • View/Elements/topnav.ctp

    r3605ef4 r0fb8d7c  
    11<?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'); 
    66    if ($role >= ROLE_SYSOP) { 
    7       echo $html->link(__('System'), "/admin/system/general")." | "; 
     7      echo $this->Html->link(__('System'), "/admin/system/general")." | "; 
    88    } 
    99    if ($role >= ROLE_USER) { 
    10       echo $html->link(__('Preferences'), "/options/profile")." | "; 
     10      echo $this->Html->link(__('Preferences'), "/options/profile")." | "; 
    1111    } 
    12     echo $html->link(__("Logout"), "/users/logout"). " ($name)"; 
     12    echo $this->Html->link(__("Logout"), "/users/logout"). " ($name)"; 
    1313  } else { 
    14     echo $html->link(__("Login"), "/users/login"); 
     14    echo $this->Html->link(__("Login"), "/users/login"); 
    1515    if ($option->get('user.register.enable', 0)) { 
    16       echo ' | '.$html->link(__("Register", true), "/users/register"); 
     16      echo ' | '.$this->Html->link(__("Register"), "/users/register"); 
    1717    } 
    1818  } 
    1919 
    2020  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)); 
    2323  $icon = Router::url("/img/icons/zoom.png"); 
    2424  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(); 
    2626  echo "</div></div>\n"; 
    2727?> 
  • View/Explorer/editacl.ctp

    r1a41cea r0fb8d7c  
    11<?php  
    22  $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)); 
    55?> 
    66<fieldset> 
  • View/Explorer/editmeta.ctp

    r1a41cea r0fb8d7c  
    11<?php  
    22  $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));  
    55?> 
    66<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); ?> 
    77 
    88<?php  
     
    3232            buttons: { 
    3333              ':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) { 
    3636                  $('#media-' + id).html(data); 
    3737                  $('#media-' + id).mediaAction(); 
     
    5959            buttons: { 
    6060              ':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) { 
    6363                  $('#media-' + id).html(data); 
    6464                  $('#media-' + id).mediaAction(); 
     
    165165  $vars = array( 
    166166    '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")); 
    171171  foreach ($vars as $name => $value) { 
    172172    $script = preg_replace("/:$name/", $value, $script); 
    173173  } 
    174   echo $this->Javascript->link('/piclenslite/piclens_optimized', false); 
     174  echo $this->Html->script('/piclenslite/piclens_optimized'); 
    175175  echo $this->Html->scriptBlock($script, array('inline' => false)); 
    176176?> 
     
    180180$canWriteTag = count($this->data) ? max(Set::extract('/Media/canWriteTag', $this->data)) : 0; 
    181181$index = 0; 
    182 $pos = ($search->getPage(1)-1) * $search->getShow(12) + 1; 
     182$pos = ($this->Search->getPage(1)-1) * $this->Search->getShow(12) + 1; 
    183183 
    184184echo '<div class="row">'; 
     
    186186  $editable = $media['Media']['canWriteTag'] ? 'editable' : ''; 
    187187  $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)), 
    190190    array('class' => "p-explorer-media $editable $cell", 'id' => 'media-' . $media['Media']['id'], 'escape' => false)); 
    191191  $index++; 
     
    202202  if ($canWriteTag): ?> 
    203203<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> 
    206206</div></div> 
    207207<?php endif; ?> 
    208208 
    209 <?php echo $navigator->pages() ?> 
     209<?php echo $this->Navigator->pages() ?> 
    210210 
    211211<div id="dialog"></div> 
  • View/Explorer/media.ctp

    r1a41cea r0fb8d7c  
    55  <description>Media RSS of phTagr (<?php echo Router::url('/', true); ?>)</description> 
    66<?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)));  
    88?> 
    99<?php 
    1010  $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'); 
    1414  } 
    1515  $quality = 'preview'; 
    1616  if (isset($this->params['named']['quality']) &&  
    1717    $this->params['named']['quality'] == 'high') { 
    18     $search->setQuality('high'); 
     18    $this->Search->setQuality('high'); 
    1919    $quality = 'high'; 
    2020  } 
    2121?> 
    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); ?>" /> 
    2323<?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); ?>" /> 
    2525<?php endif; ?> 
    2626<?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); ?>" /> 
    2828<?php endif; ?> 
    2929<?php  
    30   $offset = $search->getShow() * ($search->getPage(1) - 1) + 1; 
     30  $offset = $this->Search->getShow() * ($this->Search->getPage(1) - 1) + 1; 
    3131  foreach ($this->data as $media): ?> 
    3232  <item> 
     
    3434    <link><?php  
    3535      $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> 
    3737    <?php  
    38       $thumbSize = $imageData->getimagesize($media, OUTPUT_SIZE_THUMB); 
     38      $thumbSize = $this->ImageData->getimagesize($media, OUTPUT_SIZE_THUMB); 
    3939      $thumbUrl = sprintf("/media/thumb/%d%s/%s", $media['Media']['id'], $keyParam, $media['Media']['name']); 
    4040 
    4141      if ($media['Media']['canReadOriginal'] && $quality == 'high') { 
    4242        $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); 
    4444      } else { 
    4545        $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); 
    4747      } 
    4848    ?><media:thumbnail url="<?php echo Router::url($thumbUrl, true); ?>" <?php echo $thumbSize[3]; ?> /> 
     
    5151    <?php  
    5252      if ($media['Media']['caption']) { 
    53         echo $html->tag('description', $media['Media']['caption']);  
     53        echo $this->Html->tag('description', $media['Media']['caption']);  
    5454      } else { 
    5555        echo "<description />\n"; 
  • View/Explorer/quicksearch.ctp

    r1a41cea r0fb8d7c  
    11<h1>Quick Search Results</h1> 
    2 <?php echo $session->flash(); ?> 
     2<?php echo $this->Session->flash(); ?> 
    33 
    44 
    55<?php 
    6 $search->initialize(); 
     6$this->Search->initialize(); 
    77$cell=0; 
    88 
    99if (!count($this->data)): ?> 
    1010<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)); ?> 
    1212</div> 
    1313<?php else: ?> 
    1414 
    15 <h2><?php printf(__('Results of %s', true), h($quicksearch)); ?></h2> 
     15<h2><?php echo __('Results of %s', h($quicksearch)); ?></h2> 
    1616<div class="minis" align="left"> 
    1717<script type="text/javascript"> 
     
    2121<?php  
    2222  foreach($this->data as $media) { 
    23     echo $imageData->mediaLink($media, 'mini').' '; 
     23    echo $this->ImageData->mediaLink($media, 'mini').' '; 
    2424  } 
    2525?> 
     
    2929  $tags = Set::extract('/Tag/name', $this->data); 
    3030  if (count($tags)) { 
    31     echo '<p>' . __('See more results of tag', true) .  ': '; 
     31    echo '<p>' . __('See more results of tag') .  ': '; 
    3232    $tags = array_unique($tags); 
    3333    $links = array(); 
    3434    foreach ($tags as $name) { 
    35       $links[] = $html->link($name, '/explorer/tag/'.$name); 
     35      $links[] = $this->Html->link($name, '/explorer/tag/'.$name); 
    3636    } 
    3737    echo implode(', ', $links) . '</p>'; 
     
    4040  $categories = Set::extract('/Category/name', $this->data); 
    4141  if (count($categories)) { 
    42     echo '<p>' . __('See more results of category', true) .  ': '; 
     42    echo '<p>' . __('See more results of category') .  ': '; 
    4343    $categories = array_unique($categories); 
    4444    $links = array(); 
    4545    foreach ($categories as $name) { 
    46       $links[] = $html->link($name, '/explorer/category/'.$name); 
     46      $links[] = $this->Html->link($name, '/explorer/category/'.$name); 
    4747    } 
    4848    echo implode(', ', $links) . '</p>'; 
     
    5151  $locations = Set::extract('/Location/name', $this->data); 
    5252  if (count($locations)) { 
    53     echo '<p>' . __('See more results of location', true) .  ': '; 
     53    echo '<p>' . __('See more results of location') .  ': '; 
    5454    $locations = array_unique($locations); 
    5555    $links = array(); 
    5656    foreach ($locations as $name) { 
    57       $links[] = $html->link($name, '/explorer/location/'.$name); 
     57      $links[] = $this->Html->link($name, '/explorer/location/'.$name); 
    5858    } 
    5959    echo implode(', ', $links) . '</p>'; 
  • View/Explorer/search.ctp

    r1a41cea r0fb8d7c  
    1 <h1><?php __('Advanced Search'); ?></h1> 
     1<h1><?php echo __('Advanced Search'); ?></h1> 
    22 
    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> 
    55<?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'))); 
    99 
    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'))); 
    1212?> 
    1313</fieldset> 
    14 <fieldset><legend><?php __('Options'); ?></legend> 
     14<fieldset><legend><?php echo __('Options'); ?></legend> 
    1515<?php  
    1616  $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'))); 
    1818 
    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'))); 
    2121?> 
    2222</fieldset> 
    2323<?php if ($userRole >= ROLE_GUEST): ?> 
    24 <fieldset><legend><?php __('Advanced'); ?></legend> 
     24<fieldset><legend><?php echo __('Advanced'); ?></legend> 
    2525<?php 
    2626  if ($userId) { 
    27     echo $form->hidden('User.username', array('value' => $userId)); 
     27    echo $this->Form->hidden('User.username', array('value' => $userId)); 
    2828  } 
    2929  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'))); 
    3333  } 
    3434  if ($userRole >= ROLE_USER) { 
    3535    if (!$userId) { 
    36       echo $form->input('User.username', array('label' => __('Username', true))); 
     36      echo $this->Form->input('User.username', array('label' => __('Username'))); 
    3737    } 
    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'))); 
    3939 
    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'))); 
    4242  } 
    4343 
    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'))); 
    4949 
    5050?> 
    5151</fieldset> 
    5252<?php endif; ?> 
    53 <?php echo $form->end(__('Search', true)); ?> 
     53<?php echo $this->Form->end(__('Search')); ?> 
  • View/Explorer/updatemeta.ctp

    r1a41cea r0fb8d7c  
    11<?php  
    2   $search->initialize(); 
    3   $pos = $search->getPos(); 
     2  $this->Search->initialize(); 
     3  $pos = $this->Search->getPos(); 
    44  $index = 0; 
    55  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> 
    22 
    3 <?php echo $session->flash(); ?> 
     3<?php echo $this->Session->flash(); ?> 
    44 
    5 <?php echo $form->create(null, array('action' => 'create')); ?> 
     5<?php echo $this->Form->create(null, array('action' => 'create')); ?> 
    66 
    7 <fieldset><legend><?php __('Create new group'); ?></legend> 
     7<fieldset><legend><?php echo __('Create new group'); ?></legend> 
    88<?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')); 
    1414?> 
    1515</fieldset> 
    16 <?php echo $form->end(__('Create', true)); ?> 
     16<?php echo $this->Form->end(__('Create')); ?> 
  • View/Groups/dashboard_create.ctp

    r1a41cea r0fb8d7c  
    11<h1>Create Group</h1> 
    22 
    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')); ?> 
    55 
    6 <fieldset><legend><?php __('Create new group'); ?></legend> 
     6<fieldset><legend><?php echo __('Create new group'); ?></legend> 
    77<?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')); 
    1313?> 
    1414</fieldset> 
    15 <?php echo $form->end(__('Create', true)); ?> 
     15<?php echo $this->Form->end(__('Create')); ?> 
    1616 
    1717<?php 
     
    2121<h1>Create Group</h1> 
    2222 
    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')); ?> 
    2525 
    26 <fieldset><legend><?php __('Create new group'); ?></legend> 
     26<fieldset><legend><?php echo __('Create new group'); ?></legend> 
    2727<?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')); 
    3333?> 
    3434</fieldset> 
    35 <?php echo $form->end(__('Create', true)); ?> 
     35<?php echo $this->Form->end(__('Create')); ?> 
    3636 
    3737<?php 
     
    4141<h1>Create Group</h1> 
    4242 
    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')); ?> 
    4545 
    46 <fieldset><legend><?php __('Create new group'); ?></legend> 
     46<fieldset><legend><?php echo __('Create new group'); ?></legend> 
    4747<?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')); 
    5353?> 
    5454</fieldset> 
    55 <?php echo $form->end(__('Create', true)); ?> 
     55<?php echo $this->Form->end(__('Create')); ?> 
    5656 
    5757<?php 
     
    6161<h1>Create Group</h1> 
    6262 
    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')); ?> 
    6565 
    66 <fieldset><legend><?php __('Create new group'); ?></legend> 
     66<fieldset><legend><?php echo __('Create new group'); ?></legend> 
    6767<?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')); 
    7373?> 
    7474</fieldset> 
    75 <?php echo $form->end(__('Create', true)); ?> 
     75<?php echo $this->Form->end(__('Create')); ?> 
    7676 
    7777<?php 
     
    8181<h1>Create Group</h1> 
    8282 
    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')); ?> 
    8585 
    86 <fieldset><legend><?php __('Create new group'); ?></legend> 
     86<fieldset><legend><?php echo __('Create new group'); ?></legend> 
    8787<?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')); 
    9393?> 
    9494</fieldset> 
    95 <?php echo $form->end(__('Create', true)); ?> 
     95<?php echo $this->Form->end(__('Create')); ?> 
    9696 
    9797<?php 
     
    101101<h1>Create Group</h1> 
    102102 
    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')); ?> 
    105105 
    106 <fieldset><legend><?php __('Create new group'); ?></legend> 
     106<fieldset><legend><?php echo __('Create new group'); ?></legend> 
    107107<?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')); 
    113113?> 
    114114</fieldset> 
    115 <?php echo $form->end(__('Create', true)); ?> 
     115<?php echo $this->Form->end(__('Create')); ?> 
    116116 
    117117<?php 
  • View/Groups/dashboard_index.ctp

    r1a41cea r0fb8d7c  
    1 <?php echo $session->flash(); ?> 
     1<?php echo $this->Session->flash(); ?> 
    22 
    33<h1>Group Dashboard</h1> 
     
    77 
    88?> 
    9 <?php echo $session->flash(); ?> 
     9<?php echo $this->Session->flash(); ?> 
    1010 
    1111<h1>Group Dashboard</h1> 
     
    1515 
    1616?> 
    17 <?php echo $session->flash(); ?> 
     17<?php echo $this->Session->flash(); ?> 
    1818 
    1919<h1>Group Dashboard</h1> 
     
    2323 
    2424?> 
    25 <?php echo $session->flash(); ?> 
     25<?php echo $this->Session->flash(); ?> 
    2626 
    2727<h1>Group Dashboard</h1> 
     
    3131 
    3232?> 
    33 <?php echo $session->flash(); ?> 
     33<?php echo $this->Session->flash(); ?> 
    3434 
    3535<h1>Group Dashboard</h1> 
     
    3939 
    4040?> 
    41 <?php echo $session->flash(); ?> 
     41<?php echo $this->Session->flash(); ?> 
    4242 
    4343<h1>Group Dashboard</h1> 
  • View/Groups/dashboard_manage.ctp

    r1a41cea r0fb8d7c  
    11<h1>Group Memberships</h1> 
    22 
    3 <?php echo $session->flash(); ?> 
     3<?php echo $this->Session->flash(); ?> 
    44 
    55<table class="default"> 
    66<thead> 
    77<?php 
    8 $headers = array(__('Group Name', true), __('Action', true)); 
    9 echo $html->tableHeaders($headers); 
     8$headers = array(__('Group Name'), __('Action')); 
     9echo $this->Html->tableHeaders($headers); 
    1010?> 
    1111</thead> 
     
    1717$cells = array(); 
    1818foreach ($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}")); 
    2020        $cells[] = $row; 
    2121} 
    2222 
    23 echo $html->tableCells($cells, array('class' => 'odd'), array('class' => 'even')); 
     23echo $this->Html->tableCells($cells, array('class' => 'odd'), array('class' => 'even')); 
    2424?> 
    2525 
     
    3333<h1>Group Memberships</h1> 
    3434 
    35 <?php echo $session->flash(); ?> 
     35<?php echo $this->Session->flash(); ?> 
    3636 
    3737<table class="default"> 
    3838<thead> 
    3939<?php 
    40 $headers = array(__('Group Name', true), __('Action', true)); 
    41 echo $html->tableHeaders($headers); 
     40$headers = array(__('Group Name'), __('Action')); 
     41echo $this->Html->tableHeaders($headers); 
    4242?> 
    4343</thead> 
     
    4949$cells = array(); 
    5050foreach ($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}")); 
    5252        $cells[] = $row; 
    5353} 
    5454 
    55 echo $html->tableCells($cells, array('class' => 'odd'), array('class' => 'even')); 
     55echo $this->Html->tableCells($cells, array('class' => 'odd'), array('class' => 'even')); 
    5656?> 
    5757 
     
    6565<h1>Group Memberships</h1> 
    6666 
    67 <?php echo $session->flash(); ?> 
     67<?php echo $this->Session->flash(); ?> 
    6868 
    6969<table class="default"> 
    7070<thead> 
    7171<?php 
    72 $headers = array(__('Group Name', true), __('Action', true)); 
    73 echo $html->tableHeaders($headers); 
     72$headers = array(__('Group Name'), __('Action')); 
     73echo $this->Html->tableHeaders($headers); 
    7474?> 
    7575</thead> 
     
    8181$cells = array(); 
    8282foreach ($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}")); 
    8484        $cells[] = $row; 
    8585} 
    8686 
    87 echo $html->tableCells($cells, array('class' => 'odd'), array('class' => 'even')); 
     87echo $this->Html->tableCells($cells, array('class' => 'odd'), array('class' => 'even')); 
    8888?> 
    8989 
     
    9797<h1>Group Memberships</h1> 
    9898 
    99 <?php echo $session->flash(); ?> 
     99<?php echo $this->Session->flash(); ?> 
    100100 
    101101<table class="default"> 
    102102<thead> 
    103103<?php 
    104 $headers = array(__('Group Name', true), __('Action', true)); 
    105 echo $html->tableHeaders($headers); 
     104$headers = array(__('Group Name'), __('Action')); 
     105echo $this->Html->tableHeaders($headers); 
    106106?> 
    107107</thead> 
     
    113113$cells = array(); 
    114114foreach ($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}")); 
    116116        $cells[] = $row; 
    117117} 
    118118 
    119 echo $html->tableCells($cells, array('class' => 'odd'), array('class' => 'even')); 
     119echo $this->Html->tableCells($cells, array('class' => 'odd'), array('class' => 'even')); 
    120120?> 
    121121 
     
    129129<h1>Group Memberships</h1> 
    130130 
    131 <?php echo $session->flash(); ?> 
     131<?php echo $this->Session->flash(); ?> 
    132132 
    133133<table class="default"> 
    134134<thead> 
    135135<?php 
    136 $headers = array(__('Group Name', true), __('Action', true)); 
    137 echo $html->tableHeaders($headers); 
     136$headers = array(__('Group Name'), __('Action')); 
     137echo $this->Html->tableHeaders($headers); 
    138138?> 
    139139</thead> 
     
    145145$cells = array(); 
    146146foreach ($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}")); 
    148148        $cells[] = $row; 
    149149} 
    150150 
    151 echo $html->tableCells($cells, array('class' => 'odd'), array('class' => 'even')); 
     151echo $this->Html->tableCells($cells, array('class' => 'odd'), array('class' => 'even')); 
    152152?> 
    153153 
     
    161161<h1>Group Memberships</h1> 
    162162 
    163 <?php echo $session->flash(); ?> 
     163<?php echo $this->Session->flash(); ?> 
    164164 
    165165<table class="default"> 
    166166<thead> 
    167167<?php 
    168 $headers = array(__('Group Name', true), __('Action', true)); 
    169 echo $html->tableHeaders($headers); 
     168$headers = array(__('Group Name'), __('Action')); 
     169echo $this->Html->tableHeaders($headers); 
    170170?> 
    171171</thead> 
     
    177177$cells = array(); 
    178178foreach ($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}")); 
    180180        $cells[] = $row; 
    181181} 
    182182 
    183 echo $html->tableCells($cells, array('class' => 'odd'), array('class' => 'even')); 
     183echo $this->Html->tableCells($cells, array('class' => 'odd'), array('class' => 'even')); 
    184184?> 
    185185 
  • View/Groups/dashboard_search.ctp

    r1a41cea r0fb8d7c  
    1 <?php echo $session->flash(); ?> 
     1<?php echo $this->Session->flash(); ?> 
    22 
    33<h1>Search Group</h1> 
    44 
    5 <h2><?php __('Results') ?></h2> 
     5<h2><?php echo __('Results') ?></h2> 
    66<ul> 
    77<?php if(!empty($groups)) { 
     
    99        foreach ($groups as $group) { 
    1010                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']}"); 
    1212                echo "</li>"; 
    1313        } 
     
    1616} 
    1717?> 
    18 <?php echo $form->create(null, array('action' => 'search')); ?> 
     18<?php echo $this->Form->create(null, array('action' => 'search')); ?> 
    1919<?php  
    20   echo $form->input('Group.searchquery', array('label' => __('Find Group:', true))); 
     20  echo $this->Form->input('Group.searchquery', array('label' => __('Find Group:'))); 
    2121?> 
    22 <?php echo $form->end(__('Search', true)); ?> 
     22<?php echo $this->Form->end(__('Search')); ?> 
    2323 
    2424</ul> 
     
    2727 
    2828?> 
    29 <?php echo $session->flash(); ?> 
     29<?php echo $this->Session->flash(); ?> 
    3030 
    3131<h1>Search Group</h1> 
    3232 
    33 <h2><?php __('Results') ?></h2> 
     33<h2><?php echo __('Results') ?></h2> 
    3434<ul> 
    3535<?php if(!empty($groups)) { 
     
    3737        foreach ($groups as $group) { 
    3838                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']}"); 
    4040                echo "</li>"; 
    4141        } 
     
    4444} 
    4545?> 
    46 <?php echo $form->create(null, array('action' => 'search')); ?> 
     46<?php echo $this->Form->create(null, array('action' => 'search')); ?> 
    4747<?php  
    48   echo $form->input('Group.searchquery', array('label' => __('Find Group:', true))); 
     48  echo $this->Form->input('Group.searchquery', array('label' => __('Find Group:'))); 
    4949?> 
    50 <?php echo $form->end(__('Search', true)); ?> 
     50<?php echo $this->Form->end(__('Search')); ?> 
    5151 
    5252</ul> 
     
    5555 
    5656?> 
    57 <?php echo $session->flash(); ?> 
     57<?php echo $this->Session->flash(); ?> 
    5858 
    5959<h1>Search Group</h1> 
    6060 
    61 <h2><?php __('Results') ?></h2> 
     61<h2><?php echo __('Results') ?></h2> 
    6262<ul> 
    6363<?php if(!empty($groups)) { 
     
    6565        foreach ($groups as $group) { 
    6666                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']}"); 
    6868                echo "</li>"; 
    6969        } 
     
    7272} 
    7373?> 
    74 <?php echo $form->create(null, array('action' => 'search')); ?> 
     74<?php echo $this->Form->create(null, array('action' => 'search')); ?> 
    7575<?php  
    76   echo $form->input('Group.searchquery', array('label' => __('Find Group:', true))); 
     76  echo $this->Form->input('Group.searchquery', array('label' => __('Find Group:'))); 
    7777?> 
    78 <?php echo $form->end(__('Search', true)); ?> 
     78<?php echo $this->Form->end(__('Search')); ?> 
    7979 
    8080</ul> 
     
    8383 
    8484?> 
    85 <?php echo $session->flash(); ?> 
     85<?php echo $this->Session->flash(); ?> 
    8686 
    8787<h1>Search Group</h1> 
    8888 
    89 <h2><?php __('Results') ?></h2> 
     89<h2><?php echo __('Results') ?></h2> 
    9090<ul> 
    9191<?php if(!empty($groups)) { 
     
    9393        foreach ($groups as $group) { 
    9494                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']}"); 
    9696                echo "</li>"; 
    9797        } 
     
    100100} 
    101101?> 
    102 <?php echo $form->create(null, array('action' => 'search')); ?> 
     102<?php echo $this->Form->create(null, array('action' => 'search')); ?> 
    103103<?php  
    104   echo $form->input('Group.searchquery', array('label' => __('Find Group:', true))); 
     104  echo $this->Form->input('Group.searchquery', array('label' => __('Find Group:'))); 
    105105?> 
    106 <?php echo $form->end(__('Search', true)); ?> 
     106<?php echo $this->Form->end(__('Search')); ?> 
    107107 
    108108</ul> 
     
    111111 
    112112?> 
    113 <?php echo $session->flash(); ?> 
     113<?php echo $this->Session->flash(); ?> 
    114114 
    115115<h1>Search Group</h1> 
    116116 
    117 <h2><?php __('Results') ?></h2> 
     117<h2><?php echo __('Results') ?></h2> 
    118118<ul> 
    119119<?php if(!empty($groups)) { 
     
    121121        foreach ($groups as $group) { 
    122122                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']}"); 
    124124                echo "</li>"; 
    125125        } 
     
    128128} 
    129129?> 
    130 <?php echo $form->create(null, array('action' => 'search')); ?> 
     130<?php echo $this->Form->create(null, array('action' => 'search')); ?> 
    131131<?php  
    132   echo $form->input('Group.searchquery', array('label' => __('Find Group:', true))); 
     132  echo $this->Form->input('Group.searchquery', array('label' => __('Find Group:'))); 
    133133?> 
    134 <?php echo $form->end(__('Search', true)); ?> 
     134<?php echo $this->Form->end(__('Search')); ?> 
    135135 
    136136</ul> 
     
    139139 
    140140?> 
    141 <?php echo $session->flash(); ?> 
     141<?php echo $this->Session->flash(); ?> 
    142142 
    143143<h1>Search Group</h1> 
    144144 
    145 <h2><?php __('Results') ?></h2> 
     145<h2><?php echo __('Results') ?></h2> 
    146146<ul> 
    147147<?php if(!empty($groups)) { 
     
    149149        foreach ($groups as $group) { 
    150150                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']}"); 
    152152                echo "</li>"; 
    153153        } 
     
    156156} 
    157157?> 
    158 <?php echo $form->create(null, array('action' => 'search')); ?> 
     158<?php echo $this->Form->create(null, array('action' => 'search')); ?> 
    159159<?php  
    160   echo $form->input('Group.searchquery', array('label' => __('Find Group:', true))); 
     160  echo $this->Form->input('Group.searchquery', array('label' => __('Find Group:'))); 
    161161?> 
    162 <?php echo $form->end(__('Search', true)); ?> 
     162<?php echo $this->Form->end(__('Search')); ?> 
    163163 
    164164</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> 
    22 
    3 <?php echo $session->flash() ?> 
     3<?php echo $this->Session->flash() ?> 
    44 
    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']}")); ?> 
    66 
    7 <fieldset><legend><?php __('Edit Group'); ?></legend> 
     7<fieldset><legend><?php echo __('Edit Group'); ?></legend> 
    88<?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')); 
    1515?> 
    1616</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> 
    22 
    3 <?php echo $session->flash(); ?> 
     3<?php echo $this->Session->flash(); ?> 
    44 
    55<?php if (!empty($this->data)): ?> 
     
    88<?php 
    99  $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); 
    1616?> 
    1717</thead> 
     
    2828    if ($currentUser['User']['id'] != $group['Group']['user_id']) { 
    2929      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'))), 
    3232          "subscribe/{$group['Group']['name']}", array('escape' => false)); 
    3333      } 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'))), 
    3636          "unsubscribe/{$group['Group']['name']}", array('escape' => false)); 
    3737      } 
     
    3939 
    4040    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'))), 
    4343        "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'))), 
    4747        'delete/'.$group['Group']['id'], array('escape' => false), $delConfirm); 
    4848    } 
    4949    $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']}"), 
    5252      $text->truncate($group['Group']['description'], 30, array('ending' => '...', 'exact' => false, 'html' => false)), 
    5353      count($group['Member']), 
    54       $html->tag('div', implode(' ', $actions), array('class' => 'actionlist')) 
     54      $this->Html->tag('div', implode(' ', $actions), array('class' => 'actionlist')) 
    5555      ); 
    5656    $cells[] = $row; 
    5757  } 
    58   echo $html->tableCells($cells, array('class' => 'odd'), array('class' => 'even')); 
     58  echo $this->Html->tableCells($cells, array('class' => 'odd'), array('class' => 'even')); 
    5959?> 
    6060</tbody> 
     
    6262<?php else: ?> 
    6363<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.'); ?> 
    6565</div> 
    6666<?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> 
    22 
    3 <?php echo $session->flash() ?> 
     3<?php echo $this->Session->flash() ?> 
    44 
    5 <h2><?php __('Member List'); ?></h2> 
     5<h2><?php echo __('Member List'); ?></h2> 
    66<table class="default"> 
    77<thead> 
    88<?php  
    99  $headers = array( 
    10     __('Member', true), 
     10    __('Member'), 
    1111    ); 
    1212  if ($this->data['Group']['is_admin']) { 
    13     $headers[] = __('Action', true); 
     13    $headers[] = __('Action'); 
    1414  } 
    15   echo $html->tableHeaders($headers); 
     15  echo $this->Html->tableHeaders($headers); 
    1616?> 
    1717</thead> 
     
    2323    $actions = array(); 
    2424    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',  
    2727          array( 
    28             'alt' => __('Delete', true),  
    29             'title' => sprintf(__("Unsubscribe '%s'", true), $member['username']) 
     28            'alt' => __('Delete'),  
     29            'title' => __("Unsubscribe '%s'", $member['username']) 
    3030          ) 
    3131        ), "deleteMember/{$this->data['Group']['name']}/{$member['username']}", array('escape' => false)); 
    3232    } 
    3333    $row = array( 
    34       $html->link($member['username'], "/users/view/{$member['username']}"), 
     34      $this->Html->link($member['username'], "/users/view/{$member['username']}"), 
    3535      ); 
    3636    if ($actions) { 
     
    3939    $cells[] = $row; 
    4040  } 
    41   echo $html->tableCells($cells, array('class' => 'odd'), array('class' => 'even')); 
     41  echo $this->Html->tableCells($cells, array('class' => 'odd'), array('class' => 'even')); 
    4242?>  
    4343</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> 
    22 
    3 <?php echo $session->flash() ?> 
     3<?php echo $this->Session->flash() ?> 
    44 
    5 <h2><?php __('Details'); ?></h2> 
     5<h2><?php echo __('Details'); ?></h2> 
    66 
    7 <h3><?php __('Description'); ?></h3> 
     7<h3><?php echo __('Description'); ?></h3> 
    88 
    99<p><?php  
     
    1414  } ?></p> 
    1515<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); 
    1717  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']}"); 
    1919  } 
    2020?></p> 
     
    2222<ul class="bare"> 
    2323<?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' => '-')) . ' '; 
    2626  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")); 
    2828  } 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")); 
    3030  } 
    3131  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")); 
    3333  } 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")); 
    3535  } 
    3636  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")); 
    3838  } 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")); 
    4040  } 
    4141?> 
    4242</ul> 
    4343 
    44 <h2><?php __('Member List'); ?></h2> 
     44<h2><?php echo __('Member List'); ?></h2> 
    4545<table class="default"> 
    4646<thead> 
    4747<?php  
    4848  $headers = array( 
    49     __('Member', true), 
     49    __('Member'), 
    5050    ); 
    5151  if ($this->data['Group']['is_admin']) { 
    52     $headers[] = __('Action', true); 
     52    $headers[] = __('Action'); 
    5353  } 
    54   echo $html->tableHeaders($headers); 
     54  echo $this->Html->tableHeaders($headers); 
    5555?> 
    5656</thead> 
     
    6262    $actions = array(); 
    6363    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',  
    6666          array( 
    67             'alt' => __('Delete', true),  
    68             'title' => sprintf(__("Unsubscribe '%s'", true), $member['username']) 
     67            'alt' => __('Delete'),  
     68            'title' => __("Unsubscribe '%s'", $member['username']) 
    6969          ) 
    7070        ), "deleteMember/{$this->data['Group']['name']}/{$member['username']}", array('escape' => false)); 
    7171    } 
    7272    $row = array( 
    73       $html->link($member['username'], "/users/view/{$member['username']}"), 
     73      $this->Html->link($member['username'], "/users/view/{$member['username']}"), 
    7474      ); 
    7575    if ($actions) { 
     
    7878    $cells[] = $row; 
    7979  } 
    80   echo $html->tableCells($cells, array('class' => 'odd'), array('class' => 'even')); 
     80  echo $this->Html->tableCells($cells, array('class' => 'odd'), array('class' => 'even')); 
    8181?>  
    8282</tbody> 
     
    8585<?php  
    8686  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)); 
    9090    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)), 
    9393      array('class' => 'buttons', 'escape' => false)); 
    94     echo $form->end(); 
     94    echo $this->Form->end(); 
    9595  } else { 
    9696    $userId = $this->Session->read('User.id'); 
    9797    $memberIds = Set::extract('/Member/id', $this->data); 
    9898    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']}");  
    100100    } else { 
    101       echo $html->link(__('Subscribe', true), "subscribe/{$this->data['Group']['name']}");  
     101      echo $this->Html->link(__('Subscribe'), "subscribe/{$this->data['Group']['name']}");  
    102102    } 
    103103  } 
     
    105105 
    106106<?php if ($media): ?> 
    107 <h2><?php __("Recent Media"); ?></h2> 
     107<h2><?php echo __("Recent Media"); ?></h2> 
    108108<p><?php  
    109109  foreach($media as $m) { 
    110     echo $imageData->mediaLink($m, 'mini'); 
     110    echo $this->ImageData->mediaLink($m, 'mini'); 
    111111  } 
    112112?></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> 
    114114<?php endif; ?> 
  • View/Guests/create.ctp

    r1a41cea r0fb8d7c  
    1 <h1><?php __('Guest Creation'); ?></h1> 
     1<h1><?php echo __('Guest Creation'); ?></h1> 
    22 
    3 <?php echo $session->flash(); ?> 
     3<?php echo $this->Session->flash(); ?> 
    44 
    5 <?php echo $form->create('Guest', array('action' => 'create')); ?> 
     5<?php echo $this->Form->create('Guest', array('action' => 'create')); ?> 
    66 
    7 <fieldset><legend><?php __('Create new guest account'); ?></legend> 
     7<fieldset><legend><?php echo __('Create new guest account'); ?></legend> 
    88<?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'))); 
    1313?> 
    1414</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> 
    22 
    3 <?php echo $session->flash(); ?> 
     3<?php echo $this->Session->flash(); ?> 
    44 
    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> 
    77<?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'))); 
    1111?> 
    1212</fieldset> 
    13 <fieldset><legend><?php __('Password'); ?></legend> 
     13<fieldset><legend><?php echo __('Password'); ?></legend> 
    1414<?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'))); 
    1717?> 
    1818</fieldset> 
    19 <fieldset><legend><?php __('Comments'); ?></legend> 
     19<fieldset><legend><?php echo __('Comments'); ?></legend> 
    2020<?php 
    2121  $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')  
    2525    ); 
    2626  $select = $this->data['Comment']['auth']; 
    2727  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)); 
    3030  echo '</div>'; 
    3131?> 
    3232</fieldset> 
    33 <?php echo $form->submit(__('Save', true)); ?> 
     33<?php echo $this->Form->submit(__('Save')); ?> 
    3434</form> 
    3535 
    3636<?php if(count($this->data['Member'])): ?> 
    37 <h2><?php __('Group List'); ?></h2> 
     37<h2><?php echo __('Group List'); ?></h2> 
    3838<table class="default"> 
    3939<thead> 
    4040<?php 
    4141  $headers = array( 
    42     __('Group', true), 
    43     __('Actions', true) 
     42    __('Group'), 
     43    __('Actions') 
    4444  ); 
    45   echo $html->tableHeaders($headers); 
     45  echo $this->Html->tableHeaders($headers); 
    4646?>   
    4747</thead> 
     
    5151  $cells = array(); 
    5252  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']); 
    5454    $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')),  
    5858        '/guests/deleteGroup/'.$this->data['Guest']['id'].'/'.$group['id'], array('escape' => false), $delConfirm) 
    5959    ); 
    6060  } 
    61   echo $html->tableCells($cells, array('class' => 'odd'), array('class' => 'even')); 
     61  echo $this->Html->tableCells($cells, array('class' => 'odd'), array('class' => 'even')); 
    6262?> 
    6363</tbody> 
    6464</table> 
    6565<?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> 
    6767<?php endif; ?> 
    6868 
    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> 
    7272<?php echo $ajax->autocomplete('Group.name', '/guests/autocomplete'); ?></div> 
    7373</fieldset> 
    74 <?php echo $form->submit(__('Add Group', true)); ?> 
     74<?php echo $this->Form->submit(__('Add Group')); ?> 
    7575</form> 
    7676 
  • View/Guests/index.ctp

    r1a41cea r0fb8d7c  
    1 <h1><?php __('Guests'); ?></h1> 
     1<h1><?php echo __('Guests'); ?></h1> 
    22 
    3 <?php echo $session->flash(); ?> 
     3<?php echo $this->Session->flash(); ?> 
    44 
    55<?php if (!empty($this->data)): ?> 
     
    77<thead> 
    88  <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> 
    1212  </tr> 
    1313</thead> 
     
    1616<?php $row=0; foreach($this->data as $guest): ?> 
    1717  <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> 
    1919    <td><?php echo count($guest['Member']);?></td> 
    2020    <td><div class="actionlist"><?php  
    2121      $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'))), 
    2424          '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'))), 
    2727          'delete/'.$guest['Guest']['id'], array('escape' => false), $delConfirm); ?> 
    2828    </div></td> 
     
    3333<?php else: ?> 
    3434<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.'); ?> 
    3636</div> 
    3737<?php endif; ?> 
  • View/Guests/links.ctp

    r1a41cea r0fb8d7c  
    1 <h1><?php __('Authenticated Links'); ?></h1> 
     1<h1><?php echo __('Authenticated Links'); ?></h1> 
    22 
    33<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> 
    55</div> 
    66 
    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> 
    88 
    9 <h2><?php __('Direct Link'); ?></h2> 
     9<h2><?php echo __('Direct Link'); ?></h2> 
    1010 
    1111<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> 
     
    1515?> 
    1616<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> 
    1818</ul> 
    1919 
    2020 
    21 <h2><?php __('RSS'); ?></h2> 
     21<h2><?php echo __('RSS'); ?></h2> 
    2222 
    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> 
    2424<?php 
    2525  $recentMedia = Router::url('/explorer/rss/key:'.$this->data['Guest']['key'], true); 
     
    2929?> 
    3030<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> 
    3535</ul> 
    3636 
    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  
    179179 
    180180    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)) 
    182182        .implode("\n", $links) 
    183183        .$this->Html->tag('li', $form, array('class' => 'p-breadcrumb-input'), array('escape' => false)), 
  • View/Helper/ExplorerMenuHelper.php

    r1a41cea r0fb8d7c  
    6060    $extra = " <div class=\"actionlist\" id=\"$id\">"; 
    6161    $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)"))); 
    6363    $extra .= $this->Html->link($icon, $link, array('escape' => false)); 
    6464    $extra .= "</div>"; 
    6565 
    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)); 
    6767    $item = array( 
    6868      'text' => $text.$extra, 
     
    123123  function _getOrderItem() { 
    124124    $link = $this->Search->getUri(false, array('sort' => 'date'), 'page'); 
    125     $out = $this->Html->link(__("Order", true), $link); 
     125    $out = $this->Html->link(__("Order"), $link); 
    126126 
    127127    $id = 'order-item'; 
     
    129129    $crumbs = $this->Breadcrumb->filterCrumbs($this->params['crumbs']); 
    130130     
    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"))); 
    132132    $link = $this->Breadcrumb->crumbUrl($this->Breadcrumb->replace($crumbs, 'sort', '-date')); 
    133133    $out .= $this->Html->link($icon, $link, array('escape' => false)); 
    134134     
    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"))); 
    136136    $link = $this->Breadcrumb->crumbUrl($this->Breadcrumb->replace($crumbs, 'sort', 'newest')); 
    137137    $out .= $this->Html->link($icon, $link, array('escape' => false)); 
    138138     
    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"))); 
    140140    $link = $this->Breadcrumb->crumbUrl($this->Breadcrumb->replace($crumbs, 'sort', 'popularity')); 
    141141    $out .= $this->Html->link($icon, $link, array('escape' => false)); 
    142142     
    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"))); 
    144144    $link = $this->Breadcrumb->crumbUrl($this->Breadcrumb->replace($crumbs, 'sort', 'random')); 
    145145    $out .= $this->Html->link($icon, $link, array('escape' => false)); 
    146146     
    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"))); 
    148148    $link = $this->Breadcrumb->crumbUrl($this->Breadcrumb->replace($crumbs, 'sort', 'changes')); 
    149149    $out .= $this->Html->link($icon, $link, array('escape' => false)); 
    150150     
    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"))); 
    152152    $link = $this->Breadcrumb->crumbUrl($this->Breadcrumb->replace($crumbs, 'sort', 'viewed')); 
    153153    $out .= $this->Html->link($icon, $link, array('escape' => false)); 
    154154     
    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"))); 
    156156    $link = $this->Search->getUri(false, array('sort' => 'name'), 'page'); 
    157157    $out .= $this->Html->link($icon, $link, array('escape' => false)); 
     
    172172 
    173173    $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); 
    175175 
    176176    $pos = $this->Search->getPage(1) * $this->Search->getShow(1); 
     
    205205 
    206206    $search = '/explorer/search'; 
    207     $items[] = array('text' => $this->Html->link(__('Advanced Search', true), $search)); 
     207    $items[] = array('text' => $this->Html->link(__('Advanced Search'), $search)); 
    208208 
    209209    $items[] = $this->_getSlideshowItem(); 
     
    212212    $subMenu = $this->_getAssociationSubMenu('tag'); 
    213213    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)); 
    215215    } 
    216216 
    217217    $subMenu = $this->_getAssociationSubMenu('category'); 
    218218    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)); 
    220220    } 
    221221 
    222222    $subMenu = $this->_getAssociationSubMenu('location'); 
    223223    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)); 
    225225    } 
    226226 
     
    228228    $subItems[] = $this->_getOrderItem(); 
    229229    $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)); 
    231231 
    232232    $menu = array('items' => $items); 
  • View/Helper/ImageDataHelper.php

    r3605ef4 r0fb8d7c  
    294294    // Write access 
    295295    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))); 
    297297    } 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))); 
    299299    } 
    300300 
    301301    // Read access 
    302302    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))); 
    304304    } 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))); 
    306306    } 
    307307    if ($t == '') { 
     
    313313  /** Returns an text repesentation of the acl */ 
    314314  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'))); 
    316316    if (isset($data['Group']['name'])) { 
    317317      $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") . ')'; 
    320320    } 
    321321    $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')); 
    329329    return $output; 
    330330  } 
     
    339339 
    340340    $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"))); 
    342342    $output .= $this->Html->link($icon, $this->getDateLink(&$data, 'to'), array('escape' => false)); 
    343343     
    344344    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"))); 
    346346      $output .= $this->Html->link($icon, $this->getDateLink(&$data, 'addTo'), array('escape' => false)); 
    347347    } 
    348348 
    349349    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"))); 
    351351      $output .= $this->Html->link($icon, $this->getDateLink(&$data, 'addTo'), array('escape' => false)); 
    352352    } 
    353353 
    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"))); 
    355355    $output .= $this->Html->link($icon, $this->getDateLink(&$data, '12h'), array('escape' => false)); 
    356356 
    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"))); 
    358358    $output .= $this->Html->link($icon, $this->getDateLink(&$data, '3.5d'), array('escape' => false)); 
    359359 
    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"))); 
    361361    $output .= $this->Html->link($icon, $this->getDateLink(&$data, '15d'), array('escape' => false)); 
    362362 
    363363    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"))); 
    365365      $output .= $this->Html->link($icon, $this->getDateLink(&$data, 'addFrom'), array('escape' => false)); 
    366366    } 
    367367 
    368368    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"))); 
    370370      $output .= $this->Html->link($icon, $this->getDateLink(&$data, 'addFrom'), array('escape' => false)); 
    371371    } 
    372372 
    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"))); 
    374374    $output .= $this->Html->link($icon, $this->getDateLink(&$data, 'from'), array('escape' => false)); 
    375375    $output .= '</div></span>'; 
     
    404404    if (isset($data['Group']['name'])) { 
    405405      $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))); 
    407407      $output .= ' '; 
    408       $output .= '(' . $this->Html->link(__('View', true), "/groups/view/{$data['Group']['name']}") . ')'; 
     408      $output .= '(' . $this->Html->link(__('View'), "/groups/view/{$data['Group']['name']}") . ')'; 
    409409    } else { 
    410       $output .= __('No group assigned', true); 
     410      $output .= __('No group assigned'); 
    411411    } 
    412412    return $this->Html->tag('div', $output, array('class' => 'actionList')); 
     
    472472    if (isset($urls['user'])) { 
    473473      $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)); 
    475475    } else { 
    476476      $output = $this->Html->link($value, $urls['global']); 
    477477    } 
    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)); 
    479479    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)); 
    481481    } 
    482482    return "<span class=\"tooltip-anchor\">" . $output . '<span class="tooltip-actions"><span class="sub">' . implode($icons) . '</span></span></span> '; 
     
    506506      $this->Search->setUser($userId); 
    507507    } 
    508     $cells[] = array(__("Date", true), $this->_metaDate(&$data)); 
     508    $cells[] = array(__("Date"), $this->_metaDate(&$data)); 
    509509 
    510510    if (count($data['Tag'])) { 
    511       $cells[] = array(__('Tags', true), $this->_metaHabtm(&$data, 'Tag')); 
     511      $cells[] = array(__('Tags'), $this->_metaHabtm(&$data, 'Tag')); 
    512512    } 
    513513    if (count($data['Category'])) { 
    514       $cells[] = array(__('Categories', true), $this->_metaHabtm(&$data, 'Category')); 
     514      $cells[] = array(__('Categories'), $this->_metaHabtm(&$data, 'Category')); 
    515515    } 
    516516 
     
    523523    } 
    524524    if (count($locations)) { 
    525       $cells[] = array(__('Locations', true), implode(', ', $locations)); 
     525      $cells[] = array(__('Locations'), implode(', ', $locations)); 
    526526    } 
    527527 
    528528    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)); 
    530530    } 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)); 
    532532    } 
    533533     
     
    540540    if ($data['Media']['canWriteTag']) { 
    541541      $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'))),  
    543543        '/explorer/editmeta/'.$mediaId,  
    544544        array('update' => 'meta-'.$mediaId, 'escape' => false)); 
     
    548548        $output .= ' '.$this->Html->link( 
    549549          $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']))),  
    551551          '/media/file/'.$file['id'].'/'.$file['file'], array('escape' => false)); 
    552552      } 
     
    597597    //$this->log("level=$level, flag=$flag, mask=$mask"); 
    598598    $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')); 
    604604    $options = am($options, array('type' => 'select', 'options' => $acl, 'selected' => $level)); 
    605605    //$this->log($options); 
     
    615615      switch ($media['Media']['visibility']) { 
    616616        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'))); 
    618618          break; 
    619619        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'))); 
    621621          break; 
    622622        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'))); 
    624624          break; 
    625625        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'))); 
    627627          break; 
    628628      } 
  • View/Helper/MenuHelper.php

    r1a41cea r0fb8d7c  
    132132 
    133133  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); 
    135135 
    136136    // Get current url with action. If the default action 'index' is missing, 
  • View/Helper/NavigatorHelper.php

    r1a41cea r0fb8d7c  
    6363    $crumbs = $this->params['crumbs']; 
    6464    $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')); 
    6666  } 
    6767 
     
    113113    $crumbs = $this->params['crumbs']; 
    114114    $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')); 
    116116  } 
    117117 
     
    133133    $crumbParams = $this->Breadcrumb->params($this->Breadcrumb->replace($this->Breadcrumb->replace($crumbs, 'page', $page), 'pos', $pos)); 
    134134    $link = $baseUri . $crumbParams; 
    135     return $this->Html->link(__('prev', true), $link, array('class' => 'prev')); 
     135    return $this->Html->link(__('prev'), $link, array('class' => 'prev')); 
    136136  } 
    137137 
     
    143143    $link = $this->Breadcrumb->crumbUrl($this->params['crumbs'], false, array('pos')); 
    144144    $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')); 
    146146  } 
    147147 
     
    166166      return; 
    167167    } 
    168     return $this->Html->link(__('next', true), $this->getNextMediaUrl(), array('class' => 'next')); 
     168    return $this->Html->link(__('next'), $this->getNextMediaUrl(), array('class' => 'next')); 
    169169  } 
    170170 
  • 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(); ?> 
    22 
    33<div id="p-media-preview"> 
     
    88    echo $flowplayer->video($this->data); 
    99  } 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); 
    1212    $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'])); 
    1414    if ($navigator->hasNextMedia()) { 
    15       echo $html->link($img, $navigator->getNextMediaUrl(), array('escape' => false)); 
     15      echo $this->Html->link($img, $navigator->getNextMediaUrl(), array('escape' => false)); 
    1616    } else { 
    1717      echo $img; 
     
    3333<div id="image-tabs"> 
    3434<?php 
    35   $items = array(__("General", true), __("Media Details", true)); 
     35  $items = array(__("General"), __("Media Details")); 
    3636  if ($map->hasApi() && $map->hasMediaGeo($this->data)) { 
    37     $items['map'] = __("Map", true); 
     37    $items['map'] = __("Map"); 
    3838  } 
    3939  if ($this->data['Media']['canWriteTag']) { 
    40     $items['edit'] = __("Edit", true); 
     40    $items['edit'] = __("Edit"); 
    4141  } 
    4242  if ($this->data['Media']['canWriteAcl']) { 
    43     $items['acl'] = __("Access Right", true); 
     43    $items['acl'] = __("Access Right"); 
    4444  } 
    4545  echo $tab->menu($items); 
     
    4949<div id="meta-<?php echo $this->data['Media']['id']; ?>"> 
    5050<table class="bare">  
    51   <?php echo $html->tableCells($imageData->metaTable(&$this->data)); ?> 
     51  <?php echo $this->Html->tableCells($this->ImageData->metaTable(&$this->data)); ?> 
    5252</table> 
    5353</div> 
     
    6060<?php  
    6161  $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'])); 
    6363  if ($this->data['Media']['isOwner']) { 
    6464    $files = array(); 
    6565    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']).')'; 
    6868    } 
    69     $cells[] = array(__("File(s)", true), implode(', ', $files)); 
     69    $cells[] = array(__("File(s)"), implode(', ', $files)); 
    7070  } 
    71   $folders = $imageData->getFolderLinks($this->data); 
     71  $folders = $this->ImageData->getFolderLinks($this->data); 
    7272  if ($folders) { 
    73     $cells[] = array(__("Folder", true), implode(' / ', $folders)); 
     73    $cells[] = array(__("Folder"), implode(' / ', $folders)); 
    7474  } 
    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'); 
    7979 
    8080  if ($this->data['Media']['model']) { 
    81     $cells[] = array(__("Model", true), $this->data['Media']['model']); 
     81    $cells[] = array(__("Model"), $this->data['Media']['model']); 
    8282  } 
    8383  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'); 
    8585  } else { 
    8686    if ($this->data['Media']['aperture'] > 0) { 
    87       $cells[] = array(__("Aperture", true), $this->data['Media']['aperture']); 
     87      $cells[] = array(__("Aperture"), $this->data['Media']['aperture']); 
    8888    } 
    8989    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'])); 
    9191    } 
    9292    if ($this->data['Media']['iso'] > 0) { 
    93       $cells[] = array(__("ISO", true), $this->data['Media']['iso']); 
     93      $cells[] = array(__("ISO"), $this->data['Media']['iso']); 
    9494    } 
    9595  } 
    96   echo $html->tableCells($cells); 
     96  echo $this->Html->tableCells($cells); 
    9797?> 
    9898</table> 
     
    108108  if ($this->data['Media']['canWriteTag']) { 
    109109    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')); 
    111111    echo "<fieldset>"; 
    112112    echo View::element('single_meta_form'); 
    113113    echo "</fieldset>"; 
    114     echo $form->end(__('Save', true)); 
     114    echo $this->Form->end(__('Save')); 
    115115    echo $tab->close();  
    116116  } 
    117117  if ($this->data['Media']['canWriteAcl']) { 
    118118    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')); 
    120120    echo "<fieldset>"; 
    121121    echo View::element('single_acl_form'); 
    122122    echo "</fieldset>"; 
    123     echo $form->end(__('Save', true)); 
     123    echo $this->Form->end(__('Save')); 
    124124    echo $tab->close();  
    125125  } 
  • View/Layouts/backend.ctp

    r3605ef4 r0fb8d7c  
    1818 
    1919<div id="header"><div class="sub"> 
    20 <?php echo $this->Html->link(__('Gallery', true), '/'); ?> 
     20<?php echo $this->Html->link(__('Gallery'), '/'); ?> 
    2121</div></div> 
    2222 
  • View/Layouts/dashboard.ctp

    r1a41cea r0fb8d7c  
    1 <?php echo $html->docType('xhtml-strict'); ?> 
     1<?php echo $this->Html->docType('xhtml-strict'); ?> 
    22<html xmlns="http://www.w3.org/1999/xhtml"> 
    33 
     
    55<title><?php echo $title_for_layout?></title> 
    66<?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"; 
    1111   
    1212  echo $scripts_for_layout;  
     
    1515 
    1616<!--[if lte IE 7]> 
    17 <?php echo $html->css('patches/patch_phtagr')."\n"; ?> 
     17<?php echo $this->Html->css('patches/patch_phtagr')."\n"; ?> 
    1818<![endif]--> 
    1919</head> 
     
    5454<div id="col3_content" class="clearfix"> 
    5555<div id="spinner" style="display: none; float: right; "> 
    56   <?php echo $html->image('spinner.gif'); ?> 
     56  <?php echo $this->Html->image('spinner.gif'); ?> 
    5757</div> 
    5858<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(); ?> 
    33<?php  
    44  $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')); 
    99?> 
    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> 
    1313<?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?"))); 
    1919?> 
    2020</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> 
    22 
    3 <?php echo $session->flash(); ?> 
     3<?php echo $this->Session->flash(); ?> 
    44 
    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> 
    77<?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'))); 
    1212?> 
    1313</fieldset> 
    1414 
    15 <fieldset><legend><?php __('Password'); ?></legend> 
     15<fieldset><legend><?php echo __('Password'); ?></legend> 
    1616<?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'))); 
    1919?> 
    2020</fieldset> 
    21 <fieldset><legend><?php __('Others'); ?></legend> 
     21<fieldset><legend><?php echo __('Others'); ?></legend> 
    2222<?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'))); 
    2424  $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") 
    2929  ); 
    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'))); 
    3131  $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") 
    3838  ); 
    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'))); 
    4040?> 
    4141</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> 
    22 
    33<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.'); ?> 
    55</div> 
    66 
    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> 
    88 
    99<?php 
     
    1414?> 
    1515<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> 
    2020</ul> 
    2121 
    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  
    77</div> 
    88 
    9 <?php echo $this->Html->link(__("Upgrade", true), '/admin/setup/upgrade/run'); ?> or  
    10 <?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"), '/'); ?> 
    1111 
  • View/Setup/admin_uptodate.ctp

    rbbc826a r0fb8d7c  
    77</div> 
    88 
    9 <?php echo $this->Html->link(__("Continue", true), '/'); 
     9<?php echo $this->Html->link(__("Continue"), '/'); 
  • View/Setup/config.ctp

    rbbc826a r0fb8d7c  
    99<fieldset><legend><?php echo __("Database"); ?></legend> 
    1010<?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'))); 
    1616?> 
    1717</fieldset> 
    18 <?php echo $this->Form->submit(__('Continue', true)); ?> 
     18<?php echo $this->Form->submit(__('Continue')); ?> 
    1919</form> 
    2020<?php 
  • View/Setup/configro.ctp

    rbbc826a r0fb8d7c  
    2828?&gt;</code></pre></p> 
    2929 
    30 <?php echo $this->Html->link(__('Continue', true), 'configro', array('class' => 'button')); ?> 
     30<?php echo $this->Html->link(__('Continue'), 'configro', array('class' => 'button')); ?> 
    3131 
    3232<?php 
  • View/Setup/path.ctp

    rbbc826a r0fb8d7c  
    2727<?php endif; ?> 
    2828 
    29 <?php echo $this->Html->link(__('Retry', true), 'path', array('class' => 'button')); ?> 
     29<?php echo $this->Html->link(__('Retry'), 'path', array('class' => 'button')); ?> 
    3030<?php 
    3131  $script = <<<'JS' 
  • View/Setup/saltro.ctp

    rbbc826a r0fb8d7c  
    1414 
    1515<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')); ?> 
    1717<?php 
    1818  $script = <<<'JS' 
  • View/Setup/system.ctp

    rbbc826a r0fb8d7c  
    99<p><?php echo __("You can set the file path of these exteranl programs here or set them later in the system preferences."); ?></p> 
    1010 
    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')); ?> 
    1212 
    1313<?php if (count($missing)): ?> 
     
    3131?> 
    3232</fieldset> 
    33 <?php echo $this->Form->end(__('Save', true)); ?> 
     33<?php echo $this->Form->end(__('Save')); ?> 
    3434<?php 
    3535  $script = <<<'JS' 
  • View/Setup/user.ctp

    rbbc826a r0fb8d7c  
    77<fieldset> 
    88<?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"))); 
    1313?> 
    1414</fieldset> 
    15 <?php echo $this->Form->end(__('Create', true)); ?> 
     15<?php echo $this->Form->end(__('Create')); ?> 
    1616<?php 
    1717  $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> 
    22 
    3 <?php echo $session->flash(); ?> 
     3<?php echo $this->Session->flash(); ?> 
    44 
    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> 
    77<?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")));  
    1212?> 
    1313</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> 
    22 
    3 <?php echo $session->flash(); ?> 
     3<?php echo $this->Session->flash(); ?> 
    44 
    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> 
    77<?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'))); 
    1010?> 
    1111</fieldset> 
    1212 
    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> 
    22 
    3 <?php echo $session->flash(); ?> 
     3<?php echo $this->Session->flash(); ?> 
    44 
    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> 
    88<?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")));  
    1010?> 
    1111</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(); ?> 
    33 
    44<?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:"); ?> 
    77<ul> 
    88<?php  
    99  foreach ($newMappingNames as $name) { 
    10     echo $html->tag('li', $name); 
     10    echo $this->Html->tag('li', $name); 
    1111  } 
    1212?> 
    1313</ul> 
    1414<?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> 
    1616<?php endif; ?> 
    1717 
  • View/Users/admin_add.ctp

    r1a41cea r0fb8d7c  
    1 <h1><?php __('Add new User'); ?></h1> 
     1<h1><?php echo __('Add new User'); ?></h1> 
    22 
    3 <?php echo $session->flash(); ?> 
     3<?php echo $this->Session->flash(); ?> 
    44 
    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> 
    77<?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')); 
    1212?> 
    1313</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> 
    22 
    3 <?php echo $session->flash(); ?> 
     3<?php echo $this->Session->flash(); ?> 
    44 
    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> 
    77<?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')); 
    1212  if ($allowAdminRole) { 
    13     $roles[ROLE_ADMIN] = __('Admin', true); 
     13    $roles[ROLE_ADMIN] = __('Admin'); 
    1414  } 
    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'])); 
    1616?> 
    1717</fieldset> 
     
    1919<fieldset><legend>Other</legend> 
    2020<?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']))); 
    2323?> 
    2424</fieldset> 
    2525 
    26 <?php echo $form->end(__('Save', true)); ?> 
     26<?php echo $this->Form->end(__('Save')); ?> 
  • View/Users/admin_index.ctp

    r1a41cea r0fb8d7c  
    11<h1>Users</h1> 
    2 <?php echo $session->flash(); ?> 
     2<?php echo $this->Session->flash(); ?> 
    33 
    44<?php $paginator->options(array('update' => 'main_content', 'indicator' => 'spinner'));?> 
    55 
    6 <?php echo $paginator->prev(__('Prev', true), null, null, array('class' => 'disabled')); ?> 
     6<?php echo $paginator->prev(__('Prev'), null, null, array('class' => 'disabled')); ?> 
    77<?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')); ?> 
    99 
    1010Page <?php echo $paginator->counter() ?> 
     
    1313<thead> 
    1414<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> 
    2121</tr> 
    2222</thead> 
     
    2525<?php $row=0; foreach($this->data as $user): ?> 
    2626<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> 
    2828  <td><?php echo $user['User']['firstname'];?></td> 
    2929  <td><?php echo $user['User']['lastname'];?></td> 
     
    3737    case ROLE_NOBODY: __('Nobody'); break; 
    3838    default:  
    39       echo __('Unknown', true);  
     39      echo __('Unknown');  
    4040      Logger::error("Unkown role of user: ".$user['User']['role']); 
    4141      break; 
    4242  };?></td> 
    4343  <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']); 
     45echo $this->Html->link( 
     46  $this->Html->image('icons/pencil.png', array('alt' => __('Edit'), 'title' => __('Edit'))),  
    4747    '/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'))),  
    4949    '/admin/users/del/'.$user['User']['id'], array('escape' => false), $delConfirm);?></td> 
    5050</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> 
    22 
    3 <?php echo $session->flash(); ?> 
     3<?php echo $this->Session->flash(); ?> 
    44 
    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'])); ?> 
    66<fieldset><legend>Password</legend> 
    77<?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')); 
    1010?> 
    1111</fieldset> 
    1212 
    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> 
    22 
    3 <?php echo $session->flash(); ?> 
     3<?php echo $this->Session->flash(); ?> 
    44 
    55 
    66<?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> 
    88 
    99<table class="default"> 
    1010<thead> 
    1111  <tr> 
    12     <td><?php __('Directory'); ?></td> 
    13     <td><?php __('Actions'); ?></td> 
     12    <td><?php echo __('Directory'); ?></td> 
     13    <td><?php echo __('Actions'); ?></td> 
    1414  </tr> 
    1515</thead> 
     
    1919    <td><?php  echo "$root"; ?></td> 
    2020    <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))), 
    2323    '/admin/users/delpath/'.$this->data['User']['id'].'/'.$root, array('escape' => false), $delConfirm);?></td> 
    2424  </tr> 
     
    2929<?php else: ?> 
    3030<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> 
    3232 
    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> 
    3434</div> 
    3535<?php endif; ?> 
    3636 
    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'))); ?> 
    4040</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(); ?> 
    33 
    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']))); ?> 
    88</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(); ?> 
    22 
    3 <?php echo $form->create('User', array('action' => 'confirm')); ?> 
     3<?php echo $this->Form->create('User', array('action' => 'confirm')); ?> 
    44<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> 
    77<?php 
    8   echo $form->input('User.key', array('label' => __('Key', true))); 
     8  echo $this->Form->input('User.key', array('label' => __('Key'))); 
    99?> 
    1010</fieldset> 
    11 <?php echo $form->end(__('Confirm', true)); ?> 
     11<?php echo $this->Form->end(__('Confirm')); ?> 
    1212 
  • View/Users/index.ctp

    r1a41cea r0fb8d7c  
    22  __('Users');  
    33  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')); 
    55  } 
    66?></h1> 
    77 
    8 <?php echo $session->flash(); ?> 
     8<?php echo $this->Session->flash(); ?> 
    99 
    1010<?php if (!empty($this->data)): ?> 
     
    1313<?php 
    1414  $headers = array( 
    15     __('Name', true), 
    16     __('Member Since', true) 
     15    __('Name'), 
     16    __('Member Since') 
    1717    ); 
    18   echo $html->tableHeaders($headers); 
     18  echo $this->Html->tableHeaders($headers); 
    1919?> 
    2020</thead> 
     
    2626  foreach($this->data as $user) { 
    2727    $row = array( 
    28       $html->link($user['User']['username'], "view/{$user['User']['username']}"), 
     28      $this->Html->link($user['User']['username'], "view/{$user['User']['username']}"), 
    2929      $time->relativeTime($user['User']['created']), 
    3030      ); 
    3131    $cells[] = $row; 
    3232  } 
    33   echo $html->tableCells($cells, array('class' => 'odd'), array('class' => 'even')); 
     33  echo $this->Html->tableCells($cells, array('class' => 'odd'), array('class' => 'even')); 
    3434?> 
    3535</tbody> 
    3636</table> 
    3737<?php else: ?> 
    38 <p><?php __('User list is empty'); ?></p> 
     38<p><?php echo __('User list is empty'); ?></p> 
    3939<?php endif; ?> 
  • View/Users/login.ctp

    r3605ef4 r0fb8d7c  
    33<?php echo $this->Form->create('User', array('action' => 'login', 'class' => 'login')); ?> 
    44<fieldset> 
    5 <legend><?php __('Login'); ?></legend> 
     5<legend><?php echo __('Login'); ?></legend> 
    66<?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'))); 
    99?> 
    1010</fieldset> 
     
    1313  $signup = ''; 
    1414   
    15   echo $this->Form->submit(__('Login', true), array('div' => false)); 
     15  echo $this->Form->submit(__('Login'), array('div' => false)); 
    1616  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'))." "; 
    1818  } 
    19   echo "<br/>".$this->Html->link(__('Forgot your password', true), 'password'); 
     19  echo "<br/>".$this->Html->link(__('Forgot your password'), 'password'); 
    2020?> 
    2121</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(); ?> 
    33 
    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."); ?> 
    55 
    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> 
    88<?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'))); 
    1111?> 
    1212</fieldset> 
    13 <?php echo $form->end(__('Submit', true)); ?> 
     13<?php echo $this->Form->end(__('Submit')); ?> 
    1414<?php  
    1515  $script = <<<'JS' 
  • View/Users/register.ctp

    r1a41cea r0fb8d7c  
    1 <?php echo $session->flash(); ?> 
     1<?php echo $this->Session->flash(); ?> 
    22 
    3 <?php echo $form->create('User', array('action' => 'register')); ?> 
     3<?php echo $this->Form->create('User', array('action' => 'register')); ?> 
    44<fieldset> 
    5 <legend><?php __('Create Account'); ?></legend> 
     5<legend><?php echo __('Create Account'); ?></legend> 
    66<?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>&nbsp;</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>&nbsp;</label><img src="'.$this->Html->url('/users/captcha/verify.jpg').'" /></div>'; 
     12  echo $this->Form->input('Captcha.verification'); 
    1313?> 
    1414</fieldset> 
    1515<?php  
    16   echo $form->end(__('Sign Up', true));  
     16  echo $this->Form->end(__('Sign Up'));  
    1717 
    1818  $script = <<<'JS' 
  • View/Users/view.ctp

    r1a41cea r0fb8d7c  
    11<h1><?php  
    2   printf(__('User %s', true), $this->data['User']['username']);   
     2  __('User %s', $this->data['User']['username']);   
    33  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'])); 
    55  } 
    66?></h1> 
    77 
    8 <?php echo $session->flash() ?> 
     8<?php echo $this->Session->flash() ?> 
    99 
    10 <h2><?php __('User Details'); ?></h2> 
     10<h2><?php echo __('User Details'); ?></h2> 
    1111 
    1212<table class="default"> 
     
    1414<?php  
    1515  $headers = array( 
    16     __('Description', true), 
    17     __('Value', true), 
     16    __('Description'), 
     17    __('Value'), 
    1818    ); 
    19   echo $html->tableHeaders($headers); 
     19  echo $this->Html->tableHeaders($headers); 
    2020?> 
    2121</thead> 
     
    2424<?php  
    2525  $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')); 
    3131?>  
    3232</tbody> 
    3333</table> 
    3434 
    35 <h2><?php __('Group List'); ?></h2> 
     35<h2><?php echo __('Group List'); ?></h2> 
    3636<table class="default"> 
    3737<thead> 
    3838<?php  
    3939  $headers = array( 
    40     __('Group', true), 
    41     __('User', true), 
    42     __('Description', true), 
    43     __('Action', true), 
     40    __('Group'), 
     41    __('User'), 
     42    __('Description'), 
     43    __('Action'), 
    4444    ); 
    45   echo $html->tableHeaders($headers); 
     45  echo $this->Html->tableHeaders($headers); 
    4646?> 
    4747</thead> 
     
    5454    $username = implode('', Set::extract("/User[id={$group['user_id']}]/username", $users)); 
    5555    $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"), 
    5858      $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']}") 
    6060      ); 
    6161  } 
     
    6666    $username = implode('', Set::extract("/User[id={$group['user_id']}]/username", $users)); 
    6767    $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"), 
    7070      $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']}") 
    7272      ); 
    7373  } 
     
    8383  } 
    8484  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')); 
    8686?>  
    8787</tbody> 
     
    8989 
    9090<?php if ($media): ?> 
    91 <h2><?php __("Recent Media"); ?></h2> 
     91<h2><?php echo __("Recent Media"); ?></h2> 
    9292<p><?php 
    9393  foreach($media as $m) { 
    94     echo $imageData->mediaLink($m, 'mini'); 
     94    echo $this->ImageData->mediaLink($m, 'mini'); 
    9595  }  
    9696?></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> 
    9898<?php endif; ?> 
  • View/home/index.ctp

    r3605ef4 r0fb8d7c  
    1313 
    1414    $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>"; 
    1616  }  
    1717?> 
     
    3535  echo $this->Html->tag('div', implode("\n", $links), array('class' => 'images', 'escape' => false)); 
    3636  $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>"; 
    3838?> 
    3939</div>