OSDN Git Service

templates全般のタブ修正
authorCake <cake_67@users.sourceforge.jp>
Sat, 6 Feb 2010 16:36:25 +0000 (01:36 +0900)
committerCake <cake_67@users.sourceforge.jp>
Sat, 6 Feb 2010 16:36:25 +0000 (01:36 +0900)
43 files changed:
app/views/characters/add.ctp
app/views/characters/add_milti_profiles.ctp
app/views/characters/admin_index.ctp
app/views/characters/admin_view.ctp
app/views/characters/index.ctp
app/views/characters/view.ctp
app/views/helpers/pquery.php [new file with mode: 0644]
app/views/layouts/default.ctp
app/views/profile_selects/admin_add.ctp
app/views/profile_selects/admin_edit.ctp
app/views/profile_selects/admin_listview.ctp
app/views/profile_tables/admin_add.ctp
app/views/profile_tables/admin_edit.ctp
app/views/profile_tables/admin_listview.ctp
app/views/systems/admin_add.ctp
app/views/systems/admin_edit.ctp
app/views/systems/admin_index.ctp
app/views/systems/admin_view.ctp
app/views/systems/index.ctp
app/views/systems/view.ctp
app/views/users/add.ctp
app/views/users/admin_add.ctp
app/views/users/admin_change_password.ctp
app/views/users/admin_delete.ctp
app/views/users/admin_edit.ctp
app/views/users/admin_listview.ctp
app/views/users/admin_view.ctp
app/views/users/change_password.ctp
app/views/users/delete.ctp
app/views/users/edit.ctp
app/views/users/index.ctp
app/views/users/listview.ctp
app/views/users/login.ctp
app/views/users/mobile_add.ctp
app/views/users/mobile_change_password.ctp
app/views/users/mobile_delete.ctp
app/views/users/mobile_edit.ctp
app/views/users/mobile_index.ctp
app/views/users/mobile_listview.ctp
app/views/users/mobile_login.ctp
app/views/users/mobile_view.ctp
app/views/users/to_login.ctp
app/views/users/view.ctp

index a24b4f0..7c9ddf3 100644 (file)
@@ -1,64 +1,58 @@
 <div class="characters form">
 <?php echo $form->create('Character');?>
-       <fieldset>
-               <legend><?php __('Add Character');?></legend>
+<fieldset>
+<legend><?php __('Add Character');?></legend>
 <?php
        echo $form->input('name', array(
-                       'type' => 'text',
-                       'label' =>  __('Name', true),
-                       'after' => $html->tag(
-                               'span',
-                               __(' * required', true),
-                               array('class' => 'required')
-                       )
+               'type' => 'text',
+               'label' =>  __('Name', true),
+               'after' => $html->tag(
+                       'span',
+                       __(' * required', true),
+                       array('class' => 'required')
                )
-       );
+       ));
        echo $form->input('system_id', array(
-                       'label' => __('System', true),
-                       'after' => $html->tag(
-                               'div',
-                               __('No Editable', true),
-                               array('class' => 'required')
-                       )
+               'label' => __('System', true),
+               'after' => $html->tag(
+                       'div',
+                       __('No Editable', true),
+                       array('class' => 'required')
                )
-       );
+       ));
        echo $form->input('sort_order', array(
-                       'label' => __('Order', true)
-               )
-       );
+               'label' => __('Order', true)
+       ));
        echo $select->create_status_select($status, 'status', array(
-                       'label' => __('Status', true)
-               )
-       );
+               'label' => __('Status', true)
+       ));
        echo $select->create_publicflag_select($public_flags, 'public_flag', array(
-                       'label' => __('Public Flag', true)
-               )
-       );
+               'label' => __('Public Flag', true)
+       ));
        echo $form->input('notes', array(
-                       'label' => __('Notes', true)
-               )
-       );
+               'label' => __('Notes', true)
+       ));
 
        echo $token->create();
-       ?>
-       </fieldset>
+?>
+</fieldset>
 <?php echo $form->end('Submit');?>
 </div>
 
 <div class="backButton">
 <?php
-echo $form->create('', array('url' => array(
-       'action' => 'index'), 
-       'type' => 'GET', 
-       'id' => 'CancelButton'
-));
-echo $form->end('Cancel');
+       echo $form->create('', array('url' => array(
+               'action' => 'index'), 
+               'type' => 'GET', 
+               'id' => 'CancelButton'
+       ));
+       echo $form->end('Cancel');
 ?>
 </div>
 
 <div class="actions">
-       <ul>
-               <li><?php echo $html->link(__('List Characters', true), array('action' => 'index'));?></li>
-               <li><?php echo $html->link(__('List Systems', true), array('controller' => 'systems', 'action' => 'index')); ?> </li>
-       </ul>
+<ul>
+<li><?php echo $html->link(__('List Characters', true), array('action' => 'index'));?></li>
+<li><?php echo $html->link(__('List Systems', true), array('controller' => 'systems', 'action' => 'index')); ?> </li>
+</ul>
 </div>
index 71df847..22d2e80 100644 (file)
@@ -54,7 +54,7 @@ echo $form->end('Cancel');
 </div>
 
 <div class="actions">
-       <ul>
-               <li><?php echo $html->link(__('Edit Character', true), array('action' => 'edit', $this->data['Character']['id']));?></li>
-       </ul>
+<ul>
+<li><?php echo $html->link(__('Edit Character', true), array('action' => 'edit', $this->data['Character']['id']));?></li>
+</ul>
 </div>
index 6dea048..3bf0369 100644 (file)
@@ -22,59 +22,61 @@ echo $paginator->counter(array(
 </th>
 </tr>
 <?php
-$i = 0;
-foreach ($characters as $character):
-       $class = null;
-       if ($i++ % 2 == 0) {
-               $class = ' class="altrow"';
-       }
+       $i = 0;
+       foreach ($characters as $character):
+               $class = null;
+               if ($i++ % 2 == 0) {
+                       $class = ' class="altrow"';
+               }
 ?>
-       <tr<?php echo $class;?>>
-               <td>
-                       <?php echo $character['Character']['id']; ?>
-               </td>
-               <td>
-                       <?php echo $html->link('<img src="'.$character['Character']['image_filename'].'" alt="'.$character['Character']['name'].'">', array('action' => 'view', $character['Character']['id']), array(), false, false); ?>
-                       <?php echo $html->link($character['Character']['name'], array('action' => 'view', $character['Character']['id'])); ?>
-               </td>
-               <td>
-                       <?php echo $html->link($character['System']['name'], array('controller' => 'systems', 'action' => 'view', $character['System']['id'])); ?>&nbsp;
-               </td>
-               <td>
-                       <?php echo $character['Character']['sort_order']; ?>
-               </td>
-               <td>
-                       <?php echo $select->get_i18n_status($character['Character']['status'], $status); ?>
-               </td>
-               <td>
-                       <?php echo $select->get_i18n_public_flag($character['Character']['public_flag'], $public_flags) ?>
-               </td>
-               <td>
-                       <?php echo $html->link($character['User']['name'], array('controller' => 'users', 'action' => 'view', $character['User']['id']), array(), false, false); ?>
-               </td>
-               <td>
-                       <?php echo $character['Character']['notes']; ?>
-               </td>
-               <td>
-                       <?php echo $character['Character']['created']; ?>
-               </td>
-               <td>
-                       <?php echo $character['Character']['modified']; ?>
-               </td>
-               <td>
-                       <?php echo $character['Character']['deleted_date']; ?>&nbsp;
-               </td>
-       </tr>
+<tr<?php echo $class;?>>
+<td>
+       <?php echo $character['Character']['id']; ?>
+</td>
+<td>
+       <?php echo $html->link('<img src="'.$character['Character']['image_filename'].'" alt="'.$character['Character']['name'].'">', array('action' => 'view', $character['Character']['id']), array(), false, false); ?>
+       <?php echo $html->link($character['Character']['name'], array('action' => 'view', $character['Character']['id'])); ?>
+</td>
+<td>
+       <?php echo $html->link($character['System']['name'], array('controller' => 'systems', 'action' => 'view', $character['System']['id'])); ?>&nbsp;
+</td>
+<td>
+       <?php echo $character['Character']['sort_order']; ?>
+</td>
+<td>
+       <?php echo $select->get_i18n_status($character['Character']['status'], $status); ?>
+</td>
+<td>
+       <?php echo $select->get_i18n_public_flag($character['Character']['public_flag'], $public_flags) ?>
+</td>
+<td>
+       <?php echo $html->link($character['User']['name'], array('controller' => 'users', 'action' => 'view', $character['User']['id']), array(), false, false); ?>
+</td>
+<td>
+       <?php echo $character['Character']['notes']; ?>
+</td>
+<td>
+       <?php echo $character['Character']['created']; ?>
+</td>
+<td>
+       <?php echo $character['Character']['modified']; ?>
+</td>
+<td>
+       <?php echo $character['Character']['deleted_date']; ?>&nbsp;
+</td>
+</tr>
 <?php endforeach; ?>
 </table>
 </div>
+
 <div class="paging">
-       <?php echo $paginator->prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?>
- |     <?php echo $paginator->numbers();?>
-       <?php echo $paginator->next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?>
+<?php echo $paginator->prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?>
+ | <?php echo $paginator->numbers();?>
+<?php echo $paginator->next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?>
 </div>
+
 <div class="actions">
-       <ul>
-               <li><?php echo $html->link(__('List Systems', true), array('controller' => 'systems', 'action' => 'index')); ?> </li>
-       </ul>
+<ul>
+<li><?php echo $html->link(__('List Systems', true), array('controller' => 'systems', 'action' => 'index')); ?> </li>
+</ul>
 </div>
index d90389f..7a7a56e 100644 (file)
@@ -10,8 +10,8 @@ echo $this->renderElement(
 ?>
 
 <div class="actions">
-       <ul>
-               <li><?php echo $html->link(__('List Characters', true), array('action' => 'index')); ?> </li>
-               <li><?php echo $html->link(__('List Systems', true), array('controller' => 'systems', 'action' => 'index')); ?> </li>
-       </ul>
+<ul>
+<li><?php echo $html->link(__('List Characters', true), array('action' => 'index')); ?> </li>
+<li><?php echo $html->link(__('List Systems', true), array('controller' => 'systems', 'action' => 'index')); ?> </li>
+</ul>
 </div>
index 06192d2..8bae787 100644 (file)
@@ -25,42 +25,44 @@ foreach ($characters as $character):
                $class = ' class="altrow"';
        }
 ?>
-       <tr<?php echo $class;?>>
-               <td>
-                       <?php echo $html->link('<img src="'.$character['Character']['image_filename'].'" alt="'.$character['Character']['name'].'">', array('action' => 'view', $character['Character']['id']), array(), false, false); ?><br>
-                       <?php echo $html->link($character['Character']['name'], array('action' => 'view', $character['Character']['id'])); ?>
-                       <?php echo $select->get_i18n_public_flag($character['Character']['public_flag'], $public_flags) ?>
-               </td>
-               <td>
-                       <?php echo $character['Character']['sort_order']; ?>
-               </td>
-               <td>
-                       <?php echo $html->link($character['System']['name'], array('controller' => 'systems', 'action' => 'view', $character['System']['id'])); ?>
-               </td>
-               <td>
-                       <?php echo $select->get_i18n_status($character['Character']['status'], $status); ?>
-               </td>
-               <td>
-                       <?php echo $html->link($character['User']['name'], array('controller' => 'users', 'action' => 'view', $character['User']['id']), array(), false, false); ?>
-               </td>
-               <td>
-                       <?php echo $character['Character']['notes']; ?>
-               </td>
-               <td>
-                       <?php echo $character['Character']['modified']; ?>
-               </td>
-       </tr>
+<tr<?php echo $class;?>>
+<td>
+       <?php echo $html->link('<img src="'.$character['Character']['image_filename'].'" alt="'.$character['Character']['name'].'">', array('action' => 'view', $character['Character']['id']), array(), false, false); ?><br>
+       <?php echo $html->link($character['Character']['name'], array('action' => 'view', $character['Character']['id'])); ?>
+       <?php echo $select->get_i18n_public_flag($character['Character']['public_flag'], $public_flags) ?>
+</td>
+<td>
+       <?php echo $character['Character']['sort_order']; ?>
+</td>
+<td>
+       <?php echo $html->link($character['System']['name'], array('controller' => 'systems', 'action' => 'view', $character['System']['id'])); ?>
+</td>
+<td>
+       <?php echo $select->get_i18n_status($character['Character']['status'], $status); ?>
+</td>
+<td>
+       <?php echo $html->link($character['User']['name'], array('controller' => 'users', 'action' => 'view', $character['User']['id']), array(), false, false); ?>
+</td>
+<td>
+       <?php echo $character['Character']['notes']; ?>
+</td>
+<td>
+       <?php echo $character['Character']['modified']; ?>
+</td>
+</tr>
 <?php endforeach; ?>
 </table>
 </div>
+
 <div class="paging">
-       <?php echo $paginator->prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?>
- |     <?php echo $paginator->numbers();?>
-       <?php echo $paginator->next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?>
+<?php echo $paginator->prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?>
+ | <?php echo $paginator->numbers();?>
+<?php echo $paginator->next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?>
 </div>
+
 <div class="actions">
-       <ul>
-               <li><?php echo $html->link(__('New Character', true), array('action' => 'add')); ?></li>
-               <li><?php echo $html->link(__('List Systems', true), array('controller' => 'systems', 'action' => 'index')); ?> </li>
-       </ul>
+<ul>
+<li><?php echo $html->link(__('New Character', true), array('action' => 'add')); ?></li>
+<li><?php echo $html->link(__('List Systems', true), array('controller' => 'systems', 'action' => 'index')); ?> </li>
+</ul>
 </div>
index 51510ae..45b4d40 100644 (file)
@@ -10,13 +10,14 @@ echo $this->renderElement(
 ?>
 
 <div class="actions">
-       <ul>
-               <?php if ($is_owner): ?>
-               <li><?php echo $html->link(__('Edit Character', true), array('action' => 'edit', $character['Character']['id'])); ?> </li>
-               <li><?php echo $html->link(__('Delete Character', true), array('action' => 'delete', $character['Character']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $character['Character']['id'])); ?> </li>
-               <?php endif; ?>
-               <li><?php echo $html->link(__('List Characters', true), array('action' => 'index')); ?> </li>
-               <li><?php echo $html->link(__('New Character', true), array('action' => 'add')); ?> </li>
-               <li><?php echo $html->link(__('List Systems', true), array('controller' => 'systems', 'action' => 'index')); ?> </li>
-       </ul>
+<ul>
+<?php if ($is_owner): ?>
+<li><?php echo $html->link(__('Edit Character', true), array('action' => 'edit', $character['Character']['id'])); ?> </li>
+<li><?php echo $html->link(__('Delete Character', true), array('action' => 'delete', $character['Character']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $character['Character']['id'])); ?> </li>
+<?php endif; ?>
+
+<li><?php echo $html->link(__('List Characters', true), array('action' => 'index')); ?> </li>
+<li><?php echo $html->link(__('New Character', true), array('action' => 'add')); ?> </li>
+<li><?php echo $html->link(__('List Systems', true), array('controller' => 'systems', 'action' => 'index')); ?> </li>
+</ul>
 </div>
diff --git a/app/views/helpers/pquery.php b/app/views/helpers/pquery.php
new file mode 100644 (file)
index 0000000..55b6504
--- /dev/null
@@ -0,0 +1,372 @@
+<?php
+/*******************************************************************************
+ *                      PQuery - PHP wrapper for JQuery ( CakePHP release ).
+ *******************************************************************************
+ *      Author:     Vikas Patial
+ *      Email:      email@ngcoders.com
+ *      Website:    http://www.ngcoders.com
+ *
+ *      File:       pquery.php
+ *      Version:    0.2
+ *      Copyright:  (c) 2007 - Vikas Patial
+ *                  You are free to use, distribute, and modify this software 
+ *                  under the terms of the GNU General Public License.  See the
+ *                  included license.txt file.
+ *      
+ *******************************************************************************
+ *  VERION HISTORY:
+ *
+ *      v0.2 [05.15.2007] - Fixed some hacks which are no longer required , 
+ *                            upgraded to JQuery 1.2.1 . 
+ *
+ *      v0.1 [02.12.2007] - Initial Version
+ *
+ *******************************************************************************
+*/
+
+class PqueryHelper extends Helper  {
+       
+               var $CALLBACKS  =       array('beforeSend',
+                                                       'complete',
+                                                       'error',
+                                                       'success');
+               var $CONSTANTS =    array('hide','show','toggle');
+               
+               
+               var $_radoms_list=array(); // just in case
+               
+               // after,append,appendTo,before,insertAfter,insertBefore,prepend,prependTo
+                               
+
+       function form_remote_tag($options)
+       {
+               $options['form'] = true;
+               
+               $uid=(isset($options['id']))?$options['id']:$this->_random_id();
+               $id_string = 'id="'.$uid.'"';
+               
+               return '<form action="'.$options['url'].'" onsubmit=\''.$this->remote_function($options).'; return false;\' method="'.(isset($options['type'])?$options['type']:'GET').'"  >';                  
+
+       }
+       
+       function link_to_remote($name,$options=null,$html_options=null)
+       {
+               $html_options['id'] = isset($options['id'])?$options['id']:$this->_random_id();
+               return $this->link_to_function($name,$this->remote_function($options),$html_options);
+       }
+       
+       function remote_function($options)
+       {
+       
+               $javascript_options = $this->_options_for_ajax($options);
+               
+               $ajax_function= '$.ajax({'.$javascript_options.'})';
+               
+               $ajax_function=(isset($options['before']))?  $options['before'].';'.$ajax_function : $ajax_function;
+               $ajax_function=(isset($options['after']))?  $ajax_function.';'.$options['after'] : $ajax_function;
+               $ajax_function=(isset($options['condition']))? 'if ('.$options['condition'].') {'.$ajax_function.'}' : $ajax_function;
+               $ajax_function=(isset($options['confirm'])) ? 'if ( confirm(\''.$options['confirm'].'\' ) ) { '.$ajax_function.' } ':$ajax_function;
+               
+               return $ajax_function;
+       
+       }
+       
+       function visual_effect($name,$element,$options=null) {
+
+               $effect='';
+               $speed    = isset($options['speed'])?(is_numeric($options['speed'])?$options['speed']:'"'.$options['speed'].'"'):'"normal"';
+               $callback = (isset($options['callback']))?',function(){'.$options['callback'].'})':')';
+               
+               switch($name) {
+                       case 'animate'  :
+                               $params = $this->_options_for_javascript($options,array('hide','show','toggle'));
+                               $effect ='$("'.$element.'").animate({'.$params.'},'.$speed.','.(isset($options['easing'])?'"'.$options['easing'].'"':'"linear"').$callback;
+                               break;
+                       case 'fadeIn':
+                       case 'fadeOut':
+                       case 'hide':
+                       case 'show':
+                       case 'slideDown':
+                       case 'slideToggle':
+                       case 'slideUp':
+                               $effect = '$("'.$element.'").'.$name.'('.$speed.$callback;
+                               break;
+                       case 'hide':
+                       case 'show':
+                       case 'toggle':
+                               $effect = '$("'.$element.'").'.$name.'()';
+                               break;
+                       case 'fadeTo':
+                               $effect = '$("'.$element.'").fadeTo('.$speed.','.$options['opacity'].$callback;
+                               break;
+               }
+               return $effect;
+       
+       }
+       
+       function show($id)
+       {
+               return $this->visual_effect('show',$id);
+       }
+
+       function toggle($id)
+       {
+               return $this->visual_effect('toggle',$id);
+       }
+       
+       function hide($id)
+       {
+               return $this->visual_effect('hide',$id);
+       }
+
+       
+       function ID($id,$extend=null)
+       {
+               return '$("'.$id.'")'.(!empty($extend))?'.'.$extend:'';
+       }
+       
+       function call($function , $args = null)
+       {
+               $arg_str='';
+               if (is_array($args)) {
+                       foreach ($args as $arg){
+                               if(!empty($arg_str))$arg_str.=', ';
+                               if( is_string($arg)) {
+                                       $arg_str.="'$arg'";
+                               } else {
+                                       $arg_str.=$arg;
+                               }
+                       }
+               } else {
+                       if (is_string($args)) {
+                               $arg_str.="'$args'";
+                       } else {
+                               $arg_str.=$args;
+                       }
+               }
+
+               return "$function($arg_str)";
+       }
+       
+       function alert($message)
+       {
+               return $this->call('alert',$message);
+       }
+
+       function assign($variable,$value)
+       {
+               return "$variable = $value;";
+       }
+       
+       function delay($seconds=1,$script='')
+       {
+               return "setTimeout( function() { $script } , ".($seconds*1000)." )";
+       }
+       
+       function redirect_to($location)
+       {
+               return $this->assign('window.location.href',$location);
+       }
+       
+       function periodically_call_remote($options=null) {
+               
+               $frequency=(isset($options['frequency']))?$options['frequency']:10;
+               $code = 'setInterval(function() { '.$this->remote_function($options).' },'.($frequency*1000).')';
+               return $code;
+               
+       }
+       
+       function observe_field($field_id,$options=null)
+       {
+               if (isset($options['frequency']) && $options['frequency']> 0 ) {
+                       return $this->_build_observer(false,$field_id,$options);
+               } else {
+                       return $this->_build_observer(true,$field_id,$options);
+               }
+       }
+       
+       // after,append,appendTo,before,insertAfter,insertBefore,prepend,prependTo
+       
+       function insert_html($position,$id,$html,$type='html')
+       {
+               $html_val= (($type=='html')?'"'.$html.'"':$html);
+               return '$("'.$id.'").'.$position.'('.$html_val.')';
+       }
+       
+       function replace_html($id,$html,$type='html')
+       {
+               $html_val= (($type=='html')?'"'.$html.'"':$html);
+               return '$("'.$id.'").replace('.$html_val.')';
+       }
+       
+       function remove($id,$expr=false)
+       {
+               $expr = (($expr)?'"'.$expr.'"':'');
+               return '$("'.$id.'").remove('.$expr.')';
+       }
+       
+       function clean($id)
+       {
+               return '$("'.$id.'").empty()';
+       }
+               
+       function button_to_function($name,$function=null)
+       {
+               return '<input type="button" value="'.$name.'" onclick="'.$function.'" />';
+               
+       }
+       
+
+       function escape($javascript)
+       {
+               $javascript=str_replace(array("\r\n","\n","\r"),array("\n"),$javascript);
+               $javascript=addslashes($javascript);
+               return $javascript;
+               
+       }
+       
+       
+       function tag($content)
+       {
+               return "\n<script type=\"text/javascript\" defer=\"defer\">\n".$content."\n</script>\n"; 
+       }
+       
+               
+       function link_to_function($name,$function,$html_options=null)
+       {
+               $uid=(isset($html_options['id']))?$html_options['id']:$this->_random_id();
+               $id_string = 'id="'.$uid.'"';
+               return '<a href="'.((isset($html_options['href']))?$html_options['href']:'#').'" onclick=\''.((isset($html_options['onclick']))?$html_options['onclick'].';':'').$function.'; return false;\'>'.$name.'</a>';
+
+       }
+       
+       /////////////////////////////////////////////////////////////////////////////////////
+       //                             Private functions 
+       /////////////////////////////////////////////////////////////////////////////////////
+       
+       function _random_id()
+       {
+               
+               $salt = "abchefghjkmnpqrstuvwxyz0123456789";
+               srand((double)microtime()*1000000);
+                       
+               while(1) {
+                       $i = 0;
+                       $makepass = '';
+                       while ($i <= 6) {
+                               $num = rand() % 33;
+                               $tmp = substr($salt, $num, 1);
+                               $makepass = $makepass . $tmp;
+                               $i++;
+                       }
+                       if(!in_array($makepass,$this->_radoms_list)){
+                               $this->_radoms_list[] = $makepass;
+                               return  $makepass;
+                       }
+               }
+       }       
+       
+       function _build_callbacks($options)
+       {
+               $callbacks=array();
+               foreach ($options as $callback=>$code) {
+                       if (in_array($callback,$this->CALLBACKS)) {
+                                                       $callbacks[$callback]='function(response){'.$code.'}';
+                                               }                       
+               }
+               return $callbacks;
+       }
+       
+       function _build_observer($event=false,$name,$options=null)
+       {
+
+               $callback = isset($options['function']) ? $options['function'] : $this->remote_function($options);
+               $frequency=(isset($options['frequency']))?$options['frequency']:10;
+               
+               
+               if ($event) {
+                       $javascript = '$("'.$name.'").bind("'.$options['event'].'",function(event) {'.$callback.'})';
+                               } else {
+                       $javascript = 'setInterval(function() { '.$callback.' },'.($frequency*1000).')';
+               }
+
+               return $javascript;
+               
+       }
+       
+       function _method_option_to_s($method)
+       {
+               return (strstr($method,"'"))?$method:"'$method'";
+       }
+       
+       function _options_for_ajax($options)
+       {
+               if (isset($options['url'])) $js_options['url']    = '"'.$options['url'].'"';
+               
+               
+               if (isset($options['form'])) {
+                       $js_options['data']='$(this.elements).serialize()';             
+               }elseif (isset($options['parameters'])){
+                       $js_options['data']='$("'.$options['submit'].'").serialize()';
+               }elseif (isset($options['with'])) {
+                       $js_options['data']= '"'.$options['with'].'"';
+               }
+               
+               $html_update=(isset($options['position'])?$options['position']:'html');
+               if (isset($options['update']))$options['success']='$("'.$options['update'].'").'.$html_update.'(response);'.(isset($options['success'])?$options['success']:'');
+                               
+               $js_options=array_merge($js_options,(is_array($options))?$this->_build_callbacks($options):array());
+               
+               if (isset($options['async']))$js_options['async'] = $options['async'];
+
+               if (isset($options['type'])) $js_options['type'] = '"'.$options['type'].'"';
+               if (isset($options['contentType'])) $js_options['contentType'] = '"'.$options['contentType'].'"';
+               
+               $js_options['dataType'] = (isset($options['dataType']))?'"'.$options['dataType'].'"':'"html"';
+               
+               if (isset($options['timeout'])) $js_options['timeout'] = $options['timeout'];
+               
+               if (isset($options['processData'])) $js_options['processData'] = $options['processData'];
+               if (isset($options['ifModified'])) $js_options['ifModified'] = $options['ifModified'];
+               if (isset($options['global'])) $js_options['global'] = $options['global'];
+                       
+               return $this->_options_for_javascript($js_options);
+       }
+
+
+       function _array_or_string_for_javascript($option)
+       {
+               $return_val='';
+               if(is_array($option))
+               {
+                       foreach ($option as $value) {
+                               if(!empty($return_val))$ret_val.=', ';
+                               $return_val.=$value;
+                       }
+                       return '['.$return_val.']';
+               } 
+                       return "'$option'";     
+       }
+       
+       
+       function _options_for_javascript($options,$constants=false)
+       {
+               $return_val='';
+               
+               if (is_array($options)) {
+                       
+               foreach ($options as $var=>$val)
+               {
+                       if (!empty($return_val)) $return_val.=', ';
+                       if(!$constants)$return_val.="$var: $val";
+                       else  {
+                               $return_val.= $var.' : '.((in_array($val,$constants))?'"'.$val.'"':$val);
+                       }
+               }
+               }               
+               return $return_val;
+       }
+       
+}
+
+?>
\ No newline at end of file
index e45f2f4..8c31896 100644 (file)
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-       <?php echo $html->charset(); ?>
-       <title>
-               <?php echo $title_for_layout; ?>
-       </title>
-       <?php
-//             echo $html->meta('icon'); // スキン設定etcで管理画面変更対応予定
-       ?>
-       <?php
-               echo $html->css('base');
-       ?>
-       <?php 
-               // Javascript
-               // jQuery
-               echo $javascript->link('jquery-1.3.2.min.js');
-               // 独自ライブラリ
-               echo $javascript->link('common_100110.js');
-               // readyイベント
-       ?>
+<?php echo $html->charset(); ?>
+<title>
+<?php echo $title_for_layout; ?>
+</title>
+<?php
+       //echo $html->meta('icon'); // スキン設定etcで管理画面変更対応予定
+       echo $html->css('base');
+
+       // Javascript
+       // jQuery
+       echo $javascript->link('jquery-1.3.2.min.js');
+       // 独自ライブラリ
+       echo $javascript->link('common_100110.js');
+       // readyイベント
+?>
 <script type="text/javascript">
-$(document).ready(function(){
+       $(document).ready(function(){
        //サブメニューを表示
        toggleSubMenu();
-});
+       });
 </script>
 
-       <?php
-               echo $scripts_for_layout;
-       ?>
+<?php echo $scripts_for_layout; ?>
 <?php if ($refresh['time'] > 0): ?>
 <meta http-equiv="Refresh" content="<?php echo $refresh['time']; ?>;url=<?php echo $refresh['url']; ?>"/>
 <?php endif; ?>
@@ -47,48 +42,52 @@ $(document).ready(function(){
 </head>
 <body>
 <div id="container">
-       <div id="header">
-               <div id="intro">
-                       <ul>
-                               <li id="siteName"><h1><a href="<?php echo $html->url('/'); ?>">きゃら・し!</a></h1></li>
-                               <li id="siteDescription">スキン型キャラクターシート管理&公開システム</li>
-                       </ul>
-               </div>
-               <div id="subNavi">
-               </div>
-               <div class="mainNavi">
-                       <ul>
-                       <?php if ($user['User']['id']): ?>
-                               <li><?php echo $html->link(__('Home', true), '/users/index'); ?>
-                                       <div class="subNavi">
-                                               <ul>
-                                               <li><?php echo $html->link(__('Edit Your Infomation', true), array('action' => 'edit', $user['User']['id'])); ?> </li>
-                                               <li><?php echo $html->link(__('Change Password', true), array('action' => 'change_password', $user['User']['id'])); ?> </li>
-                                               <li><?php echo $html->link(__('Delete Your Account', true), array('action' => 'delete', $user['User']['id'])); ?> </li>
-                                               </ul>
-                                       </div>
-                               <li>
-                               <?php echo $html->link(__('Users', true), '/users/listview'); ?>
-                               </li>
-                       <?php endif; ?>
-                       <?php if ($isAdministrator): ?>
-                               <li><?php echo $html->link(__('Administration', true), '/admin/users/index'); ?></li>
-                       <?php endif; ?>
-                       <?php if ($user['User']['id']): ?>
-                               <li><?php echo $html->link(__('Logout', true), '/users/logout'); ?></li>
-                       <?php endif; ?>
-                       </ul>
-               </div>
-       </div>
-       <div id="content">
-               <?php $session->flash(); ?>
-               <?php if ($session->check('Message.auth')): ?>
-                       <div><?php $session->flash('auth'); ?></div>
-               <?php endif; ?>
-               <?php echo $content_for_layout; ?>
-       </div>
-       <div id="footer">
-       </div>
+<div id="header">
+<div id="intro">
+<ul>
+<li id="siteName"><h1><a href="<?php echo $html->url('/'); ?>">きゃら・し!</a></h1></li>
+<li id="siteDescription">スキン型キャラクターシート管理&公開システム</li>
+</ul>
+</div>
+<div id="subNavi">
+</div>
+<div class="mainNavi">
+<ul>
+<?php if ($user['User']['id']): ?>
+<li><?php echo $html->link(__('Home', true), '/users/index'); ?>
+<li>
+<?php echo $html->link(__('Users', true), '/users/listview'); ?>
+</li>
+<li><?php echo $html->link(__('Configuration', true),  array('action' => 'edit', $user['User']['id'])); ?>
+<div class="subNavi">
+<ul>
+<li><?php echo $html->link(__('Edit Your Infomation', true), array('action' => 'edit', $user['User']['id'])); ?> </li>
+<li><?php echo $html->link(__('Change Password', true), array('action' => 'change_password', $user['User']['id'])); ?> </li>
+<li><?php echo $html->link(__('Delete Your Account', true), array('action' => 'delete', $user['User']['id'])); ?> </li>
+</ul>
+</div>
+<li>
+<?php echo $html->link(__('Users', true), '/users/listview'); ?>
+</li>
+<?php endif; ?>
+<?php if ($isAdministrator): ?>
+<li><?php echo $html->link(__('Administration', true), '/admin/users/index'); ?></li>
+<?php endif; ?>
+<?php if ($user['User']['id']): ?>
+<li><?php echo $html->link(__('Logout', true), '/users/logout'); ?></li>
+<?php endif; ?>
+</ul>
+</div>
+</div>
+<div id="content">
+<?php $session->flash(); ?>
+<?php if ($session->check('Message.auth')): ?>
+<div><?php $session->flash('auth'); ?></div>
+<?php endif; ?>
+<?php echo $content_for_layout; ?>
+</div>
+<div id="footer">
+</div>
 </div>
 <?php echo $cakeDebug; ?>
 </body>
index c5b7639..c4331f8 100644 (file)
@@ -4,30 +4,30 @@
        'action' => 'admin_add',
        $profile['Profile']['id'],
 )));?>
-       <fieldset>
-               <legend><?php echo  $profile['Profile']['name']. ' '.__('Add ProfileSelect', true);?></legend>
-       <?php
-               echo $form->input('value', array(
-                       'type' => 'text',
-                       'label' => __('Value', true),
-               ));
-               echo $form->input('sort_order', array(
-                       'label' => __('Sort Order', true),
-                       'after' => $html->tag(
-                               'div',
-                               __('Numeric only', true),
-                               array('class' => 'attention')
-                       ),
-               ));
+<fieldset>
+<legend><?php echo  $profile['Profile']['name']. ' '.__('Add ProfileSelect', true);?></legend>
+<?php
+       echo $form->input('value', array(
+               'type' => 'text',
+               'label' => __('Value', true),
+       ));
+       echo $form->input('sort_order', array(
+               'label' => __('Sort Order', true),
+               'after' => $html->tag(
+                       'div',
+                       __('Numeric only', true),
+                       array('class' => 'attention')
+               ),
+       ));
 
-       echo $token->create();
-       ?>
-       </fieldset>
+echo $token->create();
+?>
+</fieldset>
 <?php echo $form->end('Submit');?>
 </div>
 <div class="actions">
-       <ul>
-               <li><?php echo $html->link(__('List ProfileSelects', true), array('action' => 'admin_listview', $profile['Profile']['id'])); ?> </li>
-               <li><?php echo $html->link(__('List Profiles', true), array('controller' => 'systems', 'action' => 'admin_view', $profile['System']['id'])); ?> </li>
-       </ul>
+<ul>
+<li><?php echo $html->link(__('List ProfileSelects', true), array('action' => 'admin_listview', $profile['Profile']['id'])); ?> </li>
+<li><?php echo $html->link(__('List Profiles', true), array('controller' => 'systems', 'action' => 'admin_view', $profile['System']['id'])); ?> </li>
+</ul>
 </div>
index b6d518f..838a346 100644 (file)
@@ -1,30 +1,30 @@
 <div class="profileSelects form">
 <?php echo $form->create('ProfileSelect');?>
-       <fieldset>
-               <legend><?php __('Edit ProfileSelect');?></legend>
-       <?php
-               echo $form->input('value', array(
-                       'type' => 'text',
-                       'label' => __('Value', true),
-               ));
-               echo $form->input('sort_order', array(
-                       'label' => __('Sort Order', true),
-                       'after' => $html->tag(
-                               'div',
-                               __('Numeric only', true),
-                               array('class' => 'attention')
-                       ),
-               ));
+<fieldset>
+<legend><?php __('Edit ProfileSelect');?></legend>
+<?php
+       echo $form->input('value', array(
+               'type' => 'text',
+               'label' => __('Value', true),
+       ));
+       echo $form->input('sort_order', array(
+               'label' => __('Sort Order', true),
+               'after' => $html->tag(
+                       'div',
+                       __('Numeric only', true),
+                       array('class' => 'attention')
+               ),
+       ));
 
        echo $token->create();
-       ?>
-       </fieldset>
+?>
+</fieldset>
 <?php echo $form->end('Submit');?>
 </div>
 <div class="actions">
-       <ul>
-               <li><?php echo $html->link(__('Delete', true), array('action' => 'delete', $form->value('ProfileSelect.id')), null, sprintf(__('Are you sure you want to delete # %s?', true), $form->value('ProfileSelect.id'))); ?></li>
-               <li><?php echo $html->link(__('List ProfileSelects', true), array('action' => 'admin_listview', $profileSelect['Profile']['id'])); ?> </li>
-               <li><?php echo $html->link(__('List Profiles', true), array('controller' => 'systems', 'action' => 'admin_view', $profileSelect['Profile']['system_id'])); ?> </li>
-       </ul>
+<ul>
+<li><?php echo $html->link(__('Delete', true), array('action' => 'delete', $form->value('ProfileSelect.id')), null, sprintf(__('Are you sure you want to delete # %s?', true), $form->value('ProfileSelect.id'))); ?></li>
+<li><?php echo $html->link(__('List ProfileSelects', true), array('action' => 'admin_listview', $profileSelect['Profile']['id'])); ?> </li>
+<li><?php echo $html->link(__('List Profiles', true), array('controller' => 'systems', 'action' => 'admin_view', $profileSelect['Profile']['system_id'])); ?> </li>
+</ul>
 </div>
index 66776e1..3b25ee4 100644 (file)
@@ -3,9 +3,9 @@
 
 <p>
 <div class="actions">
-       <ul>
-               <li><?php echo $html->link(__('New ProfileSelect', true), array('action' => 'admin_add', $profile['Profile']['id'])); ?></li>
-       </ul>
+<ul>
+       <li><?php echo $html->link(__('New ProfileSelect', true), array('action' => 'admin_add', $profile['Profile']['id'])); ?></li>
+</ul>
 </div>
 </p>
 
 <?php if (!empty($profile['ProfileSelect'])): ?>
 <tbody>
 <?php
-$i = 0;
-foreach ($profile['ProfileSelect'] as $profileSelect):
-       $class = null;
-       if ($i++ % 2 == 0) {
-               $class = ' class="altrow"';
-       }
+       $i = 0;
+       foreach ($profile['ProfileSelect'] as $profileSelect):
+               $class = null;
+               if ($i++ % 2 == 0) {
+                       $class = ' class="altrow"';
+               }
 ?>
-       <tr<?php echo $class;?>>
-               <td>
-                       <?php echo $profileSelect['id']; ?>
-               </td>
-               <td>
-                       <?php echo stripcslashes($profileSelect['value']); ?>
-               </td>
-               <td>
-                       <?php echo $profileSelect['sort_order']; ?>
-               </td>
-               <td class="actions">
-                       <?php echo $html->link(__('Edit', true), array('action' => 'edit', $profileSelect['id'])); ?>
-                       <?php echo $html->link(__('Delete', true), array('action' => 'delete', $profileSelect['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $profileSelect['id'])); ?>
-               </td>
-       </tr>
+<tr<?php echo $class;?>>
+<td>
+       <?php echo $profileSelect['id']; ?>
+</td>
+<td>
+       <?php echo stripcslashes($profileSelect['value']); ?>
+</td>
+<td>
+       <?php echo $profileSelect['sort_order']; ?>
+</td>
+<td class="actions">
+       <?php echo $html->link(__('Edit', true), array('action' => 'edit', $profileSelect['id'])); ?>
+       <?php echo $html->link(__('Delete', true), array('action' => 'delete', $profileSelect['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $profileSelect['id'])); ?>
+</td>
+</tr>
 <?php endforeach; ?>
 </tbody>
 <?php endif; ?>
@@ -51,7 +51,6 @@ foreach ($profile['ProfileSelect'] as $profileSelect):
 </p>
 </div>
 
-
 <hr>
 
 <div class="profile_tables view">
index f0d9398..45d5a66 100644 (file)
@@ -4,66 +4,67 @@
        'action' => 'admin_add',
        $profile['Profile']['id'],
 )));?>
-       <fieldset>
-               <legend><?php echo  $profile['Profile']['name']. ' '.__('Add ProfileTable', true);?></legend>
-       <?php
-               echo $form->input('title', array(
-                       'type' => 'text',
-                       'label' => __('Name', true).
-                               $html->tag(
-                                       'span',
-                                       __(' * required', true),
-                               array('class' => 'required')
-                               ),
+<fieldset>
+<legend><?php echo  $profile['Profile']['name']. ' '.__('Add ProfileTable', true);?></legend>
+<?php
+       echo $form->input('title', array(
+               'type' => 'text',
+               'label' => __('Name', true).
                        $html->tag(
-                               'div',
-                               __('Less than 64 characters', true),
-                               array('class' => 'attention')
-                       )
-               ));
-               echo $form->input('tablekey_name', array(
-                       'label' => __('Key Name', true).
-                               $html->tag(
-                                       'span',
-                                       __(' * required', true),
-                               array('class' => 'required')
-                               ),
-                       'after' => $html->tag(
-                               'div',
-                               __('Only Number, Small letter and Underline.', true),
-                               array('class' => 'attention')
-                       ).
+                               'span',
+                               __(' * required', true),
+                       array('class' => 'required')
+                       ),
+               $html->tag(
+                       'div',
+                       __('Less than 64 characters', true),
+                       array('class' => 'attention')
+               )
+       ));
+       echo $form->input('tablekey_name', array(
+               'label' => __('Key Name', true).
                        $html->tag(
-                               'div',
-                               __('Less than 32 characters', true),
-                               array('class' => 'attention')
-                       )
-               ));
-               echo $form->input('width', array(
-                       'label' => __('Width', true),
-                       'after' => $html->tag(
-                               'div',
-                               __('Column Width by Pxcel. Zero or null mean Auto width.', true),
-                               array('class' => 'attention')
-                       )
-               ));
-               echo $form->input('sort_order', array(
-                       'label' => __('Order', true),
-                       'after' => $html->tag(
-                               'div',
-                               __('Numeric only', true),
-                               array('class' => 'attention')
+                               'span',
+                               __(' * required', true),
+                       array('class' => 'required')
                        ),
-               ));
+               'after' => $html->tag(
+                       'div',
+                       __('Only Number, Small letter and Underline.', true),
+                       array('class' => 'attention')
+               ).
+               $html->tag(
+                       'div',
+                       __('Less than 32 characters', true),
+                       array('class' => 'attention')
+               )
+       ));
+       echo $form->input('width', array(
+               'label' => __('Width', true),
+               'after' => $html->tag(
+                       'div',
+                       __('Column Width by Pxcel. Zero or null mean Auto width.', true),
+                       array('class' => 'attention')
+               )
+       ));
+       echo $form->input('sort_order', array(
+               'label' => __('Order', true),
+               'after' => $html->tag(
+                       'div',
+                       __('Numeric only', true),
+                       array('class' => 'attention')
+               ),
+       ));
 
        echo $token->create();
-       ?>
-       </fieldset>
+?>
+</fieldset>
 <?php echo $form->end('Submit');?>
 </div>
+
 <div class="actions">
-       <ul>
-               <li><?php echo $html->link(__('List ProfileTables', true), array('action' => 'admin_listview', $profile['Profile']['id'])); ?> </li>
-               <li><?php echo $html->link(__('List Profiles', true), array('controller' => 'systems', 'action' => 'admin_view', $profile['System']['id'])); ?> </li>
-       </ul>
+<ul>
+<li><?php echo $html->link(__('List ProfileTables', true), array('action' => 'admin_listview', $profile['Profile']['id'])); ?> </li>
+<li><?php echo $html->link(__('List Profiles', true), array('controller' => 'systems', 'action' => 'admin_view', $profile['System']['id'])); ?> </li>
+</ul>
 </div>
index 92564fb..5ef02fa 100644 (file)
@@ -4,68 +4,69 @@
        'action' => 'admin_edit',
        $profile['Profile']['id'],
 )));?>
-       <fieldset>
-               <legend><?php __('Edit ProfileTable');?></legend>
-       <?php
-               echo $form->input('title', array(
-                       'type' => 'text',
-                       'label' => __('Name', true).
-                               $html->tag(
-                                       'span',
-                                       __(' * required', true),
+<fieldset>
+<legend><?php __('Edit ProfileTable');?></legend>
+<?php
+       echo $form->input('title', array(
+               'type' => 'text',
+               'label' => __('Name', true).
+                       $html->tag(
+                               'span',
+                               __(' * required', true),
                                array('class' => 'required')
-                               ),
+                       ),
                        $html->tag(
                                'div',
                                __('Less than 64 characters', true),
                                array('class' => 'attention')
                        )
-               ));
-               echo $form->input('tablekey_name', array(
-                       'label' => __('Key Name', true).
-                               $html->tag(
-                                       'span',
-                                       __(' * required', true),
-                               array('class' => 'required')
-                               ),
-                       'after' => $html->tag(
-                               'div',
-                               __('Only Number, Small letter and Underline.', true),
-                               array('class' => 'attention')
-                       ).
+       ));
+       echo $form->input('tablekey_name', array(
+               'label' => __('Key Name', true).
                        $html->tag(
-                               'div',
-                               __('Less than 32 characters', true),
-                               array('class' => 'attention')
-                       )
-               ));
-               echo $form->input('width', array(
-                       'label' => __('Width', true),
-                       'after' => $html->tag(
-                               'div',
-                               __('Column Width by Pxcel. Zero or null mean Auto width.', true),
-                               array('class' => 'attention')
-                       )
-               ));
-               echo $form->input('sort_order', array(
-                       'label' => __('Order', true),
-                       'after' => $html->tag(
-                               'div',
-                               __('Numeric only', true),
-                               array('class' => 'attention')
+                       'span',
+                       __(' * required', true),
+                       array('class' => 'required')
                        ),
-               ));
+               'after' => $html->tag(
+                       'div',
+                       __('Only Number, Small letter and Underline.', true),
+                       array('class' => 'attention')
+               ).
+               $html->tag(
+                       'div',
+                       __('Less than 32 characters', true),
+                       array('class' => 'attention')
+               )
+       ));
+       echo $form->input('width', array(
+               'label' => __('Width', true),
+               'after' => $html->tag(
+                       'div',
+                       __('Column Width by Pxcel. Zero or null mean Auto width.', true),
+                       array('class' => 'attention')
+               )
+       ));
+       echo $form->input('sort_order', array(
+               'label' => __('Order', true),
+               'after' => $html->tag(
+                       'div',
+                       __('Numeric only', true),
+                       array('class' => 'attention')
+               ),
+       ));
 
        echo $token->create();
-       ?>
-       </fieldset>
+?>
+</fieldset>
 <?php echo $form->end('Submit');?>
 </div>
+
 <div class="actions">
-       <ul>
-               <li><?php echo $html->link(__('Delete', true), array('action' => 'delete', $form->value('ProfileTable.id')), null, sprintf(__('Are you sure you want to delete # %s?', true), $form->value('ProfileTable.id'))); ?></li>
-               <li><?php echo $html->link(__('List ProfileTables', true), array('action' => 'index'));?></li>
-               <li><?php echo $html->link(__('List Profiles', true), array('controller' => 'profiles', 'action' => 'index')); ?> </li>
-               <li><?php echo $html->link(__('New Profile', true), array('controller' => 'profiles', 'action' => 'add')); ?> </li>
-       </ul>
+<ul>
+<li><?php echo $html->link(__('Delete', true), array('action' => 'delete', $form->value('ProfileTable.id')), null, sprintf(__('Are you sure you want to delete # %s?', true), $form->value('ProfileTable.id'))); ?></li>
+<li><?php echo $html->link(__('List ProfileTables', true), array('action' => 'index'));?></li>
+<li><?php echo $html->link(__('List Profiles', true), array('controller' => 'profiles', 'action' => 'index')); ?> </li>
+<li><?php echo $html->link(__('New Profile', true), array('controller' => 'profiles', 'action' => 'add')); ?> </li>
+</ul>
 </div>
index ba366f2..2229382 100644 (file)
@@ -3,9 +3,9 @@
 
 <p>
 <div class="actions">
-       <ul>
-               <li><?php echo $html->link(__('New ProfileTable', true), array('action' => 'admin_add', $profile['Profile']['id'])); ?></li>
-       </ul>
+<ul>
+<li><?php echo $html->link(__('New ProfileTable', true), array('action' => 'admin_add', $profile['Profile']['id'])); ?></li>
+</ul>
 </div>
 </p>
 <p>
 </thead>
 <tbody>
 <?php
-$i = 0;
-foreach ($profile['ProfileTable'] as $profileTable):
-       $class = null;
-       if ($i++ % 2 == 0) {
-               $class = ' class="altrow"';
-       }
+       $i = 0;
+       foreach ($profile['ProfileTable'] as $profileTable):
+               $class = null;
+               if ($i++ % 2 == 0) {
+                       $class = ' class="altrow"';
+               }
 ?>
-       <tr<?php echo $class;?>>
-               <td>
-                       <?php echo $profileTable['id']; ?>
-               </td>
-               <td>
-                       <?php echo $profileTable['title']; ?>
-               </td>
-               <td>
-                       <?php echo $profileTable['tablekey_name']; ?>
-               </td>
-               <td>
-                       <?php echo $profileTable['width']; ?>
-               </td>
-               <td>
-                       <?php echo $profileTable['sort_order']; ?>
-               </td>
-               <td class="actions">
-                       <?php echo $html->link(__('Edit', true), array('action' => 'admin_edit', $profileTable['id'])); ?>
-                       <?php echo $html->link(__('Delete', true), array('action' => 'admin_delete', $profileTable['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $profileTable['id'])); ?>
-               </td>
-       </tr>
+<tr<?php echo $class;?>>
+<td>
+       <?php echo $profileTable['id']; ?>
+</td>
+<td>
+       <?php echo $profileTable['title']; ?>
+</td>
+<td>
+       <?php echo $profileTable['tablekey_name']; ?>
+</td>
+<td>
+       <?php echo $profileTable['width']; ?>
+</td>
+<td>
+       <?php echo $profileTable['sort_order']; ?>
+</td>
+<td class="actions">
+       <?php echo $html->link(__('Edit', true), array('action' => 'admin_edit', $profileTable['id'])); ?>
+       <?php echo $html->link(__('Delete', true), array('action' => 'admin_delete', $profileTable['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $profileTable['id'])); ?>
+</td>
+</tr>
 <?php endforeach; ?>
 </tbody>
 </table>
index d096f70..5d811bf 100644 (file)
@@ -1,75 +1,65 @@
 <div class="systems form">
 <?php echo $form->create('System');?>
-       <fieldset>
-               <legend><?php __('Add System');?></legend>
-       <?php
-               echo $form->input('name', array(
-                               'type' => 'text',
-                               'label' => __('Name', true).
-                                       $html->tag(
-                                               'span',
-                                               __(' * required', true),
-                                               array('class' => 'required')
-                                       ),
-                               'after' => $html->tag(
-                                       'div',
-                                       __('Less than 255 characters', true),
-                                       array('class' => 'attention')
-                               )
-                       )
-               );
-               echo $form->input('sort_order', array(
-                               'label' => __('Order', true),
-                               'after' => $html->tag(
-                                       'div',
-                                       __('Numeric only', true),
-                                       array('class' => 'attention')
-                               )
-                       )
-               );
-               echo $form->input('url', array(
-                               'type' => 'text',
-                               'label' => __('URL', true),
-                       )
-               );
-               echo $select->create_publicflag_select($public_flags, 'public_flag', array(
-                               'label' => __('Public Flag', true),
-                               'selected' => 'public',
-                       )
-               );
-               echo $form->input('set_npc', array(
-                               'label' => __('Use NPC', true),
-                       )
-               );
-               echo $form->input('detail', array(
-                               'label' => __('Detail', true),
+<fieldset>
+<legend><?php __('Add System');?></legend>
+<?php
+       echo $form->input('name', array(
+               'type' => 'text',
+               'label' => __('Name', true).
+                       $html->tag('span',
+                               __(' * required', true),
+                               array('class' => 'required')
+                       ),
+               'after' => $html->tag('div',
+                       __('Less than 255 characters', true),
+                       array('class' => 'attention')
                        )
-               );
+               ));
+       echo $form->input('sort_order', array(
+               'label' => __('Order', true),
+               'after' => $html->tag('div',
+                       __('Numeric only', true),
+                       array('class' => 'attention')
+               )
+       ));
+       echo $form->input('url', array(
+               'type' => 'text',
+               'label' => __('URL', true),
+       ));
+       echo $select->create_publicflag_select($public_flags, 'public_flag', array(
+               'label' => __('Public Flag', true),
+               'selected' => 'public',
+       ));
+       echo $form->input('set_npc', array(
+               'label' => __('Use NPC', true),
+       ));
+       echo $form->input('detail', array(
+               'label' => __('Detail', true),
+       ));
 
-               echo $token->create();
-       ?>
-       </fieldset>
-<?php echo $form->end('Submit');?>
+       echo $token->create();
+?>
+</fieldset>
+       <?php echo $form->end('Submit');?>
 </div>
 
 <div class="backButton">
 <?php
-echo $form->create('System', array('url' => array(
-       'controller' => 'systems', 'action' => 'admin_index'),
-       'type' => 'GET',
-       'id' => 'CancelButton'
-));
-echo $form->end('Cancel');
+       echo $form->create('System', array('url' => array(
+               'controller' => 'systems', 'action' => 'admin_index'),
+               'type' => 'GET',
+               'id' => 'CancelButton'
+       ));
+       echo $form->end('Cancel');
 ?>
 </div>
 
 <div class="actions">
-       <ul>
-               <li><?php echo $html->link(__('List Systems', true), array('action' => 'index'));?></li>
-               <li><?php echo $html->link(__('List Characters', true), array('controller' => 'characters', 'action' => 'index')); ?> </li>
-               <li><?php echo $html->link(__('New Character', true), array('controller' => 'characters', 'action' => 'add')); ?> </li>
-               <li><?php echo $html->link(__('List Profiles', true), array('controller' => 'profiles', 'action' => 'index')); ?> </li>
-               <li><?php echo $html->link(__('New Profile', true), array('controller' => 'profiles', 'action' => 'add')); ?> </li>
-       </ul>
-       </ul>
+<ul>
+<li><?php echo $html->link(__('List Systems', true), array('action' => 'index'));?></li>
+<li><?php echo $html->link(__('List Characters', true), array('controller' => 'characters', 'action' => 'index')); ?> </li>
+<li><?php echo $html->link(__('New Character', true), array('controller' => 'characters', 'action' => 'add')); ?> </li>
+<li><?php echo $html->link(__('List Profiles', true), array('controller' => 'profiles', 'action' => 'index')); ?> </li>
+<li><?php echo $html->link(__('New Profile', true), array('controller' => 'profiles', 'action' => 'add')); ?> </li>
+</ul>
 </div>
index 7ee334a..516f1d4 100644 (file)
@@ -1,70 +1,63 @@
 <div class="systems form">
 <?php echo $form->create('System');?>
-       <fieldset>
-               <legend><?php __('Edit System');?></legend>
-       <?php
-               echo $form->input('name', array(
-                               'type' => 'text',
-                               'label' => __('Name', true).
-                                       $html->tag(
-                                               'span',
-                                               __(' * required', true),
-                                               array('class' => 'required')
-                                       ),
-                               'after' => $html->tag(
-                                       'div',
-                                       __('Less than 255 characters', true),
-                                       array('class' => 'attention')
-                               )
-                       )
-               );
-               echo $form->input('sort_order', array(
-                               'label' => __('Order', true),
-                               'after' => $html->tag(
-                                       'div',
-                                       __('Numeric only', true),
-                                       array('class' => 'attention')
-                               )
-                       )
-               );
-               echo $form->input('url', array(
-                               'type' => 'text',
-                               'label' => __('URL', true),
-                       )
-               );
-               echo $select->create_publicflag_select($public_flags, 'public_flag', array(
-                               'label' => __('Public Flag', true)
-                       )
-               );
-               echo $form->input('set_npc', array(
-                               'label' => __('Use NPC', true),
-                       )
-               );
-               echo $form->input('detail', array(
-                               'label' => __('Detail', true),
-                       )
-               );
+<fieldset>
+<legend><?php __('Edit System');?></legend>
+<?php
+       echo $form->input('name', array(
+               'type' => 'text',
+               'label' => __('Name', true).
+                       $html->tag('span',
+                               __(' * required', true),
+                               array('class' => 'required')
+                       ),
+               'after' => $html->tag(
+               'div',
+                       __('Less than 255 characters', true),
+                       array('class' => 'attention')
+               )
+       ));
+       echo $form->input('sort_order', array(
+               'label' => __('Order', true),
+               'after' => $html->tag(
+               'div',
+                       __('Numeric only', true),
+                       array('class' => 'attention')
+               )
+       ));
+       echo $form->input('url', array(
+               'type' => 'text',
+               'label' => __('URL', true),
+       ));
+       echo $select->create_publicflag_select($public_flags, 'public_flag', array(
+               'label' => __('Public Flag', true)
+       ));
+       echo $form->input('set_npc', array(
+               'label' => __('Use NPC', true),
+       ));
+       echo $form->input('detail', array(
+               'label' => __('Detail', true),
+       ));
 
-               echo $token->create();
-       ?>
-       </fieldset>
+       echo $token->create();
+?>
+</fieldset>
 <?php echo $form->end('Submit');?>
 </div>
 
 <div class="backButton">
 <?php
-echo $form->create('', array('url' => array(
-       'controller' => 'systems', 'action' => 'admin_view', $this->data['System']['id']),
-       'type' => 'GET',
-       'id' => 'CancelButton'
-));
-echo $form->end('Cancel');
+       echo $form->create('', array('url' => array(
+               'controller' => 'systems', 'action' => 'admin_view', $this->data['System']['id']),
+               'type' => 'GET',
+               'id' => 'CancelButton'
+       ));
+       echo $form->end('Cancel');
 ?>
 </div>
 
 <div class="actions">
-       <ul>
-               <li><?php echo $html->link(__('Delete', true), array('action' => 'delete', $form->value('System.id')), null, sprintf(__('Are you sure you want to delete %s?', true), $form->value('System.name'))); ?></li>
-               <li><?php echo $html->link(__('List Systems', true), array('action' => 'index'));?></li>
-       </ul>
+<ul>
+<li><?php echo $html->link(__('Delete', true), array('action' => 'delete', $form->value('System.id')), null, sprintf(__('Are you sure you want to delete %s?', true), $form->value('System.name'))); ?></li>
+<li><?php echo $html->link(__('List Systems', true), array('action' => 'index'));?></li>
+</ul>
 </div>
index eaa7c80..6d2ed18 100644 (file)
@@ -24,49 +24,49 @@ foreach ($systems as $system):
                $class = ' class="altrow"';
        }
 ?>
-       <tr<?php echo $class;?>>
-               <td>
-                       <?php echo $system['System']['id']; ?>
-               </td>
-               <td>
-                       <?php if ($system['System']['url']): ?>
-                               <?php echo $html->link('<img src="'.$system['System']['image_filename'].'" alt="system imagefile">', $system['System']['url'], array('target'=>'_blank'), false, false); ?>
-                       <?php else: ?>
-                               <?php echo '<img src="'.$system['System']['image_filename'].'" alt="system imagefile">'; ?>
-                       <?php endif; ?>
-                       
-                       <?php echo $html->link($system['System']['name'], array('action' => 'view', $system['System']['id'])); ?>
-               </td>
-               <td>
-                       <?php echo $system['System']['sort_order']; ?>
-               </td>
-               <td>
-                       <?php if ($system['System']['set_npc']): ?>
-                               <?php echo __('Use'); ?>
-                       <?php else: ?>
-                               <?php echo __('No Use'); ?>
-                       <?php endif; ?>
-               </td>
-               <td>
-                       <?php echo $select->get_i18n_public_flag($system['System']['public_flag'], $public_flags) ?>
-               </td>
-               <td>
-                       <?php echo $system['System']['detail']; ?>
-               </td>
-       </tr>
+<tr<?php echo $class;?>>
+<td>
+       <?php echo $system['System']['id']; ?>
+</td>
+<td>
+<?php if ($system['System']['url']): ?>
+       <?php echo $html->link('<img src="'.$system['System']['image_filename'].'" alt="system imagefile">', $system['System']['url'], array('target'=>'_blank'), false, false); ?>
+<?php else: ?>
+       <?php echo '<img src="'.$system['System']['image_filename'].'" alt="system imagefile">'; ?>
+<?php endif; ?>
+       <?php echo $html->link($system['System']['name'], array('action' => 'view', $system['System']['id'])); ?>
+</td>
+<td>
+       <?php echo $system['System']['sort_order']; ?>
+</td>
+<td>
+<?php if ($system['System']['set_npc']): ?>
+       <?php echo __('Use'); ?>
+<?php else: ?>
+       <?php echo __('No Use'); ?>
+<?php endif; ?>
+</td>
+<td>
+       <?php echo $select->get_i18n_public_flag($system['System']['public_flag'], $public_flags) ?>
+</td>
+<td>
+       <?php echo $system['System']['detail']; ?>
+</td>
+</tr>
 <?php endforeach; ?>
 </table>
 </div>
+
 <div class="paging">
-       <?php echo $paginator->prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?>
+<?php echo $paginator->prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?>
  |     <?php echo $paginator->numbers();?>
-       <?php echo $paginator->next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?>
+<?php echo $paginator->next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?>
 </div>
 <div class="actions">
-       <ul>
-               <li><?php echo $html->link(__('New System', true), array('action' => 'add')); ?></li>
-               <li><?php echo $html->link(__('List Characters', true), array('controller' => 'characters', 'action' => 'index')); ?> </li>
-               <li><?php echo $html->link(__('List Profiles', true), array('controller' => 'profiles', 'action' => 'index')); ?> </li>
-               <li><?php echo $html->link(__('New Profile', true), array('controller' => 'profiles', 'action' => 'add')); ?> </li>
-       </ul>
+<ul>
+<li><?php echo $html->link(__('New System', true), array('action' => 'add')); ?></li>
+<li><?php echo $html->link(__('List Characters', true), array('controller' => 'characters', 'action' => 'index')); ?> </li>
+<li><?php echo $html->link(__('List Profiles', true), array('controller' => 'profiles', 'action' => 'index')); ?> </li>
+<li><?php echo $html->link(__('New Profile', true), array('controller' => 'profiles', 'action' => 'add')); ?> </li>
+</ul>
 </div>
index db992c6..a2f7a45 100644 (file)
@@ -9,11 +9,11 @@
        <?php __('Image'); ?>
 </th>
 <td colspan="3" class="photo">
-       <?php if ($system['System']['url']): ?>
-               <?php echo $html->link('<img src="'.$system['System']['image_filename'].'" alt="system imagefile">', $system['System']['url'], array('target'=>'_blank'), false, false); ?>
-       <?php else: ?>
-               <?php echo '<img src="'.$system['System']['image_filename'].'" alt="system imagefile">'; ?>
-       <?php endif; ?>
+<?php if ($system['System']['url']): ?>
+       <?php echo $html->link('<img src="'.$system['System']['image_filename'].'" alt="system imagefile">', $system['System']['url'], array('target'=>'_blank'), false, false); ?>
+<?php else: ?>
+       <?php echo '<img src="'.$system['System']['image_filename'].'" alt="system imagefile">'; ?>
+<?php endif; ?>
 </td>
 </tr>
 <tr>
        <?php __('URL'); ?>
 </th>
 <td colspan="3">
-       <?php if ($system['System']['url']): ?>
-               <?php echo $html->link($system['System']['url'], $system['System']['url'], array('target'=>'_blank'), false, false); ?>
-       <?php else: ?>
-               &nbsp;
-       <?php endif; ?>
+<?php if ($system['System']['url']): ?>
+       <?php echo $html->link($system['System']['url'], $system['System']['url'], array('target'=>'_blank'), false, false); ?>
+<?php else: ?>
+       &nbsp;
+<?php endif; ?>
 </td>
 </tr>
 <tr>
        <?php __('Use NPC Setting'); ?>
 </th>
 <td>
-       <?php if ($system['System']['set_npc']): ?>
-               <?php echo __('Use', true) ?>
-       <?php else: ?>
-               <?php echo __('No Use', true) ?>
-       <?php endif; ?>
+<?php if ($system['System']['set_npc']): ?>
+       <?php echo __('Use', true) ?>
+<?php else: ?>
+       <?php echo __('No Use', true) ?>
+<?php endif; ?>
 </td>
 </tr>
 <tr>
 </p>
 
 <div class="actions">
-       <ul>
-               <li><?php echo $html->link(__('Edit System', true), array('action' => 'edit', $system['System']['id'])); ?> </li>
-               <li><?php echo $html->link(__('Delete System', true), array('action' => 'delete', $system['System']['id']), null, sprintf(__('Are you sure you want to delete %s?', true), $system['System']['name'])); ?> </li>
-               <li><?php echo $html->link(__('List Systems', true), array('action' => 'index')); ?> </li>
-       </ul>
+<ul>
+<li><?php echo $html->link(__('Edit System', true), array('action' => 'edit', $system['System']['id'])); ?> </li>
+<li><?php echo $html->link(__('Delete System', true), array('action' => 'delete', $system['System']['id']), null, sprintf(__('Are you sure you want to delete %s?', true), $system['System']['name'])); ?> </li>
+<li><?php echo $html->link(__('List Systems', true), array('action' => 'index')); ?> </li>
+</ul>
 </div>
 
 <hr>
@@ -74,9 +74,9 @@
 <h2><?php __('Profiles');?></h2>
 <p>
 <div class="actions">
-       <ul>
-               <li><?php echo $html->link(__('New Profile', true), array('controller' => 'profiles', 'action' => 'add', $system['System']['id'])); ?></li>
-       </ul>
+<ul>
+<li><?php echo $html->link(__('New Profile', true), array('controller' => 'profiles', 'action' => 'add', $system['System']['id'])); ?></li>
+</ul>
 </div>
 </p>
 <p>
index 920a2b2..94b1ee2 100644 (file)
@@ -13,33 +13,34 @@ echo $paginator->counter(array(
        <th><?php echo __('Detail', true);?></th>
 </tr>
 <?php
-$i = 0;
-foreach ($systems as $system):
-       $class = null;
-       if ($i++ % 2 == 0) {
-               $class = ' class="altrow"';
-       }
+       $i = 0;
+       foreach ($systems as $system):
+               $class = null;
+               if ($i++ % 2 == 0) {
+                       $class = ' class="altrow"';
+               }
 ?>
-       <tr<?php echo $class;?>>
-               <td>
-                       <?php if ($system['System']['url']): ?>
-                       <a href="<?php $system['System']['url']; ?>" target="_blank">
-                       <?php endif; ?>
-                       <img src="<?php echo $system['System']['image_filename']; ?>" alt="system imagefile">
-                       <?php if ($system['System']['url']): ?>
-                       </a>
-                       <?php endif; ?>
-                       <?php echo $html->link($system['System']['name'], array('action' => 'view', $system['System']['id'])); ?>
-               </td>
-               <td>
-                       <?php echo $system['System']['detail']; ?>
-               </td>
-       </tr>
+<tr<?php echo $class;?>>
+<td>
+<?php if ($system['System']['url']): ?>
+       <a href="<?php $system['System']['url']; ?>" target="_blank">
+<?php endif; ?>
+       <img src="<?php echo $system['System']['image_filename']; ?>" alt="system imagefile">
+<?php if ($system['System']['url']): ?>
+       </a>
+<?php endif; ?>
+       <?php echo $html->link($system['System']['name'], array('action' => 'view', $system['System']['id'])); ?>
+</td>
+<td>
+       <?php echo $system['System']['detail']; ?>
+</td>
+</tr>
 <?php endforeach; ?>
 </table>
 </div>
+
 <div class="paging">
-       <?php echo $paginator->prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?>
- |     <?php echo $paginator->numbers();?>
-       <?php echo $paginator->next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?>
+<?php echo $paginator->prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?>
+ | <?php echo $paginator->numbers();?>
+<?php echo $paginator->next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?>
 </div>
index 0cc52b8..a69bd77 100644 (file)
@@ -8,11 +8,18 @@
        <?php __('Image'); ?>
 </th>
 <td colspan="3" class="photo">
-       <?php if ($system['System']['url']): ?>
-               <?php echo $html->link('<img src="'.$system['System']['image_filename'].'" alt="system imagefile">', $system['System']['url'], array('target'=>'_blank'), false, false); ?>
-       <?php else: ?>
-               <?php echo '<img src="'.$system['System']['image_filename'].'" alt="system imagefile">'; ?>
-       <?php endif; ?>
+<?php
+       if ($system['System']['url']) {
+               echo $html->link(
+                       '<img src="'.$system['System']['image_filename'].'" alt="system imagefile">', 
+                       $system['System']['url'], array('target'=>'_blank'), 
+                       false, 
+                       false
+               );
+       } else {
+               echo '<img src="'.$system['System']['image_filename'].'" alt="system imagefile">';
+       }
+?>
 </td>
 </tr>
 <tr>
        <?php __('URL'); ?>
 </th>
 <td colspan="3">
-       <?php if ($system['System']['url']): ?>
-               <?php echo $html->link($system['System']['url'], $system['System']['url'], array('target'=>'_blank'), false, false); ?>
-       <?php else: ?>
-               &nbsp;
-       <?php endif; ?>
+<?php if ($system['System']['url']): ?>
+       <?php echo $html->link($system['System']['url'], $system['System']['url'], array('target'=>'_blank'), false, false); ?>
+<?php else: ?>
+       &nbsp;
+<?php endif; ?>
 </td>
 </tr>
 <tr>
@@ -40,9 +47,9 @@
 </table>
 </div>
 <div class="actions">
-       <ul>
-               <li><?php echo $html->link(__('List Systems', true), array('action' => 'index')); ?> </li>
-       </ul>
+<ul>
+<li><?php echo $html->link(__('List Systems', true), array('action' => 'index')); ?> </li>
+</ul>
 </div>
 </p>
 
 </th>
 </tr>
 <?php
-$i = 0;
-foreach ($system['Profile'] as $profile):
-       $class = null;
-       $profiledisp->set_profile_type4view($profile);
+       $i = 0;
+       foreach ($system['Profile'] as $profile):
+               $class = null;
+               $profiledisp->set_profile_type4view($profile);
 ?>
 <tr>
 <td>
index 7ea1a86..3446adc 100644 (file)
@@ -1,33 +1,30 @@
 <div class="users form">
 <?php echo $form->create('User');?>
-       <fieldset>
-               <legend><?php __('Add User');?></legend>
-       <?php
-               echo $form->input('name', array(
-                               'label' => __('YourName', true),
-                       )
-               );
-               echo $form->input('username', array(
-                               'label' => __('UserId', true),
-                               'maxlength' => $idLength['max'],
-                               'after' => $html->tag(
-                                       'div',
-                                       sprintf(__('Between %d to %d characters', true), $idLength['min'], $idLength['max']),
-                                       array('class' => 'attention')
-                               )
-                       )
-               );
-               echo $form->input('password1', array(
-                               'type' => 'password',
-                               'label' => __('Password', true),
-                               'maxlength' => $passwordLength['max'],
-                               'after' => $html->tag(
-                                       'div',
-                                       sprintf(__('Between %d to %d characters', true), $passwordLength['min'], $passwordLength['max']),
-                                       array('class' => 'attention')
-                               )
-                       )
-               );
+<fieldset>
+<legend><?php __('Add User');?></legend>
+<?php
+       echo $form->input('name', array(
+               'label' => __('YourName', true),
+       ));
+       echo $form->input('username', array(
+               'label' => __('UserId', true),
+               'maxlength' => $idLength['max'],
+               'after' => $html->tag(
+               'div',
+                       sprintf(__('Between %d to %d characters', true), $idLength['min'], $idLength['max']),
+                       array('class' => 'attention')
+               )
+       ));
+       echo $form->input('password1', array(
+               'type' => 'password',
+               'label' => __('Password', true),
+               'maxlength' => $passwordLength['max'],
+               'after' => $html->tag(
+               'div',
+                       sprintf(__('Between %d to %d characters', true), $passwordLength['min'], $passwordLength['max']),
+                       array('class' => 'attention')
+               )
+       ));
                echo $form->input('password2', array(
                                'type' => 'password',
                                'label' => __('Password [confirm]', true),
 
 <div class="backButton">
 <?php
-echo $form->create('', array('url' => array(
-       'action' => 'index'), 
-       'type' => 'GET',
-       'id' => 'CancelButton'));
-echo $form->end('Cancel');
+       echo $form->create('', array('url' => array(
+               'action' => 'index'), 
+               'type' => 'GET',
+               'id' => 'CancelButton'));
+       echo $form->end('Cancel');
 ?>
 </div>
 
index 57f7442..d0baff5 100644 (file)
@@ -1,56 +1,51 @@
 <div class="users form">
 <?php echo $form->create('User');?>
-       <fieldset>
-               <legend><?php __('Add User');?></legend>
-       <?php
-               echo $form->input('name', array(
-                               'label' => __('YourName', true),
-                       )
-               );
-               echo $form->input('username', array(
-                               'label' => __('UserId', true),
-                               'maxlength' => $idLength['max'],
-                               'after' => $html->tag(
-                                       'div',
-                                       sprintf(__('Between %d to %d characters', true), $idLength['min'], $idLength['max']),
-                                       array('class' => 'attention')
-                               )
-                       )
-               );
-               echo $form->input('group_id', array(
-                               'label' => __('GroupId', true),
-                       )
-               );
-               echo $form->input('password1', array(
-                               'type' => 'password',
-                               'label' => __('Password', true),
-                               'maxlength' => $passwordLength['max'],
-                               'after' => $html->tag(
-                                       'div',
-                                       sprintf(__('Between %d to %d characters', true), $passwordLength['min'], $passwordLength['max']),
-                                       array('class' => 'attention')
-                               )
-                       )
-               );
-               echo $form->input('password2', array(
-                               'type' => 'password',
-                               'label' => __('Password [confirm]', true),
-                               'maxlength' => $passwordLength['max'],
-                       )
-               );
-               echo $token->create();
-       ?>
-       </fieldset>
+<fieldset>
+<legend><?php __('Add User');?></legend>
+<?php
+       echo $form->input('name', array(
+               'label' => __('YourName', true),
+       ));
+       echo $form->input('username', array(
+               'label' => __('UserId', true),
+               'maxlength' => $idLength['max'],
+               'after' => $html->tag(
+               'div',
+                       sprintf(__('Between %d to %d characters', true), $idLength['min'], $idLength['max']),
+                       array('class' => 'attention')
+               )
+       ));
+       echo $form->input('group_id', array(
+                       'label' => __('GroupId', true),
+       ));
+       echo $form->input('password1', array(
+               'type' => 'password',
+               'label' => __('Password', true),
+               'maxlength' => $passwordLength['max'],
+               'after' => $html->tag(
+               'div',
+                       sprintf(__('Between %d to %d characters', true), $passwordLength['min'], $passwordLength['max']),
+                       array('class' => 'attention')
+               )
+       ));
+       echo $form->input('password2', array(
+               'type' => 'password',
+               'label' => __('Password [confirm]', true),
+               'maxlength' => $passwordLength['max'],
+       ));
+       echo $token->create();
+?>
+</fieldset>
 <?php echo $form->end('Submit');?>
 </div>
 
 <div class="backButton">
 <?php
-echo $form->create('', array('url' => array(
-       'controller' => 'users', 'action' => 'admin_view', $this->data['User']['id']),
-       'type' => 'GET',
-       'id' => 'CancelButton'
-));
-echo $form->end('Cancel');
+       echo $form->create('', array('url' => array(
+               'controller' => 'users', 'action' => 'admin_view', $this->data['User']['id']),
+               'type' => 'GET',
+               'id' => 'CancelButton'
+       ));
+       echo $form->end('Cancel');
 ?>
 </div>
index 8ad6481..7c327b6 100644 (file)
@@ -1,38 +1,36 @@
 <div class="users form">
 <?php echo $form->create('User', array('action'=>'change_password/'));?>
-       <fieldset>
-               <legend><?php __('Change Password');?></legend>
-       <?php
-               echo $form->input('password1', array(
-                               'type' => 'password',
-                               'label' => __('New Password', true),
-                               'maxlength' => $passwordLength['max'],
-                               'after' => $html->tag(
-                                       'div',
-                                       sprintf(__('Between %d to %d characters', true), $passwordLength['min'], $passwordLength['max']),
-                                       array('class' => 'attention')
-                               )
-                       )
-               );
-               echo $form->input('password2', array(
-                               'type' => 'password',
-                               'label' => __('New Password [confirm]', true),
-                               'maxlength' => $passwordLength['max'],
-                       )
-               );
-               echo $token->create();
-       ?>
-       </fieldset>
+<fieldset>
+<legend><?php __('Change Password');?></legend>
+<?php
+       echo $form->input('password1', array(
+               'type' => 'password',
+               'label' => __('New Password', true),
+               'maxlength' => $passwordLength['max'],
+               'after' => $html->tag(
+               'div',
+                       sprintf(__('Between %d to %d characters', true), $passwordLength['min'], $passwordLength['max']),
+                       array('class' => 'attention')
+               )
+       ));
+       echo $form->input('password2', array(
+               'type' => 'password',
+               'label' => __('New Password [confirm]', true),
+                       'maxlength' => $passwordLength['max'],
+       ));
+       echo $token->create();
+?>
+</fieldset>
 <?php echo $form->end('Submit');?>
 </div>
 
 <div class="backButton">
 <?php
-echo $form->create('', array('url' => array(
-       'action' => 'admin_view', $this->data['User']['id']),
-       'type' => 'GET',
-       'id' => 'CancelButton'
-));
-echo $form->end('Cancel');
+       echo $form->create('', array('url' => array(
+               'action' => 'admin_view', $this->data['User']['id']),
+               'type' => 'GET',
+               'id' => 'CancelButton'
+       ));
+       echo $form->end('Cancel');
 ?>
 </div>
index 72676a4..c071bcf 100644 (file)
@@ -2,45 +2,45 @@
 
 <?php echo $form->create('User', array('action'=>'delete/'));?>
 <fieldset>
-       <legend><?php __('Do you really delete the account?');?></legend>
+<legend><?php __('Do you really delete the account?');?></legend>
 
-       <dl><?php $i = 0; $class = ' class="altrow"';?>
-               <dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Id'); ?></dt>
-               <dd<?php if ($i++ % 2 == 0) echo $class;?>>
-                       <?php echo $target_user['User']['id']; ?>
-                       &nbsp;
-               </dd>
-               <dt<?php if ($i % 2 == 0) echo $class;?>><?php __('GroupId'); ?></dt>
-               <dd<?php if ($i++ % 2 == 0) echo $class;?>>
-                       <?php echo $target_user['User']['group_id']; ?>
-                       &nbsp;
-               </dd>
-               <dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Name'); ?></dt>
-               <dd<?php if ($i++ % 2 == 0) echo $class;?>>
-                       <?php echo $target_user['User']['name']; ?>
-                       &nbsp;
-               </dd>
-               <dt<?php if ($i % 2 == 0) echo $class;?>><?php __('UserId'); ?></dt>
-               <dd<?php if ($i++ % 2 == 0) echo $class;?>>
-                       <?php echo $target_user['User']['username']; ?>
-                       &nbsp;
-               </dd>
-               <dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Created'); ?></dt>
-               <dd<?php if ($i++ % 2 == 0) echo $class;?>>
-                       <?php echo $target_user['User']['created']; ?>
-                       &nbsp;
-               </dd>
-               <dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Modified'); ?></dt>
-               <dd<?php if ($i++ % 2 == 0) echo $class;?>>
-                       <?php echo $target_user['User']['modified']; ?>
-                       &nbsp;
-               </dd>
-       </dl>
+<dl><?php $i = 0; $class = ' class="altrow"';?>
+<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Id'); ?></dt>
+<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+       <?php echo $target_user['User']['id']; ?>
+       &nbsp;
+</dd>
+<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('GroupId'); ?></dt>
+<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+       <?php echo $target_user['User']['group_id']; ?>
+       &nbsp;
+</dd>
+<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Name'); ?></dt>
+<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+       <?php echo $target_user['User']['name']; ?>
+       &nbsp;
+</dd>
+<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('UserId'); ?></dt>
+<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+       <?php echo $target_user['User']['username']; ?>
+       &nbsp;
+</dd>
+<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Created'); ?></dt>
+<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+       <?php echo $target_user['User']['created']; ?>
+       &nbsp;
+</dd>
+<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Modified'); ?></dt>
+<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+       <?php echo $target_user['User']['modified']; ?>
+       &nbsp;
+</dd>
+</dl>
 </div>
 
-       <?php
-               echo $token->create();
-       ?>
+<?php
+       echo $token->create();
+?>
 </fieldset>
 <?php echo $form->end('Submit');?>
 </div>
@@ -57,7 +57,7 @@ echo $form->end('Cancel');
 </div>
 
 <div class="actions">
-       <ul>
-               <li><?php echo $html->link(__('Back', true), array('action' => 'view', $target_user['User']['id'])); ?> </li>
-       </ul>
+<ul>
+<li><?php echo $html->link(__('Back', true), array('action' => 'view', $target_user['User']['id'])); ?> </li>
+</ul>
 </div>
index d5ee5b4..3a2369b 100644 (file)
@@ -1,30 +1,31 @@
 <div class="users form">
 <?php echo $form->create('User');?>
-       <fieldset>
-               <legend><?php __('Change Password');?></legend>
-       <?php
-               echo $form->input('id');
-               echo $form->input('username', array(
-                               'type' => 'hidden',
-                       )
-               );
-               echo $form->input('password');
-               echo $form->input('password1', array(
-                               'label' => __('New Password', true),
-                               'maxlength' => $passwordLength['max'],
-                               'after' => sprintf(__('Between %d to %d characters', true), $passwordLength['min'], $passwordLength['max']),
-                               'type' => 'password',
-                       )
-               );
-               echo $form->input('password2', array(
-                               'label' => __('New Password [confirm]', true),
-                               'maxlength' => $passwordLength['max'],
-                               'type' => 'password',
-                       )
-               );
-       ?>
-       </fieldset>
+<fieldset>
+<legend><?php __('Change Password');?></legend>
+<?php
+       echo $form->input('id');
+       echo $form->input('username', array(
+                       'type' => 'hidden',
+               )
+       );
+       echo $form->input('password');
+       echo $form->input('password1', array(
+                       'label' => __('New Password', true),
+                       'maxlength' => $passwordLength['max'],
+                       'after' => sprintf(__('Between %d to %d characters', true), $passwordLength['min'], $passwordLength['max']),
+                       'type' => 'password',
+               )
+       );
+       echo $form->input('password2', array(
+                       'label' => __('New Password [confirm]', true),
+                       'maxlength' => $passwordLength['max'],
+                       'type' => 'password',
+               )
+       );
+?>
+</fieldset>
 <?php echo $form->end('Submit');?>
+</div>
 
 <div class="backButton">
 <?php
@@ -37,4 +38,3 @@ echo $form->end('Cancel');
 ?>
 </div>
 
-</div>
index c60644b..b734324 100644 (file)
@@ -39,38 +39,38 @@ foreach ($users as $user):
                $class = ' class="altrow"';
        }
 ?>
-       <tr<?php echo $class;?>>
-               <td>
-                       <?php echo $user['User']['id']; ?>
-               </td>
-               <td>
-                       <?php echo $html->link($user['User']['name'], array('action' => 'view', $user['User']['id']), array(), false, false); ?>
-               </td>
-               <td>
-                       <?php echo $user['User']['group_id']; ?>
-               </td>
-               <td>
-                       <?php echo $user['User']['modified']; ?>
-               </td>
-               <td>
-                       <?php echo $user['User']['username']; ?>
-               </td>
-               <td>
-                       <?php echo $user['User']['pcmail']; ?>
-               </td>
-               <td>
-                       <?php echo $user['User']['mobile_mail']; ?>
-               </td>
-               <td>
-                       <?php echo $user['User']['created']; ?>
-               </td>
-               <td>
-                       <?php echo $user['User']['useragent']; ?>
-               </td>
-               <td>
-                       <?php echo $user['User']['host']; ?>
-               </td>
-       </tr>
+<tr<?php echo $class;?>>
+<td>
+       <?php echo $user['User']['id']; ?>
+</td>
+<td>
+       <?php echo $html->link($user['User']['name'], array('action' => 'view', $user['User']['id']), array(), false, false); ?>
+</td>
+<td>
+       <?php echo $user['User']['group_id']; ?>
+</td>
+<td>
+       <?php echo $user['User']['modified']; ?>
+</td>
+<td>
+       <?php echo $user['User']['username']; ?>
+</td>
+<td>
+       <?php echo $user['User']['pcmail']; ?>
+</td>
+<td>
+       <?php echo $user['User']['mobile_mail']; ?>
+</td>
+<td>
+       <?php echo $user['User']['created']; ?>
+</td>
+<td>
+       <?php echo $user['User']['useragent']; ?>
+</td>
+<td>
+       <?php echo $user['User']['host']; ?>
+</td>
+</tr>
 <?php endforeach; ?>
 </table>
 </div>
index 1b71c2c..1ad0826 100644 (file)
@@ -1,61 +1,61 @@
 <div class="users view">
 <h2><?php  __('User');?></h2>
-       <dl><?php $i = 0; $class = ' class="altrow"';?>
-               <dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Id'); ?></dt>
-               <dd<?php if ($i++ % 2 == 0) echo $class;?>>
-                       <?php echo $target_user['User']['id']; ?>
-                       &nbsp;
-               </dd>
-               <dt<?php if ($i % 2 == 0) echo $class;?>><?php __('GroupId'); ?></dt>
-               <dd<?php if ($i++ % 2 == 0) echo $class;?>>
-                       <?php echo $target_user['User']['group_id']; ?>
-                       &nbsp;
-               </dd>
-               <dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Name'); ?></dt>
-               <dd<?php if ($i++ % 2 == 0) echo $class;?>>
-                       <?php echo $target_user['User']['name']; ?>
-                       &nbsp;
-               </dd>
-               <dt<?php if ($i % 2 == 0) echo $class;?>><?php __('UserId'); ?></dt>
-               <dd<?php if ($i++ % 2 == 0) echo $class;?>>
-                       <?php echo $target_user['User']['username']; ?>
-                       &nbsp;
-               </dd>
-               <dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Pc Mail Address'); ?></dt>
-               <dd<?php if ($i++ % 2 == 0) echo $class;?>>
-                       <?php echo $target_user['User']['pcmail']; ?>
-                       &nbsp;
-               </dd>
-               <dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Mobile Mail Address'); ?></dt>
-               <dd<?php if ($i++ % 2 == 0) echo $class;?>>
-                       <?php echo $target_user['User']['mobile_mail']; ?>
-                       &nbsp;
-               </dd>
-               <dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Useragent'); ?></dt>
-               <dd<?php if ($i++ % 2 == 0) echo $class;?>>
-                       <?php echo $target_user['User']['useragent']; ?>
-                       &nbsp;
-               </dd>
-               <dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Host'); ?></dt>
-               <dd<?php if ($i++ % 2 == 0) echo $class;?>>
-                       <?php echo $target_user['User']['host']; ?>
-                       &nbsp;
-               </dd>
-               <dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Created'); ?></dt>
-               <dd<?php if ($i++ % 2 == 0) echo $class;?>>
-                       <?php echo $target_user['User']['created']; ?>
-                       &nbsp;
-               </dd>
-               <dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Modified'); ?></dt>
-               <dd<?php if ($i++ % 2 == 0) echo $class;?>>
-                       <?php echo $target_user['User']['modified']; ?>
-                       &nbsp;
-               </dd>
-       </dl>
+<dl><?php $i = 0; $class = ' class="altrow"';?>
+<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Id'); ?></dt>
+<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+       <?php echo $target_user['User']['id']; ?>
+               &nbsp;
+</dd>
+<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('GroupId'); ?></dt>
+<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+       <?php echo $target_user['User']['group_id']; ?>
+       &nbsp;
+</dd>
+<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Name'); ?></dt>
+<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+       <?php echo $target_user['User']['name']; ?>
+       &nbsp;
+</dd>
+<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('UserId'); ?></dt>
+<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+       <?php echo $target_user['User']['username']; ?>
+       &nbsp;
+</dd>
+<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Pc Mail Address'); ?></dt>
+<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+       <?php echo $target_user['User']['pcmail']; ?>
+       &nbsp;
+</dd>
+<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Mobile Mail Address'); ?></dt>
+<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+       <?php echo $target_user['User']['mobile_mail']; ?>
+       &nbsp;
+</dd>
+<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Useragent'); ?></dt>
+<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+       <?php echo $target_user['User']['useragent']; ?>
+       &nbsp;
+</dd>
+<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Host'); ?></dt>
+<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+       <?php echo $target_user['User']['host']; ?>
+       &nbsp;
+</dd>
+<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Created'); ?></dt>
+<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+       <?php echo $target_user['User']['created']; ?>
+       &nbsp;
+</dd>
+<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Modified'); ?></dt>
+<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+       <?php echo $target_user['User']['modified']; ?>
+       &nbsp;
+</dd>
+</dl>
 </div>
 <div class="actions">
-       <ul>
-               <li><?php echo $html->link(__('Change Password', true), array('action' => 'change_password', $target_user['User']['id'])); ?> </li>
-               <li><?php echo $html->link(__('Delete User', true), array('action' => 'delete', $target_user['User']['id'])); ?> </li>
-       </ul>
+<ul>
+<li><?php echo $html->link(__('Change Password', true), array('action' => 'change_password', $target_user['User']['id'])); ?> </li>
+<li><?php echo $html->link(__('Delete User', true), array('action' => 'delete', $target_user['User']['id'])); ?> </li>
+</ul>
 </div>
index 4572f3b..b8157b5 100644 (file)
@@ -1,43 +1,43 @@
 <div class="users form">
 <?php echo $form->create('User', array('action'=>'change_password/'));?>
-       <fieldset>
-               <legend><?php __('Change Password');?></legend>
-       <?php
-               echo $form->input('password', array(
-                               'label' => __('Old Password', true),
-                               'maxlength' => $passwordLength['max'],
-                               'type' => 'password',
-                       )
-               );
-               echo $form->input('password1', array(
-                               'label' => __('New Password', true),
-                               'maxlength' => $passwordLength['max'],
-                               'after' => $html->tag(
-                                       'div',
-                                       sprintf(__('Between %d to %d characters', true), $passwordLength['min'], $passwordLength['max'])
-                               ),
-                               'type' => 'password',
-                       )
-               );
-               echo $form->input('password2', array(
-                               'label' => __('New Password [confirm]', true),
-                               'maxlength' => $passwordLength['max'],
-                               'type' => 'password',
-                       )
-               );
-               echo $token->create();
-       ?>
-       </fieldset>
+<fieldset>
+<legend><?php __('Change Password');?></legend>
+<?php
+       echo $form->input('password', array(
+                       'label' => __('Old Password', true),
+                       'maxlength' => $passwordLength['max'],
+                       'type' => 'password',
+               )
+       );
+       echo $form->input('password1', array(
+                       'label' => __('New Password', true),
+                       'maxlength' => $passwordLength['max'],
+                       'after' => $html->tag(
+                               'div',
+                               sprintf(__('Between %d to %d characters', true), $passwordLength['min'], $passwordLength['max'])
+                       ),
+                       'type' => 'password',
+               )
+       );
+       echo $form->input('password2', array(
+                       'label' => __('New Password [confirm]', true),
+                       'maxlength' => $passwordLength['max'],
+                       'type' => 'password',
+               )
+       );
+       echo $token->create();
+?>
+</fieldset>
 <?php echo $form->end('Submit');?>
 </div>
 
 <div class="backButton">
 <?php
-echo $form->create('', array('url' => array(
-       'action' => 'view', $this->data['User']['id']),
-       'type' => 'GET',
-       'id' => 'CancelButton'
-));
-echo $form->end('Cancel');
+       echo $form->create('', array('url' => array(
+               'action' => 'view', $this->data['User']['id']),
+               'type' => 'GET',
+               'id' => 'CancelButton'
+       ));
+       echo $form->end('Cancel');
 ?>
 </div>
index 72ccf91..1d33996 100644 (file)
@@ -1,16 +1,16 @@
 <div class="users form">
 <?php echo $form->create('User', array('action'=>'delete/'));?>
-       <fieldset>
-               <legend><?php __('Do you really delete your account?');?></legend>
-       <?php
-               echo $html->div('caution', __('Please input your password, if you want to delete your account.', true));
-               echo $form->input('password', array(
-                               'type' => 'password',
-                       )
-               );
-               echo $token->create();
-       ?>
-       </fieldset>
+<fieldset>
+<legend><?php __('Do you really delete your account?');?></legend>
+<?php
+       echo $html->div('caution', __('Please input your password, if you want to delete your account.', true));
+       echo $form->input('password', array(
+                       'type' => 'password',
+               )
+       );
+       echo $token->create();
+?>
+</fieldset>
 <?php echo $form->end('Submit');?>
 </div>
 
index 3e8f472..4fd23bf 100644 (file)
@@ -1,15 +1,15 @@
 <div class="users form">
 <?php echo $form->create('User');?>
-       <fieldset>
-               <legend><?php __('Edit User');?></legend>
-       <?php
-               echo $form->input('name', array(
-                               'label' => __('YourName', true),
-                       )
-               );
-               echo $token->create();
-       ?>
-       </fieldset>
+<fieldset>
+<legend><?php __('Edit User');?></legend>
+<?php
+       echo $form->input('name', array(
+                       'label' => __('YourName', true),
+               )
+       );
+       echo $token->create();
+?>
+</fieldset>
 <?php echo $form->end('Submit');?>
 </div>
 
index 131dd62..921ad53 100644 (file)
@@ -1,7 +1,5 @@
 <?php 
-echo $this->renderElement('home',
-               array(
-                       'user' => $user,
-                       'owner' => true,
-               )
-       );
\ No newline at end of file
+echo $this->renderElement('home', array(
+       'user' => $user,
+       'owner' => true,
+       ));
index a3e9192..7def8d9 100644 (file)
@@ -2,47 +2,47 @@
 <h2><?php __('Users');?> <?php __('List');?></h2>
 <p>
 <?php
-echo $paginator->counter(array(
-'format' => __('Page %page% of %pages%, showing %current% records out of %count% total, starting on record %start%, ending on %end%', true)
-));
+       echo $paginator->counter(array(
+               'format' => __('Page %page% of %pages%, showing %current% records out of %count% total, starting on record %start%, ending on %end%', true)
+       ));
 ?></p>
 
 <div class="paging">
        <?php echo $paginator->prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?>
|     <?php echo $paginator->numbers();?>
       | <?php echo $paginator->numbers();?>
        <?php echo $paginator->next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?>
 </div>
 
 <table>
 <tr>
-       <th><?php echo $paginator->sort('id');?></th>
-       <th><?php echo $paginator->sort('name');?></th>
-       <th><?php echo $paginator->sort('modified');?></th>
+<th><?php echo $paginator->sort('id');?></th>
+<th><?php echo $paginator->sort('name');?></th>
+<th><?php echo $paginator->sort('modified');?></th>
 </tr>
 <?php
-$i = 0;
-foreach ($users as $user):
-       $class = null;
-       if ($i++ % 2 == 0) {
+       $i = 0;
+       foreach ($users as $user):
+               $class = null;
+               if ($i++ % 2 == 0) {
                $class = ' class="altrow"';
        }
 ?>
-       <tr<?php echo $class;?>>
-               <td>
-                       <?php echo $user['User']['id']; ?>
-               </td>
-               <td>
-                       <?php echo $html->link($user['User']['name'], array('action' => 'view', $user['User']['id']), array(), false, false); ?>
-               </td>
-               <td>
-                       <?php echo $user['User']['modified']; ?>
-               </td>
-       </tr>
+<tr<?php echo $class;?>>
+<td>
+<?php echo $user['User']['id']; ?>
+</td>
+<td>
+       <?php echo $html->link($user['User']['name'], array('action' => 'view', $user['User']['id']), array(), false, false); ?>
+</td>
+<td>
+       <?php echo $user['User']['modified']; ?>
+</td>
+</tr>
 <?php endforeach; ?>
 </table>
 </div>
 <div class="paging">
        <?php echo $paginator->prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?>
|     <?php echo $paginator->numbers();?>
       | <?php echo $paginator->numbers();?>
        <?php echo $paginator->next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?>
 </div>
index ed425b3..668bb5a 100644 (file)
@@ -1,7 +1,5 @@
 <?php 
-echo $form->create('User', array('action' => 'login'));
-echo $form->input('username');
-echo $form->input('password');
-echo $form->end('Login');
-
-
+       echo $form->create('User', array('action' => 'login'));
+       echo $form->input('username');
+       echo $form->input('password');
+       echo $form->end('Login');
index 64e04b0..f84cac6 100644 (file)
@@ -3,33 +3,30 @@
 <fieldset>
 <legend><?php __('Add User');?></legend>
 <?php
-echo $form->input('name', array(
-'label' => __('YourName', true),
-)
-);
-echo $form->input('username', array(
-'label' => __('UserId', true),
-'maxlength' => $idLength['max'],
-'after' => sprintf(__('Between %d to %d characters', true), $idLength['min'], $idLength['max']),
-)
-);
-echo $form->input('password1', array(
-'label' => __('Password', true),
-'maxlength' => $passwordLength['max'],
-'after' => sprintf(__('Between %d to %d characters', true), $passwordLength['min'], $passwordLength['max']),
-'type' => 'password',
-)
-);
-echo $form->input('password2', array(
-'label' => __('Password [confirm]', true),
-'maxlength' => $passwordLength['max'],
-'type' => 'password',
-)
-);
+       echo $form->input('name', array(
+               'label' => __('YourName', true),
+       ));
+       echo $form->input('username', array(
+               'label' => __('UserId', true),
+               'maxlength' => $idLength['max'],
+               'after' => sprintf(__('Between %d to %d characters', true), $idLength['min'], $idLength['max']),
+       ));
+       echo $form->input('password1', array(
+               'label' => __('Password', true),
+               'maxlength' => $passwordLength['max'],
+               'after' => sprintf(__('Between %d to %d characters', true), $passwordLength['min'], $passwordLength['max']),
+               'type' => 'password',
+       ));
+       echo $form->input('password2', array(
+               'label' => __('Password [confirm]', true),
+               'maxlength' => $passwordLength['max'],
+               'type' => 'password',
+       ));
 ?>
 </fieldset>
 <?php echo $form->end('Submit');?>
 </div>
+
 <div class="actions">
 <ul>
 <li><?php echo $html->link(__('List Users', true), array('action' => 'mobile_index'));?></li>
index 7d28e05..e0bdc04 100644 (file)
@@ -3,30 +3,30 @@
 <fieldset>
 <legend><?php __('Change Password');?></legend>
 <?php
-echo $form->input('password', array(
-'label' => __('Old Password', true),
-'maxlength' => $passwordLength['max'],
-'type' => 'password',
-)
-);
-echo $form->input('password1', array(
-'label' => __('New Password', true),
-'maxlength' => $passwordLength['max'],
-'after' => sprintf(__('Between %d to %d characters', true), $passwordLength['min'], $passwordLength['max']),
-'type' => 'password',
-)
-);
-echo $form->input('password2', array(
-'label' => __('New Password [confirm]', true),
-'maxlength' => $passwordLength['max'],
-'type' => 'password',
-)
-echo $token->create();
+       echo $form->input('password', array(
+               'label' => __('Old Password', true),
+               'maxlength' => $passwordLength['max'],
+               'type' => 'password',
+       ));
+       echo $form->input('password1', array(
+               'label' => __('New Password', true),
+               'maxlength' => $passwordLength['max'],
+               'after' => sprintf(__('Between %d to %d characters', true), $passwordLength['min'], $passwordLength['max']),
+               'type' => 'password',
+       ));
+       echo $form->input('password2', array(
+               'label' => __('New Password [confirm]', true),
+               'maxlength' => $passwordLength['max'],
+               'type' => 'password',
+       );
+
+       echo $token->create();
 );
 ?>
 </fieldset>
 <?php echo $form->end('Submit');?>
 </div>
+
 <div class="actions">
 <ul>
 <li><?php echo $html->link(__('List Users', true), array('action' => 'mobile_listview'));?></li>
index 21b03f8..4f98858 100644 (file)
@@ -1,14 +1,16 @@
 <div class="users form">
 <h3><?php echo _=('Do you really delete your account?', true) ?></h3>
-<?php echo __('Please input your password, if you want to delete your account.', true) ?>
-<?php echo $form->create('User', array('action'=>'delete/'));?>
+<?php
+       echo __('Please input your password, if you want to delete your account.', true);
+       echo $form->create('User', array('action'=>'delete/'));
+?>
 <fieldset>
 <?php
-echo $form->input('password', array(
-'type' => 'password',
-)
-);
-echo $token->create();
+       echo $form->input('password', array(
+               'type' => 'password',
+       ));
+
+       echo $token->create();
 ?>
 </fieldset>
 <?php echo $form->end('Submit');?>
index bdb2af7..5a5efd5 100644 (file)
@@ -3,14 +3,15 @@
 <fieldset>
 <legend><?php __('Edit User');?></legend>
 <?php
-echo $form->input('name', array(
-'label' => __('YourName', true),
-)
-);
-echo $token->create();
+       echo $form->input('name', array(
+               'label' => __('YourName', true),
+       ));
+
+       echo $token->create();
 ?>
 </fieldset>
 <?php echo $form->end('Submit');?>
 </div>
+
 <div class="actions">
 </div>
index 9b7ffe0..a879caf 100644 (file)
@@ -1,7 +1,5 @@
 <?php 
-echo $this->renderElement('mobile_home',
-               array(
-                       'user' => $user,
-                       'owner' => true,
-               )
-       );
\ No newline at end of file
+echo $this->renderElement('mobile_home', array(
+       'user' => $user,
+       'owner' => true,
+       ));
index 444e8bd..4752126 100644 (file)
@@ -2,10 +2,11 @@
 <h2><?php __('Users');?> <?php __('List');?></h2>
 <p>
 <?php
-echo $paginator->counter(array(
-'format' => __('Page %page% of %pages%, showing %current% records out of %count% total, starting on record %start%, ending on %end%', true)
-));
-?></p>
+       echo $paginator->counter(array(
+               'format' => __('Page %page% of %pages%, showing %current% records out of %count% total, starting on record %start%, ending on %end%', true)
+       ));
+?>
+</p>
 <div class="paging">
 <?php echo $paginator->prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?>
  | <?php echo $paginator->numbers();?>
@@ -19,12 +20,12 @@ echo $paginator->counter(array(
 <th><?php echo $paginator->sort('modified');?></th>
 </tr>
 <?php
-$i = 0;
-foreach ($users as $user):
-$class = null;
-if ($i++ % 2 == 0) {
-$class = ' class="altrow"';
-}
+       $i = 0;
+       foreach ($users as $user):
+               $class = null;
+               if ($i++ % 2 == 0) {
+                       $class = ' class="altrow"';
+               }
 ?>
 <tr<?php echo $class;?>>
 <td>
index 1511a94..17b3fb0 100644 (file)
@@ -1,7 +1,6 @@
 <?php 
-echo $form->create('User', array('action' => 'mobile_login'));
-echo $form->input('username');
-echo $form->input('password');
-echo $form->end('Login');
-
+       echo $form->create('User', array('action' => 'mobile_login'));
+       echo $form->input('username');
+       echo $form->input('password');
+       echo $form->end('Login');
 
index 864acc6..f159859 100644 (file)
@@ -1,7 +1,5 @@
 <?php 
-echo $this->renderElement('mobile_home',
-               array(
-                       'user' => $user,
-                       'owner' => false,
-               )
-       );
\ No newline at end of file
+echo $this->renderElement('mobile_home', array(
+       'user' => $user,
+       'owner' => false,
+       ));
index a45b3b1..2d49718 100644 (file)
@@ -1,8 +1,8 @@
 <h4><?php echo sprintf(__('If you can not automatically move in %d seconds, please click.', true), $refresh['time']);?></h4>
 
 <div class="actions">
-       <ul>
-               <li><?php echo $html->link(__('Login', true), array('action' => 'login')); ?></li>
-       </ul>
+<ul>
+<li><?php echo $html->link(__('Login', true), array('action' => 'login')); ?></li>
+</ul>
 </div>
 
index 6cf6b5d..3de75a5 100644 (file)
@@ -1,7 +1,5 @@
 <?php 
-echo $this->renderElement('home',
-               array(
-                       'user' => $user,
-                       'owner' => false,
-               )
-       );
\ No newline at end of file
+       echo $this->renderElement('home', array(
+               'user' => $user,
+               'owner' => false,
+       ));