summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorastaf <astaf@proxy.ccwn.org.ccwn.org>2012-06-27 08:00:42 +0200
committerastaf <astaf@proxy.ccwn.org.ccwn.org>2012-06-27 08:00:42 +0200
commit12028acec151c5811b414a13ebe87115301caae0 (patch)
tree490f8822722eab85187872afd3ae64ea1d3c7094
parente2612db74ea4ae2bec57adc81a07eaa509c3b5db (diff)
parent9a6bcd0f0e19c005f5c062783f5fef7ccb287152 (diff)
Merge branch 'master' of ssh://proxy:9044/home/ccwn/git-repos/admin.astaf.de
-rw-r--r--protected/models/LoginForm.php4
-rw-r--r--protected/models/User.php4
-rw-r--r--protected/views/site/login.php10
3 files changed, 10 insertions, 8 deletions
diff --git a/protected/models/LoginForm.php b/protected/models/LoginForm.php
index 3904698..f8e02e8 100644
--- a/protected/models/LoginForm.php
+++ b/protected/models/LoginForm.php
@@ -36,7 +36,9 @@ class LoginForm extends CFormModel
public function attributeLabels()
{
return array(
- 'rememberMe'=>'Remember me next time',
+ 'username' => 'Benutzername',
+ 'password' => 'Passwort',
+ 'rememberMe'=>'Zugangsdaten auf diesem Computer speichern?',
);
}
diff --git a/protected/models/User.php b/protected/models/User.php
index 76cffe7..3b19a8d 100644
--- a/protected/models/User.php
+++ b/protected/models/User.php
@@ -76,8 +76,8 @@ class User extends CActiveRecord
{
return array(
'id' => 'ID',
- 'username' => 'Username',
- 'password' => 'Password',
+ 'username' => 'Benutzername',
+ 'password' => 'Passwort',
'created_at' => 'Created At',
'last_login' => 'Last Login',
'is_active' => 'Is Active',
diff --git a/protected/views/site/login.php b/protected/views/site/login.php
index 1a90af1..b50bd2a 100644
--- a/protected/views/site/login.php
+++ b/protected/views/site/login.php
@@ -1,13 +1,13 @@
<?php
$this->pageTitle=Yii::app()->name . ' - Login';
$this->breadcrumbs=array(
- 'Login',
+ 'Anmelden',
);
?>
-<h1>Login</h1>
+<h1>Anmelden</h1>
-<p>Please fill out the following form with your login credentials:</p>
+<p>Bitte mit den per eMail übermittelten Zugangsdaten anmelden:</p>
<div class="form">
<?php $form=$this->beginWidget('CActiveForm', array(
@@ -18,7 +18,7 @@ $this->breadcrumbs=array(
),
)); ?>
- <p class="note">Fields with <span class="required">*</span> are required.</p>
+ <!-- <p class="note">Fields with <span class="required">*</span> are required.</p> -->
<div class="row">
<?php echo $form->labelEx($model,'username'); ?>
@@ -39,7 +39,7 @@ $this->breadcrumbs=array(
</div>
<div class="row buttons">
- <?php echo CHtml::submitButton('Login'); ?>
+ <?php echo CHtml::submitButton('Anmelden'); ?>
</div>
<?php $this->endWidget(); ?>