Changeset f52b4cb781b8864c533d1fa62c4907901e8ef6c2

Timestamp:

01/28/12 19:33:05 (4 months ago)

Author:

Xemle <xemle@phtagr.org>

Children:

bfbeeb6c83b0ce896e9c2d979ae81ba618c57db4

Parents:

007340ebc33e1e059fe19baf82a214ad69905504

git-committer:

Xemle <xemle@phtagr.org> / 2012-01-28T19:33:05Z+0100

Message:

Make mobile version runnable

Files:

• Controller/AppController.php (modified) (1 diff)
• View/Elements/menu.ctp (modified) (2 diffs)
• View/Themed/Mobile/Elements/footer.ctp (modified) (1 diff)
• View/Themed/Mobile/Elements/header.ctp (modified) (1 diff)
• View/Themed/Mobile/Explorer/index.ctp (modified) (4 diffs)
• View/Themed/Mobile/Home/index.ctp (modified) (4 diffs)
• View/Themed/Mobile/Images/view.ctp (modified) (5 diffs)
• View/Themed/Mobile/Layouts/default.ctp (modified) (2 diffs)

Controller/AppController.php

@@ -113 +113 @@
 
     if ($this->RequestHandler->isMobile()) {
-      $this->view = "Theme";
-      $this->theme = "mobile";
+      $this->viewClass = "Theme";
+      $this->theme = "Mobile";
     }
   }

View/Elements/menu.ctp

@@ -28 +28 @@
     }
     if ($role >= ROLE_USER) {
-      if (!$option->get('user.browser.full', 0)) {
+      if (!$this->Option->get('user.browser.full', 0)) {
         $items[] = array(
           'text' => __('Upload'), 
@@ -47 +47 @@
   }
 
-  echo $menu->getMainMenu(array('id' => false, 'title' => false, 'items' => $items));
+  echo $this->Menu->getMainMenu(array('id' => false, 'title' => false, 'items' => $items));
 ?>

View/Themed/Mobile/Elements/footer.ctp

@@ -1 @@
-<p><?php printf(__("%s Social Web Gallery %s - mobile version", true), '&copy; 2010', $html->link('phTagr', 'http://www.phtagr.org')); ?></p>
+<p><?php echo __("%s Web Gallery %s - mobile version", '&copy; 2012', $this->Html->link('phTagr', 'http://www.phtagr.org')); ?></p>

View/Themed/Mobile/Elements/header.ctp

@@ -1 @@
-<h1><?php echo h($option->get('general.title', 'phTagr.')); ?><span class="subheader"><?php __('mobile'); ?></span></h1>
+<h1><?php echo h($this->Option->get('general.title', 'phTagr.')); ?><span class="subheader"><?php echo __('mobile'); ?></span></h1>
 <div class="login">
 <?php 
-  if ($session->check('User.id')) {
-    echo $html->link(__("Logout", true), '/users/logout'); 
+  if ($this->Session->check('User.id')) {
+    echo $this->Html->link(__("Logout"), '/users/logout'); 
   } else {
-    echo $html->link(__("Login", true), '/users/login'); 
+    echo $this->Html->link(__("Login"), '/users/login'); 
   }
 ?>

View/Themed/Mobile/Explorer/index.ctp

@@ -1 @@
-<h1><?php __('Explorer'); ?></h1>
-<?php echo $session->flash(); ?>
+<h1><?php echo __('Explorer'); ?></h1>
+<?php echo $this->Session->flash(); ?>
 
-<?php $search->initialize(); ?>
-<?php if ($navigator->hasPages()): ?>
+<?php $this->Search->initialize(); ?>
+<?php if ($this->Navigator->hasPages()): ?>
 <div class="paginator"><div class="subpaginator">
-<?php echo $navigator->prev().' '.$navigator->numbers().' '.$navigator->next(); ?>
+<?php echo $this->Navigator->prev().' '.$this->Navigator->numbers().' '.$this->Navigator->next(); ?>
 </div></div>
 <?php endif; ?>
 
 <?php 
-  $pos = ($search->getPage(1)-1) * $search->getShow(12) + 1; 
+  $pos = ($this->Search->getPage(1)-1) * $this->Search->getShow(12) + 1; 
 ?>
 <?php foreach($this->data as $media): ?>
 <h3><?php echo $media['Media']['name']; ?></h3>
 <?php
-  $date = $html->link(
-    $time->relativeTime($media['Media']['date']),
+  $date = $this->Html->link(
+    $this->Time->relativeTime($media['Media']['date']),
     '/explorer/date/' . date("Y/m/d", strtotime($media['Media']['date']))
     );
-  echo '<p>by ' . $html->link($media['User']['username'], "/explorer/user/".$media['User']['username']) . ' ' . $date . '</p>';
-  $params = $search->serialize(false, array('pos' => $pos++), false, array('defaults' => array('pos' => 1)));
-  echo $imageData->mediaLink($media, array('type' => 'thumb', 'div' => 'thumb', 'params' => ($params ? '/' . $params : false)));
+  echo '<p>by ' . $this->Html->link($media['User']['username'], "/explorer/user/".$media['User']['username']) . ' ' . $date . '</p>';
+  $params = $this->Search->serialize(false, array('pos' => $pos++), false, array('defaults' => array('pos' => 1)));
+  echo $this->ImageData->mediaLink($media, array('type' => 'thumb', 'div' => 'thumb', 'params' => ($params ? '/' . $params : false)));
   echo "<div class='meta-info'>";
   $names = Set::extract('/Tag/name', $media);
   $links = array();
   foreach($names as $name) {
-    $links[] = $html->link($name, "tag/$name");
+    $links[] = $this->Html->link($name, "tag/$name");
   }
   if (count($names)) {
-    echo '<p>' . __("Tags", true) . ': ' . implode(', ', $links) . '</p>';
+    echo '<p>' . __("Tags") . ': ' . implode(', ', $links) . '</p>';
   }
 
@@ -35 +35 @@
   $links = array();
   foreach($names as $name) {
-    $links[] = $html->link($name, "category/$name");
+    $links[] = $this->Html->link($name, "category/$name");
   }
   if (count($names)) {
-    echo '<p>' . __("Categories", true) . ': ' . implode(', ', $links) . '</p>';
+    echo '<p>' . __("Categories") . ': ' . implode(', ', $links) . '</p>';
   }
 
@@ -44 +44 @@
   $links = array();
   foreach($names as $name) {
-    $links[] = $html->link($name, "location/$name");
+    $links[] = $this->Html->link($name, "location/$name");
   }
   if (count($names)) {
-    echo '<p>' . __("Location", true) . ': ' . implode(', ', $links) . '</p>';
+    echo '<p>' . __("Location") . ': ' . implode(', ', $links) . '</p>';
   }
   echo "</div>";
@@ -53 +53 @@
 <?php endforeach; ?>
 
-<?php if ($navigator->hasPages()): ?>
+<?php if ($this->Navigator->hasPages()): ?>
 <div class="paginator"><div class="subpaginator">
-<?php echo $navigator->prev().' '.$navigator->numbers().' '.$navigator->next(); ?>
+<?php echo $this->Navigator->prev().' '.$this->Navigator->numbers().' '.$this->Navigator->next(); ?>
 </div></div>
 <?php endif; ?>

View/Themed/Mobile/Home/index.ctp

@@ -1 @@
-<h1><?php echo h($option->get('home.welcomeText', __("Welcome to phTagr", true))); ?></h1>
+<h1><?php echo h($option->get('home.welcomeText', __("Welcome to phTagr"))); ?></h1>
 
-<h3><?php __("Random Media"); ?></h3>
+<h3><?php echo __("Random Media"); ?></h3>
 <?php 
   if (count($randomMedia)) {
     $media = $randomMedia[0];
-    $params = '/'.$search->serialize(array('sort' => 'random'));
+    $params = '/'.$this->Search->serialize(array('sort' => 'random'));
 
-    $size = $imageData->getimagesize($media, OUTPUT_SIZE_PREVIEW);
-    echo $html->tag('a', 
-      $html->tag('img', '', array(
+    $size = $this->ImageData->getimagesize($media, OUTPUT_SIZE_PREVIEW);
+    echo $this->Html->tag('a', 
+      $this->Html->tag('img', '', array(
         'src' => Router::url("/media/preview/" . $media['Media']['id']),
         'alt' => $media['Media']['name'],
@@ -18 +18 @@
       ));
         
-    $link = $search->getUri(array('sort' => 'random'));
-    echo "<p>" . sprintf(__("See more %s", true), $html->link(__('random media...', true), $link))."</p>";
+    $link = $this->Search->getUri(array('sort' => 'random'));
+    echo "<p>" . sprintf(__("See more %s"), $this->Html->link(__('random media...'), $link))."</p>";
   } 
 ?>
 
-<h3><?php __("Newest Media"); ?></h3>
+<h3><?php echo __("Newest Media"); ?></h3>
 <?php
   $cells = array();
@@ -31 +31 @@
     $pos = $keys[$i] + 1;
     $media = $newMedia[$keys[$i]];
-    $page = ceil($pos / $search->getShow(12));
-    $params = '/'.$search->serialize(array('sort' => 'newest', 'page' => $page, 'pos' => $pos), false, false, array('defaults' => array('pos' => 1)));
-    $cells[] = $html->tag('a', 
-      $html->tag('img', '', array(
+    $page = ceil($pos / $this->Search->getShow(12));
+    $params = '/'.$this->Search->serialize(array('sort' => 'newest', 'page' => $page, 'pos' => $pos), false, false, array('defaults' => array('pos' => 1)));
+    $cells[] = $this->Html->tag('a', 
+      $this->Html->tag('img', '', array(
         'src' => Router::url("/media/mini/" . $media['Media']['id']) . $params,
         'alt' => $media['Media']['name'],
@@ -49 +49 @@
 <p><?php echo implode(' ', $cells); ?></p>
 <?php
-  $link = $search->getUri(array('sort' => 'newest'));
-  echo "<p>" . sprintf(__("See %s", true), $html->link(__('all new media...', true), $link))."</p>";
+  $link = $this->Search->getUri(array('sort' => 'newest'));
+  echo "<p>" . sprintf(__("See %s"), $this->Html->link(__('all new media...'), $link))."</p>";
 ?>
 <?php endif; ?>

View/Themed/Mobile/Images/view.ctp

@@ -1 +1 @@
 <h1><?php echo $this->data['Media']['name'] ?></h1>
-<?php echo $session->flash(); ?>
+<?php echo $this->Session->flash(); ?>
 
 <div class="paginator"><div class="subpaginator">
 <?php
-echo $navigator->prevMedia().' '.$navigator->up().' '.$navigator->nextMedia();
+echo $this->Navigator->prevMedia().' '.$this->Navigator->up().' '.$this->Navigator->nextMedia();
 ?>
 </div></div>
@@ -12 +12 @@
     echo $flowplayer->video($this->data);
   } else {
-    $size = $imageData->getimagesize($this->data, OUTPUT_SIZE_PREVIEW);
-    echo $html->tag('img', '', array(
+    $size = $this->ImageData->getimagesize($this->data, OUTPUT_SIZE_PREVIEW);
+    echo $this->Html->tag('img', '', array(
       'src' => Router::url("/media/preview/" . $this->data['Media']['id']),
       'alt' => $this->data['Media']['name'],
@@ -24 +24 @@
   $links = array();
   foreach($names as $name) {
-    $links[] = $html->link($name, "/explorer/tag/$name");
+    $links[] = $this->Html->link($name, "/explorer/tag/$name");
   }
   if (count($names)) {
-    echo '<p>' . __("Tags", true) . ': ' . implode(', ', $links) . '</p>';
+    echo '<p>' . __("Tags") . ': ' . implode(', ', $links) . '</p>';
   }
 
@@ -33 +33 @@
   $links = array();
   foreach($names as $name) {
-    $links[] = $html->link($name, "/explorer/category/$name");
+    $links[] = $this->Html->link($name, "/explorer/category/$name");
   }
   if (count($names)) {
-    echo '<p>' . __("Categories", true) . ': ' . implode(', ', $links) . '</p>';
+    echo '<p>' . __("Categories") . ': ' . implode(', ', $links) . '</p>';
   }
 
@@ -42 +42 @@
   $links = array();
   foreach($names as $name) {
-    $links[] = $html->link($name, "/explorer/location/$name");
+    $links[] = $this->Html->link($name, "/explorer/location/$name");
   }
   if (count($names)) {
-    echo '<p>' . __("Location", true) . ': ' . implode(', ', $links) . '</p>';
+    echo '<p>' . __("Location") . ': ' . implode(', ', $links) . '</p>';
   }
 ?>

View/Themed/Mobile/Layouts/default.ctp

@@ -1 @@
-<?php echo $html->docType('xhtml-strict'); ?>
+<?php echo $this->Html->docType('xhtml-strict'); ?>
 <html xmlns="http://www.w3.org/1999/xhtml">
 
@@ -6 +6 @@
 <meta name = "viewport" content = "initial-scale = 1.0">
 <?php 
-  echo $html->charset('UTF-8');
-  echo $html->meta('icon');
-  echo $html->css('mobile');
+  echo $this->Html->charset('UTF-8');
+  echo $this->Html->meta('icon');
+  echo $this->Html->css('mobile');
 ?>
 </head>