wip - refactor ui of push screen and dialogs

This commit is contained in:
Mike Ng
2018-06-15 17:25:46 +04:00
parent bc103637cd
commit 83c6dbe1a7
6 changed files with 38 additions and 46 deletions

View File

@@ -153,6 +153,7 @@ class LanguageController
'title notice' => $translator->trans('prod:mapboxgl: title notice'),
'description notice' => $translator->trans('prod:mapboxgl: description notice'),
'title-map-dialog' => $translator->trans('prod:mapboxgl: title map dialog'),
'create new user' => $translator->trans('prod:push: create new user'),
]);
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 524 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 433 B

View File

@@ -4,57 +4,39 @@
<table>
<tr>
<td>
<label for="">{{ 'First Name' | trans }} *</label>
<input name="firstname" placeholder="{{ 'First Name' | trans }} *" type="text" value=""/>
</td>
<td>
<input name="firstname" type="text" value=""/>
<input name="lastname" placeholder="{{ 'Last Name' | trans }} *" type="text" value=""/>
</td>
</tr>
<tr>
<td colspan="2">
<input name="email" placeholder="{{ 'Email Name' | trans }} *" type="text" value=""/>
</td>
</tr>
<tr>
<td>
<label for="">{{ 'Last Name' | trans }} *</label>
<input name="company" placeholder="{{ 'Company' | trans }}" type="text" value=""/>
</td>
<td>
<input name="lastname" type="text" value=""/>
<input name="job" placeholder="{{ 'Job' | trans }}" type="text" value=""/>
</td>
</tr>
<tr>
<td>
<label for="">{{ 'Email Name' | trans }} *</label>
<input name="city" placeholder="{{ 'City' | trans }}" type="text" value="" class="geoname_field"
autocomplete="false"/>
</td>
<td>
<input name="email" type="text" value=""/>
<input name="pays" placeholder="{{ 'Pays' | trans }}" type="text" value="" class="geoname_field"
autocomplete="false"/>
</td>
</tr>
<tr>
<td>
<label for="">{{ 'Job' | trans }}</label>
</td>
<td>
<input name="job" type="text" value=""/>
</td>
</tr>
<tr>
<td>
<label for="">{{ 'Company' | trans }}</label>
</td>
<td>
<input name="company" type="text" value=""/>
</td>
</tr>
<tr>
<td>
<label for="">{{ 'City' | trans }}</label>
</td>
<td>
<input name="city" type="text" value="" class="geoname_field" autocomplete="false"/>
</td>
</tr>
<tr>
<td></td>
<td>
<button class="valid btn btn-inverse" type="submit">{{ 'Add' | trans }}</button>
<button class="cancel btn btn-inverse" type="button">{{ 'Cancel' | trans }}</button>
<td colspan="2" style="text-align: center;padding: 10px 0px;">
<button class="cancel" type="button">{{ 'Cancel' | trans }}</button>
<button class="valid" type="submit">{{ 'Add' | trans }}</button>
</td>
</tr>
<tr>

View File

@@ -42,7 +42,8 @@
{% endif %}
<li>
<button type="button" class="general_toggler" feature="HD">
<img src="/assets/common/images/icons/download-blue.png"/>
<img src="/assets/common/images/icons/download-blue.png" class="image-normal"/>
<img src="/assets/common/images/icons/download-white.png" class="image-hover"/>
{{ 'HD Download' | trans }}
</button>
</li>
@@ -50,11 +51,11 @@
</div>
<div style="padding:10px;">
<div class="list-container">
<span class="main-title"><img
src="/assets/common/images/icons/list-grey.png"/>{{ 'Lists' | trans }}</span>
<span class="main-title">
<img src="/assets/common/images/icons/list-grey.png"/>{{ 'Lists' | trans }}</span>
<ul class="list">
{% for list in lists %}
<li class="list" style="padding:2px;">
<li class="list" style="padding:6px 2px;position: relative;">
<a class="list_loader"
href="{{ path('prod_push_lists_list', { 'list_id' : list.getId() }) }}">
{#{% if list.getOwner(app.getAuthenticatedUser()).getRole() >= constant('Alchemy\\Phrasea\\Model\\Entities\\UsrListOwner::ROLE_EDITOR') %}#}
@@ -65,6 +66,9 @@
{{ list.getName() }}
({{ list.getEntries().count() }})
</a>
<button class="list-trash-btn">
<img src="/assets/common/images/icons/delete-black.png" class="image-normal"/>
</button>
</li>
{% endfor %}
</ul>
@@ -147,8 +151,10 @@
</div>
<div style="float: left;">
{% if app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::CANADMIN')) %}
<a href="#" class="push-add-user btn"><img
src="/assets/common/images/icons/blue-plus.png"><span>{{ 'Add user' | trans }}</span></a>
<a href="#" class="push-add-user btn">
<img src="/assets/common/images/icons/blue-plus.png" class="image-normal">
<img src="/assets/common/images/icons/white-plus.png" class="image-hover">
<span>{{ 'Add user' | trans }}</span></a>
{% endif %}
</div>
<img id="info-box-trigger" src="/assets/common/images/icons/info-white.png" width="18" height="18">
@@ -192,6 +198,7 @@
<td class="options">
<button class="select-all round-blue-border-btn">{{ 'Select all' | trans }}</button>
<button class="unselect-all round-blue-border-btn">{{ 'Deselect all' | trans }}</button>
<button class="delete-selection btn btn-inverse">{{ 'prod:push: delete selection' | trans }}</button>
</td>
</tr>
</table>
@@ -216,8 +223,10 @@
<form class="list_saver">
<div class="btn-toolbar">
<input type="text" name="name" placeholder="{{ 'Save this list' | trans }}"/>
<button class="saveList"><img
src="/assets/common/images/icons/blue-save.png"/><span>{{ "prod:push:save list" | trans }}</span>
<button class="saveList">
<img src="/assets/common/images/icons/blue-save.png" class="image-normal"/>
<img src="/assets/common/images/icons/white-save.png" class="image-hover"/>
<span>{{ "prod:push:save list" | trans }}</span>
</button>
</div>
</form>

View File

@@ -143,12 +143,12 @@
</select>
</div>
<div class="control-group">
<label for="PushSendFormName">{% trans %}Name{% endtrans %}</label>
<input id="PushSendFormName" type="text" name="name" class="input-block-level"/>
<input id="PushSendFormName" placeholder="{% trans %}Name{% endtrans %}" type="text" name="name"
class="input-block-level"/>
</div>
<div class="control-group">
<label for="PushSendFormMessage">{% trans %}Message{% endtrans %}</label>
<textarea id="PushSendFormMessage" name="message" class="input-block-level" rows="6"></textarea>
<textarea id="PushSendFormMessage" placeholder="{% trans %}Message{% endtrans %}" name="message"
class="input-block-level" rows="6"></textarea>
</div>
<div class="control-group">
<label for="PushSendFormRecept" class="checkbox">