- * . + * .
-beginWidget('CActiveForm', array( +beginWidget('CActiveForm', array( 'id'=>'membership-form', 'enableAjaxValidation'=>true, )); echo $form->errorSummary($model); ?>:
-isActive()) { ?> + +:
+ Yum::t('Automatically extend subscription'), 'cancel' => Yum::t('Cancel Subscription')); @@ -50,6 +50,6 @@ $data->subscribed == -1 ? 'cancel' : $data->subscribed, $options); echo CHtml::submitButton(Yum::t('Save')); ?> - - + +The Membership has been successfully created
+The Membership has been successfully created
- $relation.'_done')); ?> $relation.'_create')); + $relation.'_done')); ?> $relation.'_create')); diff --git a/membership/views/membership/update.php b/membership/views/membership/update.php index e3e8649..71a9965 100644 --- a/membership/views/membership/update.php +++ b/membership/views/membership/update.php @@ -1,13 +1,10 @@ -title = Yum::t('Memberships'); $this->breadcrumbs=array( Yum::t('Memberships')=>array('index'), Yum::t('Update'), ); -?> - -- +
-beginWidget('CActiveForm', array( +beginWidget('CActiveForm', array( 'id'=>'payment-form', 'enableAjaxValidation'=>true, )); echo $form->errorSummary($model); ?>The Payment has been successfully created
+The Payment has been successfully created
- $relation.'_done')); ?> $relation.'_create')); + $relation.'_done')); ?> $relation.'_create')); diff --git a/membership/views/payment/update.php b/membership/views/payment/update.php index 1cd770d..bd00dca 100644 --- a/membership/views/payment/update.php +++ b/membership/views/payment/update.php @@ -1,14 +1,11 @@ -title = Yum::t('Update payment type').': '.$model->title; $this->breadcrumbs=array( Yum::t('Payments')=>array('index'), $model->id=>array('view','id'=>$model->id), Yii::t('app', 'Update'), ); -?> -+
diff --git a/message/views/message/view.php b/message/views/message/view.php index a495ecb..33e1973 100644 --- a/message/views/message/view.php +++ b/message/views/message/view.php @@ -1,21 +1,21 @@ -title = $model->title; $this->breadcrumbs=array(Yum::t('Messages')=>array('index'),$model->title); ?> -
- +
-beginWidget('CActiveForm', array( +beginWidget('CActiveForm', array( 'id'=>'privacysetting-form', 'enableAjaxValidation'=>true, )); @@ -23,7 +23,7 @@ ?>' . Yum::t('Select the fields that should be public') . ':
'; $i = 1; @@ -51,29 +51,29 @@+
| getAttributeLabel('username')); ?> + | getAttributeLabel('username')); ?> | -username); ?> + | username); ?> |
|---|---|---|---|
| title)); ?> + | title)); ?> | -profile->{ucfirst($field->varname)})) echo CHtml::encode($model->profile->{ucfirst($field->varname)}->{$field->related_field_name}); ?> | |
| title)); ?> + | title)); ?> | -profile->getAttribute($field->varname)); ?> + | profile->getAttribute($field->varname)); ?> |
| getAttributeLabel('password')); ?> + | getAttributeLabel('password')); ?> | -||
| getAttributeLabel('createtime')); ?> + | getAttributeLabel('createtime')); ?> | -createtime); ?> + | createtime); ?> |
| getAttributeLabel('lastvisit')); ?> + | getAttributeLabel('lastvisit')); ?> | -lastvisit); ?> + | lastvisit); ?> |
| getAttributeLabel('status')); ?> + | getAttributeLabel('status')); ?> | -status)); + | status)); ?> |
| title); ?> | -{$field->varname}; ?> | +title); ?> | +{$field->varname}; ?> |
|---|
Fields with * are required.
- - errorSummary($model); ?> - + errorSummary($model); ?>if($model->save()) - if(isset($_GET['returnTo'])) + if(isset($_GET['returnTo'])) $this->redirect(array(urldecode($_GET['returnTo'])));@@ -78,10 +78,10 @@ It takes an array of elements that could be returned from an scope or an SQL Query. -The parentObjects can be grouped, for example, with +The parentObjects can be grouped, for example, with 'groupParentsBy' => 'city' -Use the option 'htmlOptions' to pass any html Options to the +Use the option 'htmlOptions' to pass any html Options to the Selectbox/Listbox form element. Full Example: @@ -117,7 +117,7 @@ class Relation extends CWidget // this Variable holds an instance of the related Object protected $_relatedModel; - // draw the relation of which model? + // draw the relation of which model? public $model; // which relation should be rendered? @@ -206,27 +206,27 @@ public function init() Yii::t('yii','Relation widget is not able to instantiate the given Model')); } } - else + else $this->_model = $this->model; // Instantiate Model and related Model - foreach($this->_model->relations() as $key => $value) + foreach($this->_model->relations() as $key => $value) { - if(strcmp($this->relation, $key) == 0) + if(strcmp($this->relation, $key) == 0) { // $key = Name of the Relation // $value[0] = Type of the Relation // $value[1] = Related Model // $value[2] = Related Field or Many_Many Table - switch($value[0]) + switch($value[0]) { case 'CBelongsToRelation': case 'CHasOneRelation': $this->_relatedModel = new $value[1]; - if(!isset($this->field)) + if(!isset($this->field)) { $this->field = $value[2]; - } + } break; case 'CManyManyRelation': preg_match_all('/^.*\(/', $value[2], $matches); @@ -240,13 +240,13 @@ public function init() break; } } - } + } - if(!is_object($this->_relatedModel)) + if(!is_object($this->_relatedModel)) throw new CException( Yii::t('yii','Relation widget cannot find the given Relation('.$this->relation.')')); - if(!isset($this->relatedPk) || $this->relatedPk == "") + if(!isset($this->relatedPk) || $this->relatedPk == "") { $this->relatedPk = $this->_relatedModel->tableSchema->primaryKey; } @@ -256,38 +256,38 @@ public function init() } // Check if model-value contains '.' and generate -> directives: - public function getModelData($model, $field) + public function getModelData($model, $field) { - if(strstr($field, '.')) + if(strstr($field, '.')) { $data = explode('.', $field); $value = $model->getRelated($data[0])->$data[1]; - } else + } else $value = $model->$field; return $value; } /** - * This function fetches all needed data of the related Object and returns + * This function fetches all needed data of the related Object and returns * them in an array that is prepared for use in ListData. */ - public function getRelatedData() + public function getRelatedData() { /* At first we determine, if we want to display all parent Objects, or * if the User supplied an list of Objects */ if(is_object($this->parentObjects)) // a single Element { $parentobjects = array($this->parentObjects); - } + } else if(is_array($this->parentObjects)) // Only show this elements { $parentobjects = $this->parentObjects; - } + } else // Show all Parent elements - { + { $parentobjects = CActiveRecord::model(get_class($this->_relatedModel))->findAll(); - } + } if($this->allowEmpty) if(is_string($this->allowEmpty)) @@ -295,7 +295,7 @@ public function getRelatedData() else $dataArray[0] = Yii::t('app', 'None'); - foreach($parentobjects as $obj) + foreach($parentobjects as $obj) { if(!is_array($this->fields)) $this->fields = array($this->fields); @@ -317,9 +317,9 @@ public function getRelatedData() '{id}' => $obj->{$obj->tableSchema->primaryKey}); // Look for user-contributed functions and evaluate them - if($this->functions != array()) + if($this->functions != array()) { - foreach($this->functions as $key => $function) + foreach($this->functions as $key => $function) { // If the key is of type string, it's assumed to be a named function, // used like {myFuncName}. @@ -366,14 +366,14 @@ public function getRelatedData() } } - if($this->groupParentsBy != '') + if($this->groupParentsBy != '') { $dataArray[$obj->{$this->groupParentsBy}][$obj->{$this->relatedPk}] = CHtml::encode($value); } - else + else { $dataArray[$obj->{$this->relatedPk}] = CHtml::encode($value); - } + } } if(!isset($dataArray) || !is_array($dataArray)) @@ -386,7 +386,7 @@ public function getRelatedData() /** * Retrieves the Assigned Objects of the MANY_MANY related Table */ - public function getAssignedObjects() + public function getAssignedObjects() { if($this->_model->{$this->_model->tableSchema->primaryKey}) { @@ -399,12 +399,12 @@ public function getAssignedObjects() foreach($result as $foreignObject) { $id = $foreignObject[$this->manyManyTableRight]; - $objects[$id] = $this->_relatedModel->findByPk($id); + $objects[$id] = $this->_relatedModel->findByPk($id); } } // also add assigned models that are not yet saved in the database - foreach($this->_model->{$this->relation} as $relobj) + foreach($this->_model->{$this->relation} as $relobj) if(is_object($relobj)) $objects[$relobj->id] = $relobj; else if(is_numeric($relobj)) @@ -417,11 +417,11 @@ public function getAssignedObjects() * Retrieves the not Assigned Objects of the MANY_MANY related Table * This is used in the two-pane style view. */ - public function getNotAssignedObjects() + public function getNotAssignedObjects() { - foreach($this->getRelatedData() as $key => $value) + foreach($this->getRelatedData() as $key => $value) { - if(!array_key_exists($key, $this->getAssignedObjects())) + if(!array_key_exists($key, $this->getAssignedObjects())) { $objects[$key] = $this->_relatedModel->findByPk($key); } @@ -436,7 +436,7 @@ public function getNotAssignedObjects() */ public function getObjectValues($objects) { - if(is_array($objects)) { + if(is_array($objects)) { foreach($objects as $object) { $attributeValues[$object->primaryKey] = $object->{$this->fields}; } @@ -449,57 +449,57 @@ public function getObjectValues($objects) } /* - * How will the Listbox of the MANY_MANY Assignment be called? + * How will the Listbox of the MANY_MANY Assignment be called? */ - public function getListBoxName($ajax = false) + public function getListBoxName($ajax = false) { if($ajax) { return sprintf('%s_%s', get_class($this->_model), get_class($this->_relatedModel) - ); + ); } else { return sprintf('%s[%s]', get_class($this->_model), get_class($this->_relatedModel) - ); + ); } } - public function getListBoxId() + public function getListBoxId() { return sprintf('%s_%s', get_class($this->_model), get_class($this->_relatedModel) - ); + ); } public function renderBelongsToSelection() { - if(strcasecmp($this->style, "dropDownList") == 0) + if(strcasecmp($this->style, "dropDownList") == 0) echo CHtml::ActiveDropDownList( - $this->_model, - $this->field, - $this->getRelatedData(), + $this->_model, + $this->field, + $this->getRelatedData(), $this->htmlOptions); else if(strcasecmp($this->style, "listbox") == 0) echo CHtml::ActiveListBox( - $this->_model, - $this->field, - $this->getRelatedData(), + $this->_model, + $this->field, + $this->getRelatedData(), $this->htmlOptions); else if(strcasecmp($this->style, "checkbox") == 0) echo CHtml::ActiveCheckBoxList( $this->_model, - $this->field, - $this->getRelatedData(), + $this->field, + $this->getRelatedData(), $this->htmlOptions); } public function renderManyManySelection() { - if(strcasecmp($this->style, 'twopane') == 0) + if(strcasecmp($this->style, 'twopane') == 0) $this->renderTwoPaneSelection(); else if(strcasecmp($this->style, 'checkbox') == 0) $this->renderCheckBoxListSelection(); @@ -510,7 +510,7 @@ public function renderManyManySelection() { } - /* + /* * Renders one dropDownList per selectable related Element. * The users can add additional entries with the + and remove entries * with the - Button. Once a element is selected, the same element in @@ -532,7 +532,7 @@ function remove_selection(id) { $('#option_'+id).remove(); $('#removelink_'+id).remove(); $('#".$this->getListBoxId()."').append(option); - } + } ", CClientScript::POS_HEAD); $remove_link = CHtml::image( @@ -562,11 +562,11 @@ function remove_selection(id) { "); - // before we render our dropdownlists, we need to gather
If you have changed some of the default values, you now only need to modify your config/main.php file to reflect the changes below in user module configuration:
'modules'=> array(
- $config) {
echo "'$module' => array(";
if ($module == 'user') echo "'debug' => false,";
@@ -31,6 +31,6 @@
Please change the Administrator Password to something better than
the default password.
-
diff --git a/user/views/layouts/install.php b/user/views/layouts/install.php
index ace649c..a82a83c 100644
--- a/user/views/layouts/install.php
+++ b/user/views/layouts/install.php
@@ -1,5 +1,5 @@
-
+
-
+
diff --git a/user/views/layouts/yum.php b/user/views/layouts/yum.php
index c01395a..9d4d55e 100644
--- a/user/views/layouts/yum.php
+++ b/user/views/layouts/yum.php
@@ -1,32 +1,32 @@
-clientScript->registerCssFile(
Yii::app()->getAssetManager()->publish(
- Yii::getPathOfAlias('YumModule.assets.css').'/yum.css'));
+ Yii::getPathOfAlias('YumAssets.css').'/yum.css'));
$module = Yum::module();
$this->beginContent($module->baseLayout); ?>
-debug) {
echo CHtml::openTag('div', array(
'style' => 'background-color: red;color:white;padding:5px;'));
- echo Yum::t(
- 'You are running the Yii User Management Module {version} in Debug Mode!', array(
+ echo Yum::t('You are running the Yii User Management Module {version} in Debug Mode!', array(
'{version}' => Yum::module()->version));
echo CHtml::closeTag('div');
}
?>
-title)
printf(' %s
', $this->title); ?>
-
+
-endContent(); ?>
+endContent(); ?>
diff --git a/user/views/statistics/statistics.php b/user/views/statistics/statistics.php
index 9e10d39..b48953a 100644
--- a/user/views/statistics/statistics.php
+++ b/user/views/statistics/statistics.php
@@ -1,4 +1,4 @@
-title = Yum::t('Statistics');
$this->breadcrumbs = array(
diff --git a/user/views/translation/_form.php b/user/views/translation/_form.php
index fa1ba34..36a7955 100644
--- a/user/views/translation/_form.php
+++ b/user/views/translation/_form.php
@@ -1,46 +1,46 @@
-beginWidget('CActiveForm', array(
+beginWidget('CActiveForm', array(
'id'=>'translation-form',
'enableAjaxValidation'=>true,
'enableClientValidation'=>true,
)); ?>
-
+
- errorSummary($models); ?>
+ errorSummary($models); ?>
- labelEx($models[0],'message'); ?>
- textField($models[0],'message'); ?>
- error($models[0],'message'); ?>
+ labelEx($models[0],'message'); ?>
+ textField($models[0],'message'); ?>
+ error($models[0],'message'); ?>
- labelEx($models[0],'category'); ?>
- textField($models[0],'category'); ?>
- error($models[0],'category'); ?>
+ labelEx($models[0],'category'); ?>
+ textField($models[0],'category'); ?>
+ error($models[0],'category'); ?>
-
+
- language, 'translation_'.$model->language); ?>
- language, $model->translation); ?>
+ language, 'translation_'.$model->language); ?>
+ language, $model->translation); ?>
-
+
-endWidget(); ?>
+endWidget(); ?>
diff --git a/user/views/translation/admin.php b/user/views/translation/admin.php
index a8ae700..8463c35 100644
--- a/user/views/translation/admin.php
+++ b/user/views/translation/admin.php
@@ -1,13 +1,13 @@
-breadcrumbs=array(
Yum::t('Translation')=>array('admin'),
Yum::t('Manage'),
);
?>
-
+
-widget('zii.widgets.grid.CGridView', array(
+widget('zii.widgets.grid.CGridView', array(
'id'=>'category-grid',
'dataProvider'=>$model->search(),
'filter'=>$model,
@@ -32,4 +32,4 @@
),
)); ?>
-
+
diff --git a/user/views/translation/create.php b/user/views/translation/create.php
index ec7de8a..48e11c7 100644
--- a/user/views/translation/create.php
+++ b/user/views/translation/create.php
@@ -1,4 +1,4 @@
-breadcrumbs=array(
Yum::t('Translation')=>array('index'),
Yum::t('Create'),
@@ -6,6 +6,6 @@
?>
-
+
-renderPartial('_form', array('model'=>$model)); ?>
+renderPartial('_form', array('model'=>$model)); ?>
diff --git a/user/views/translation/update.php b/user/views/translation/update.php
index 6e05e3d..22edbcd 100644
--- a/user/views/translation/update.php
+++ b/user/views/translation/update.php
@@ -1,4 +1,4 @@
-breadcrumbs=array(
Yum::t('Translation')=>array('admin'),
sprintf('%s-%s-%s',
@@ -11,7 +11,7 @@
?>
-isNewRecord)
echo Yum::t('New translation');
@@ -19,4 +19,4 @@
echo Yum::t('Update translation {message}', array(
'{message}' => $models[0]->message)); ?>
-renderPartial('_form', array('models'=>$models)); ?>
+renderPartial('_form', array('models'=>$models)); ?>
diff --git a/user/views/user/_activation_passwordform.php b/user/views/user/_activation_passwordform.php
index fb1aef1..03f51bc 100644
--- a/user/views/user/_activation_passwordform.php
+++ b/user/views/user/_activation_passwordform.php
@@ -1,22 +1,22 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
+
diff --git a/user/views/user/_form.php b/user/views/user/_form.php
index a516ed1..f3d77ac 100644
--- a/user/views/user/_form.php
+++ b/user/views/user/_form.php
@@ -1,5 +1,5 @@
-beginWidget('CActiveForm', array(
'id'=>'user-form',
@@ -7,9 +7,9 @@
?>
-
+
-
-labelEx($model, 'superuser');
+labelEx($model, 'superuser');
echo $form->dropDownList($model, 'superuser',YumUser::itemAlias('AdminStatus'));
echo $form->error($model, 'superuser'); ?>
-labelEx($model,'status');
+labelEx($model,'status');
echo $form->dropDownList($model,'status',YumUser::itemAlias('UserStatus'));
echo $form->error($model,'status'); ?>
-
-
+
- widget('YumModule.components.Relation', array(
+ widget('YumComponents.Relation', array(
'model' => $model,
'relation' => 'roles',
'style' => 'dropdownlist',
@@ -43,36 +43,36 @@
'showAddButton' => false
)); ?>
-
+
-labelEx($model, 'username');
+labelEx($model, 'username');
echo $form->textField($model, 'username');
echo $form->error($model, 'username'); ?>
- Leave password empty to
-isNewRecord
-? 'generate a random Password'
+
Leave password empty to
+isNewRecord
+? 'generate a random Password'
: 'keep it unchanged '; ?>
-renderPartial('/user/passwordfields', array(
+renderPartial('/user/passwordfields', array(
'form'=>$passwordform)); ?>
-renderPartial('application.modules.profile.views.profile._form', array(
+renderPartial('YumModulesRoot.profile.views.profile._form', array(
'profile' => $profile)); ?>
-endWidget(); ?>
+endWidget(); ?>
diff --git a/user/views/user/_miniform.php b/user/views/user/_miniform.php
index e8d780d..684d80f 100644
--- a/user/views/user/_miniform.php
+++ b/user/views/user/_miniform.php
@@ -1,5 +1,5 @@
-beginWidget('CActiveForm', array(
+beginWidget('CActiveForm', array(
'id'=>'yum-user-form',
'enableAjaxValidation'=>true,
));
@@ -9,47 +9,47 @@
?>
-labelEx($model,'username') ?>
-textField($model,'username',array('size'=>20,'maxlength'=>20)) ?>
-error($model,'username') ?>
+labelEx($model,'username') ?>
+textField($model,'username',array('size'=>20,'maxlength'=>20)) ?>
+error($model,'username') ?>
-labelEx($model,'password') ?>
-passwordField($model,'password',array('size'=>60,'maxlength'=>128)) ?>
-error($model,'password') ?>
+labelEx($model,'password') ?>
+passwordField($model,'password',array('size'=>60,'maxlength'=>128)) ?>
+error($model,'password') ?>
-labelEx($model,'activationKey') ?>
-textField($model,'activationKey',array('size'=>60,'maxlength'=>128)) ?>
-error($model,'activationKey') ?>
+labelEx($model,'activationkey') ?>
+textField($model,'activationkey',array('size'=>60,'maxlength'=>128)) ?>
+error($model,'activationkey') ?>
-labelEx($model,'createtime') ?>
-textField($model,'createtime') ?>
-error($model,'createtime') ?>
+labelEx($model,'createtime') ?>
+textField($model,'createtime') ?>
+error($model,'createtime') ?>
-labelEx($model,'lastvisit') ?>
-textField($model,'lastvisit') ?>
-error($model,'lastvisit') ?>
+labelEx($model,'lastvisit') ?>
+textField($model,'lastvisit') ?>
+error($model,'lastvisit') ?>
-labelEx($model,'lastpasswordchange') ?>
-textField($model,'lastpasswordchange') ?>
-error($model,'lastpasswordchange') ?>
+labelEx($model,'lastpasswordchange') ?>
+textField($model,'lastpasswordchange') ?>
+error($model,'lastpasswordchange') ?>
-labelEx($model,'superuser') ?>
-textField($model,'superuser') ?>
-error($model,'superuser') ?>
+labelEx($model,'superuser') ?>
+textField($model,'superuser') ?>
+error($model,'superuser') ?>
-labelEx($model,'status') ?>
-textField($model,'status') ?>
-error($model,'status') ?>
+labelEx($model,'status') ?>
+textField($model,'status') ?>
+error($model,'status') ?>
- "$('#dialog_yumuser').dialog('close');"));
echo CHtml::AjaxSubmitButton(Yii::t('app', 'Create'), array(
diff --git a/user/views/user/_resend_activation_partial.php b/user/views/user/_resend_activation_partial.php
index 8b451e5..f4b01b9 100644
--- a/user/views/user/_resend_activation_partial.php
+++ b/user/views/user/_resend_activation_partial.php
@@ -1,8 +1,8 @@
-
+
- email)){
+ email)){
echo CHtml::hiddenField('email',$form->email);
}else{
echo CHtml::activeLabelEx($user,'email');
@@ -11,12 +11,12 @@
?>
-
+
-
+
-
+
diff --git a/user/views/user/_tooltip.php b/user/views/user/_tooltip.php
index 02f09c3..7d16e64 100644
--- a/user/views/user/_tooltip.php
+++ b/user/views/user/_tooltip.php
@@ -1,4 +1,4 @@
- %s: %s ';
@@ -16,7 +16,7 @@
printf($template, Yum::t('First visit'), date(UserModule::$dateFormat, $data->createtime));
printf($template, Yum::t('Last visit'), date(UserModule::$dateFormat, $data->lastvisit));
-if(Yum::hasModule('messages')){
+if(Yum::hasModule('message')){
echo CHtml::link(Yum::t('Write a message'), array(
'//message/message/compose', 'to_user_id' => $data->id)) . '
';
}
diff --git a/user/views/user/_view.php b/user/views/user/_view.php
index 67ba230..2c2345c 100644
--- a/user/views/user/_view.php
+++ b/user/views/user/_view.php
@@ -1,10 +1,10 @@
-
- renderPartial('_tooltip', array('data' => $data)); ?>
+
+ renderPartial('_tooltip', array('data' => $data)); ?>
-
+
-enablePrivacySetting) {
if($data->privacy && $data->privacy->show_online_status) {
@@ -16,14 +16,14 @@
?>
-%s %s', $data->username, $online); ?>
+%s %s', $data->username, $online); ?>
-getAvatar(true),
+getAvatar(true),
array(
'//profile/profile/view', 'id' => $data->id)); ?>
-clientScript->registerScript('tooltip_'.$data->id, "
$('#user_{$data->id}').tooltip({
'position': 'top',
diff --git a/user/views/user/admin.php b/user/views/user/admin.php
index f33bc9b..8685c39 100644
--- a/user/views/user/admin.php
+++ b/user/views/user/admin.php
@@ -1,4 +1,4 @@
-title = Yum::t('Manage users');
@@ -8,7 +8,7 @@
echo Yum::renderFlash();
-$this->widget('application.modules.user.components.CsvGridView', array(
+$this->widget('YumComponents.CsvGridView', array(
'dataProvider'=>$model->search(),
'filter' => $model,
'columns'=>array(
@@ -52,6 +52,6 @@
),
))); ?>
-
diff --git a/user/views/user/browse.php b/user/views/user/browse.php
index 4d459b3..3d81560 100644
--- a/user/views/user/browse.php
+++ b/user/views/user/browse.php
@@ -1,4 +1,4 @@
-title = Yum::t('Browse users');
$this->breadcrumbs=array(Yum::t('Browse users'));
@@ -7,10 +7,10 @@
?>