Skip to content

Commit

Permalink
Improves UI
Browse files Browse the repository at this point in the history
  • Loading branch information
@greeflas
greeflas committed Sep 18, 2017
1 parent 8c36a14 commit 1ef91b3
Show file tree
Hide file tree
Showing 7 changed files with 102 additions and 40 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Expand Up @@ -4,6 +4,7 @@ Email Templates Module Change Log
Under development
-----------------
* Enh: Improved error handling
* Enh: Improved UI in backend views

2.1.0 September 13, 2017
------------------------
Expand Down
11 changes: 11 additions & 0 deletions src/Module.php
View file
Expand Up @@ -106,4 +106,15 @@ public static function t($message, $params = [], $language = null)
{
return Yii::t('back/email-templates', $message, $params, $language);
}

/**
* Returns url to repository for creation of new issue.
*
* @return string
* @since 2.2.0
*/
public static function getIssueUrl()
{
return 'https://github.com/yiimaker/yii2-email-templates/issues/new';
}
}
23 changes: 23 additions & 0 deletions src/views/default/_issue-message.php
View file
@@ -1,7 +1,30 @@
<?php
/**
* @link https://github.com/yiimaker/yii2-email-templates
* @copyright Copyright (c) 2017 Yii Maker
* @license BSD 3-Clause License
*/

use ymaker\email\templates\Module as TemplatesModule;

/**
* Partial view file with message for developers.
*
* @var \yii\web\View $this
*
* @author Vladimir Kuprienko <vldmr.kuprienko@gmail.com>
* @since 2.2.0
*/
?>
<?php if (YII_ENV_DEV): ?>
<div class="clearfix"></div>
<hr>
<div class="col-md-12">
<p class="text-warning">
<span class="glyphicon glyphicon-alert"></span>
Found a bug?
<a href="<?= TemplatesModule::getIssueUrl() ?>" target="_blank">Tell about it</a>
to the extension developer.
</p>
</div>
<?php endif ?>
17 changes: 12 additions & 5 deletions src/views/default/create.php
View file
Expand Up @@ -27,6 +27,17 @@
?>
<div class="container">
<div class="row">
<div class="col-md-12">
<h1>
<?= TemplatesModule::t('Email templates') ?>
<small><?= TemplatesModule::t('create new template') ?></small>
<div class="pull-right">
<?= LanguagesList::widget(['currentLanguage' => $translation->language]) ?>
</div>
</h1>
</div>
<div class="clearfix"></div>
<hr>
<div class="col-md-12">
<?php if (isset($errors)): ?>
<?php foreach ($errors as $fieldErrors): ?>
Expand All @@ -41,11 +52,6 @@
<?php endforeach; ?>
<?php endif; ?>
</div>
<div class="col-md-12">
<div class="pull-right">
<?= LanguagesList::widget(['currentLanguage' => $translation->language]) ?>
</div>
</div>
<div class="col-md-12">
<?php $form = ActiveForm::begin() ?>
<?= $form->field($template, 'key') ?>
Expand All @@ -59,5 +65,6 @@
) ?>
<?php $form->end() ?>
</div>
<?= $this->render('_issue-message') ?>
</div>
</div>
24 changes: 14 additions & 10 deletions src/views/default/index.php
View file
Expand Up @@ -7,6 +7,7 @@

use yii\grid\ActionColumn;
use yii\grid\GridView;
use yii\grid\SerialColumn;
use yii\helpers\Html;
use yii\helpers\Url;
use ymaker\email\templates\Module as TemplatesModule;
Expand All @@ -26,25 +27,28 @@
<div class="container">
<div class="row">
<div class="col-md-12">
<div class="panel panel-default">
<div class="panel-body">
<?= Html::a(
TemplatesModule::t('Create template'),
Url::toRoute(['create']),
['class' => 'btn btn-success']
) ?>
</div>
</div>
<h1>
<?= TemplatesModule::t('Email templates') ?>
<small><?= TemplatesModule::t('list of templates') ?></small>
<?= Html::a(
TemplatesModule::t('Create template'),
Url::toRoute(['create']),
['class' => 'btn btn-success pull-right']
) ?>
</h1>
</div>
<div class="clearfix"></div>
<hr>
<div class="col-md-12">
<?= GridView::widget([
'dataProvider' => $dataProvider,
'columns' => [
'id',
['class' => SerialColumn::class],
'key',
['class' => ActionColumn::class]
],
]) ?>
</div>
<?= $this->render('_issue-message') ?>
</div>
</div>
17 changes: 12 additions & 5 deletions src/views/default/update.php
View file
Expand Up @@ -28,6 +28,17 @@
?>
<div class="container">
<div class="row">
<div class="col-md-12">
<h1>
<?= TemplatesModule::t('Email templates') ?>
<small><?= TemplatesModule::t('update template') ?></small>
<div class="pull-right">
<?= LanguagesList::widget(['currentLanguage' => $translation->language]) ?>
</div>
</h1>
</div>
<div class="clearfix"></div>
<hr>
<div class="col-md-12">
<?php if (isset($errors)): ?>
<?php foreach ($errors as $fieldErrors): ?>
Expand All @@ -42,11 +53,6 @@
<?php endforeach; ?>
<?php endif; ?>
</div>
<div class="col-md-12">
<div class="pull-right">
<?= LanguagesList::widget(['currentLanguage' => $translation->language]) ?>
</div>
</div>
<div class="col-md-12">
<?php $form = ActiveForm::begin() ?>
<?= $form->field($template, 'key')
Expand All @@ -70,5 +76,6 @@
) ?>
<?php $form->end() ?>
</div>
<?= $this->render('_issue-message') ?>
</div>
</div>
49 changes: 29 additions & 20 deletions src/views/default/view.php
View file
Expand Up @@ -25,51 +25,60 @@
<div class="container">
<div class="row">
<div class="col-md-12">
<div class="panel panel-default">
<div class="panel-body">
<?= Html::a(
TemplatesModule::t('Update'),
Url::toRoute(['update', 'id' => $template->id, 'lang' => $translation->language]),
['class' => 'btn btn-warning']
) ?>
<?= Html::a(
TemplatesModule::t('Delete'),
Url::toRoute(['delete', 'id' => $template->id]),
['class' => 'btn btn-danger']
) ?>
<div class="pull-right">
<?= LanguagesList::widget(['currentLanguage' => $translation->language]) ?>
</div>
</div>
<h1>
<?= TemplatesModule::t('Email templates') ?>
<small><?= TemplatesModule::t('view template') ?></small>
</h1>
</div>
<div class="clearfix"></div>
<hr>
<div class="col-md-12">
<div class="pull-left">
<?= LanguagesList::widget(['currentLanguage' => $translation->language]) ?>
</div>
<div class="pull-right">
<?= Html::a(
TemplatesModule::t('Update'),
Url::toRoute(['update', 'id' => $template->id, 'lang' => $translation->language]),
['class' => 'btn btn-warning']
) ?>
<?= Html::a(
TemplatesModule::t('Delete'),
Url::toRoute(['delete', 'id' => $template->id]),
['class' => 'btn btn-danger']
) ?>
</div>
</div>
<div class="clearfix"></div>
<hr>
<div class="col-md-12">
<dl class="dl-horizontal">
<dt>
<?= Yii::t('app', 'Key') ?>
<?= TemplatesModule::t('Key') ?>
</dt>
<dd>
<?= $template->key ?>
</dd>
<dt>
<?= Yii::t('app', 'Subject') ?>
<?= TemplatesModule::t('Subject') ?>
</dt>
<dd>
<?= $translation->subject ?>
</dd>
<dt>
<?= Yii::t('app', 'Body') ?>
<?= TemplatesModule::t('Body') ?>
</dt>
<dd>
<?= $translation->body ?>
</dd>
<dt>
<?= Yii::t('app', 'Hint') ?>
<?= TemplatesModule::t('Hint') ?>
</dt>
<dd>
<?= $translation->hint ?>
</dd>
</dl>
</div>
<?= $this->render('_issue-message') ?>
</div>
</div>

0 comments on commit 1ef91b3

Please sign in to comment.