Skip to content

Commit

Permalink
ADD: missing js files, views refactoring
Browse files Browse the repository at this point in the history
  • Loading branch information
mountstone committed Mar 10, 2017
1 parent 996447d commit 2055831
Show file tree
Hide file tree
Showing 29 changed files with 2,433 additions and 25,502 deletions.
11 changes: 2 additions & 9 deletions public/css/antares.css

Large diffs are not rendered by default.

4,818 changes: 0 additions & 4,818 deletions public/css/bower_assets.css

This file was deleted.

20,592 changes: 19 additions & 20,573 deletions public/css/external.css

Large diffs are not rendered by default.

Binary file removed public/img/theme/billevo/logo/favicon--big.png
Binary file not shown.
Binary file removed public/img/theme/billevo/logo/favicon.png
Binary file not shown.
Binary file removed public/img/theme/billevo/logo/logo-white.png
Binary file not shown.
Binary file removed public/img/theme/billevo/logo/logo__old.png
Binary file not shown.
Binary file removed public/img/theme/billevo/logo/logo_circle.png
Binary file not shown.
Binary file removed public/img/theme/billevo/logo/logo_full.png
Binary file not shown.
Binary file removed public/img/theme/billevo/logo/logo_mobile.png
Binary file not shown.
Binary file removed public/img/theme/billevo/logo/logo_tear.png
Binary file not shown.
6 changes: 6 additions & 0 deletions public/packages/core/css/additionals.css
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,9 @@ aside.main-sidebar ul.main-menu > li > a .text{
.separator-small{
height:5px;
}
.separator-medium{
height:20px;
}

.tbl-c table tr td img{
max-height: 29px;
Expand Down Expand Up @@ -475,4 +478,7 @@ table.possible-additional-row tr.new-tr:hover td{
}
form fieldset .form-block span.error{
padding-top:0px;
}
.form-block .input-field.input-field--desc input{
margin:0px;
}
4 changes: 3 additions & 1 deletion public/packages/core/js/on-load.js
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ var ConfirmModal = (function () {
return this.isGetHttpMethod() ? 'GET' : 'POST';
},
ConfirmModal.prototype.buildForm = function () {

var $footer = this.getFooter();

var $methodInput = $('<input/>', {
Expand Down Expand Up @@ -162,6 +163,7 @@ var ConfirmModal = (function () {
form.submit();
};
ConfirmModal.prototype.open = function () {

var self = this;
var isMassAction = self.from.hasClass('mass-action');
if (isMassAction) {
Expand Down Expand Up @@ -363,7 +365,7 @@ $(document).ready(function () {
$('.mail-change-driver', document).on("change", function (e) {
var handler = $(this), driver = handler.val();

handler.closest('form').find('input').each(function (index, item) {
handler.closest('form').find('.mail-control').each(function (index, item) {
var element = $(item).closest('.form-block');
if (element.attr('role') === driver) {
element.removeClass('hidden-block');
Expand Down
1,655 changes: 1,611 additions & 44 deletions public/webpack/app_cache.js

Large diffs are not rendered by default.

228 changes: 213 additions & 15 deletions public/webpack/forms_advanced.js

Large diffs are not rendered by default.

190 changes: 190 additions & 0 deletions public/webpack/translations_requirements.js

Large diffs are not rendered by default.

130 changes: 130 additions & 0 deletions public/webpack/view_acl.js

Large diffs are not rendered by default.

261 changes: 239 additions & 22 deletions public/webpack/view_brand_settings.js

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions resources/config/dependable_actions.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@
return [
'title' => trans('antares/users::messages.dependable.' . $title),
'url' => handles('antares/foundation::users/' . $model->id . '/status'),
//
'attributes' => [
'class' => 'triggerable confirm',
'data-icon' => $model->status ? 'minus' : 'check',
'data-title' => trans("antares/users::messages.dependable.user_change_status_question"),
'data-description' => trans('antares/users::messages.dependable.' . $description, ['fullname' => $model->fullname])]
Expand Down
2 changes: 1 addition & 1 deletion resources/views/default/exception/404.twig
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<div class="error-container">
<div class="top-area">
<div class="app-logo">
<img src="{{ brand_logo('big','/img/theme/antares/logo/logo_mobile.png') }}" alt="{{ brand_title() }}">
<img src="{{ brand_logo('big','/img/theme/antares/logo/full-logo-white.svg') }}" alt="{{ brand_title() }}">
</div>
<div class="error-message">
<div class="error-message__bg"></div>
Expand Down
4 changes: 4 additions & 0 deletions resources/views/default/layouts/antares/main.twig
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,11 @@
{% endblock %}
</div>
</div>
<template id="sweet-alert-template">
<div class="sweet-overlay" tabIndex="-1"></div><div class="sweet-alert" style="display: none" tabIndex="-1"><div class="icon error"><span class="x-mark"><span class="line left"></span><span class="line right"></span></span></div><div class="icon warning"> <span class="body"></span> <span class="dot"></span> </div> <div class="icon info"></div> <div class="icon success"> <span class="line tip"></span> <span class="line long"></span> <div class="placeholder"></div> <div class="fix"></div> </div> <img class="sweet-image"> <div class="header"><h2>Title</h2><i class="zmdi zmdi-close swal__close"></i></div><div class="sweet-content">Text</div><hr class="sweet-spacer"><div class="footer"><button class="sweet-confirm">OK</button><button class="sweet-cancel">Cancel</button></div></div>
</template>
{% include 'antares/foundation::layouts.antares.partials._spinner' %}
{% include 'antares/foundation::layouts.antares.partials._scripts_webpack' %}

</body>
</html>
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
<meta name="apple-mobile-web-app-status-bar-style" content="#27ae60">
{% block javascripts %}
{% set asset = app('antares.asset').container('antares.header')
.style('bower_assets', asset('/css/bower_assets.css'))
.style('external_css', '/css/external.css')
.style('antares_css', '/css/antares.css')
.style('additionals', 'packages/core/css/additionals.css')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
{% if buttons is not empty %}
<div class="app-content__footer">
<div class="btn-group">
{% for button in buttons %}
{% for button in buttons %}
{% if button.attributes.attributes.type not in ['submit','button'] %}
{% set links = links|merge([button]) %}
{% else %}
Expand All @@ -45,14 +45,15 @@
{% endif %}
{% endif %}
{% endfor %}
{% for test in tests %}
{{ test|raw }}
{% endfor %}
{% for link in links %}
{% if not link.hasWrapper() %}
{{ link.getField(row, link, [])|raw }}
{% endif %}
{% endfor %}
{% for test in tests %}
{{ test|raw }}
{% endfor %}

</div>
</div>
{% for button in buttons %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
{{ Form.label(control.name, control.label,{'class':'form-block__name'})|raw }}
</div>
<div class="col-16">
<div class="input-field {{ (control.inlineHelp|length>1 or control.help|length>1) ? 'input-field--desc' : '' }}">
{{ control.getField(row, control, [])|raw }}
{% if control.inlineHelp|length>1 or control.help|length>1 %}
{% include 'antares/foundation::layouts.antares.partials.form.vertical._description' %}
{% endif %}
<div class="input-field {{ (control.inlineHelp|length>1 or control.help|length>1) ? 'input-field--desc' : '' }} {{ control.get('fieldClass')|raw }}">
{{ control.getField(row, control, [])|raw }}
</div>
</div>
{% if control.inlineHelp|length>1 or control.help|length>1 %}
{% include 'antares/foundation::layouts.antares.partials.form.vertical._description' %}
{% endif %}
<span id="{{ control.id }}_error" class="error col-13 col-mb-11">
{{ errors.first(control.name, format)|raw }}
</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</div>
{% endif %}
<div class="col-16">
<div class="input-field {{ (control.inlineHelp|length>1 or control.help|length>1) ? 'input-field--desc' : '' }} {{ control.get('fieldClass')|raw }} ">
<div class="input-field {{ (control.inlineHelp|length>1 or control.help|length>1) ? 'input-field--desc' : '' }} {{ control.get('fieldClass')|raw }}">
{{ control.get('before')|raw }}
{{ control.getField(row, control, [])|raw }}
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
<div class="col-16">
<div class="input-field input-field--desc {{ control.get('fieldClass')|raw }}">
{{ control.get('prepend')|raw }}
{{ control.getField(row, control, [])|raw }}
{% include 'antares/foundation::layouts.antares.partials.form.vertical._description' %}
{{ control.getField(row, control, [])|raw }}
</div>
</div>
{% include 'antares/foundation::layouts.antares.partials.form.vertical._description' %}
<span id="{{ control.id }}_error" class="error col-13 col-mb-11">
{{ errors.first(control.name, format)|raw }}
</span>
Expand Down
4 changes: 2 additions & 2 deletions resources/views/default/layouts/exception/exception.twig
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!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" xml:lang="en" lang="en">
<head>
{% include 'antares/foundation::layouts.exception.partials._head_webpack' %}
{% include 'antares/foundation::layouts.exception.partials._head' %}
</head>
<body>
{% block content %}
Expand All @@ -17,6 +17,6 @@

</div>
</div>
{% include 'antares/foundation::layouts.exception.partials._scripts_webpack' %}
{% include 'antares/foundation::layouts.exception.partials._scripts' %}
</body>
</html>
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
<meta name="apple-mobile-web-app-status-bar-style" content="#27ae60">
{% block javascripts %}
{% set asset = app('antares.asset').container('antares.header')
.style('bower_assets', '/css/bower_assets.css')
.style('external_css', '/css/external.css')
.style('antares_css', '/css/antares.css')
.style('additionals', '/packages/core/css/additionals.css')
Expand Down
1 change: 0 additions & 1 deletion resources/views/default/layouts/quest/partials/_head.twig
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
<meta name="apple-mobile-web-app-status-bar-style" content="#27ae60">
{% block javascripts %}
{% set asset = app('antares.asset').container('antares.header')
.style('bower_assets', '/css/bower_assets.css')
.style('external_css', '/css/external.css')
.style('antares_css', '/css/antares.css')
.style('additionals', '/packages/core/css/additionals.css')
Expand Down

0 comments on commit 2055831

Please sign in to comment.