Skip to content

Commit 6834b7b

Browse files
author
Leny BERNARD
committed
Merge pull request #52 from Victoire/feature/blog
Feature/blog
2 parents ef91c37 + 0d34c58 commit 6834b7b

File tree

13 files changed

+238
-64
lines changed

13 files changed

+238
-64
lines changed

‎Bundle/BlogBundle/Resources/translations/victoire.fr.xliff

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,10 @@
178178
<source>modal.blog.list.articlesList.status.scheduled</source>
179179
<target>Planifié</target>
180180
</trans-unit>
181+
<trans-unit id="38" resname="form.blog.type.slug.label">
182+
<source>form.blog.type.slug.label</source>
183+
<target>URL</target>
184+
</trans-unit>
181185
</body>
182186
</file>
183187
</xliff>

‎Bundle/BlogBundle/Resources/views/Article/settings.html.twig

Lines changed: 47 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,63 @@
11
{% extends 'VictoireBlogBundle:Article:new.html.twig' %}
2-
32
{% trans_default_domain "victoire" %}
43

54
{% block modal_body_content %}
6-
75
<div class="vic-tab-content vic-modal-tab-content">
8-
96
<div class="vic-tab-pane vic-active" id="basics">
107
<form method="POST" action="{{path('victoire_blog_article_settings', {'id': article.id} )}}">
11-
<div class="vic-form-group">
12-
<div class="vic-col-lg-8">
8+
<div class="vic-row">
9+
<div class="vic-col-md-4">
1310
{{ form_row(form.name) }}
14-
{{ form_row(form.pattern) }}
15-
<div class="vic-form-group">
16-
<label for="victoire_article_settings_type_bodyClass" class="vic-control-label control-label vic-optional">
17-
{{ 'form.page.type.slug.label'|trans({}, 'victoire') }}
18-
</label>
19-
20-
<div class="vic-form-url-slug">
21-
{{ form_widget(form.slug) }}
22-
</div>
23-
</div>
11+
12+
{{ form_row(form.image) }}
2413
</div>
25-
<div class="vic-col-lg-4">
26-
{{ form_row(form.status) }}
27-
<div class="vic-form-group">
28-
<div class="publication-date-container{{ form.vars.value.status != constant('Victoire\\Bundle\\BlogBundle\\Entity\\Article::SCHEDULED') ? ' vic-hidden' }}">
29-
{{ form_widget(form.publishedAt) }}
14+
15+
<div class="vic-col-md-8">
16+
<div class="vic-row">
17+
<div class="vic-col-md-6">
18+
{{ form_row(form.pattern) }}
19+
</div>
20+
21+
<div class="vic-col-md-6">
22+
{{ form_row(form.status) }}
23+
</div>
24+
25+
<div class="vic-col-md-6">
26+
<div class="vic-form-group">
27+
<label for="victoire_article_settings_type_bodyClass">
28+
{{ 'form.page.type.slug.label'|trans({}, 'victoire') }}
29+
</label>
30+
31+
{{ form_widget(form.slug) }}
32+
</div>
33+
</div>
34+
35+
<div class="vic-col-md-6">
36+
{{ form_row(form.visibleOnFront) }}
37+
</div>
38+
39+
<div class="vic-col-md-6" id="vic-blog-article-setting-description">
40+
{{ form_row(form.description) }}
41+
</div>
42+
43+
<div class="vic-col-md-6">
44+
{{ form_row(form.category) }}
45+
46+
{{ form_row(form.tags) }}
47+
48+
<div class="vic-form-group">
49+
<div class="publication-date-container{{ form.vars.value.status != constant('Victoire\\Bundle\\BlogBundle\\Entity\\Article::SCHEDULED') ? ' vic-hidden' }}">
50+
{{ form_widget(form.publishedAt) }}
51+
</div>
52+
</div>
53+
</div>
54+
55+
<div class="vic-col-md-6">
56+
{{ form_rest(form) }}
3057
</div>
3158
</div>
3259
</div>
3360
</div>
34-
{{ form_rest(form) }}
3561
</form>
3662
</div>
3763
</div>

‎Bundle/BlogBundle/Resources/views/Blog/Tabs/_articles.html.twig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
<div class="vic-panelBlog-image" {% if article.image %}style="background-image: url({{ article.image.url }});"{% endif %}>
1313
<span class="vic-panelBlog-badge -{{ article.status }}">
1414
<span class="vic-panelBlog-badge-popover">
15-
{{ 'modal.blog.list.articlesList.status.' ~ article.status |trans }}
15+
{% set transKey = 'modal.blog.list.articlesList.status.' ~ article.status %}
16+
{{ transKey |trans }}
1617
</span>
1718
</span>
1819
</div>

‎Bundle/BlogBundle/Resources/views/Blog/Tabs/_category.html.twig

Lines changed: 49 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,41 @@
1-
21
{% trans_default_domain "victoire" %}
2+
33
<div class="vic-tab-content vic-modal-tab-content">
44
<div class="vic-tab-pane vic-active" id="basics">
55
<form method="POST" id="victoire_blog_category_form" action="{{path('victoire_blog_category', {'id':blog.id} )}}">
66
<div class="vic-form-group">
77
<div class="blogCategories" data-prototype="{{ _self.widget_prototype(form.rootCategories.vars.prototype)|e }}" role="blogCategory" data-init="true" data-blog-category="0" data-index="0">
8-
<ul class="vic-blogCategoryWidget-itemList" role="blogCategory-container">
8+
<ul class="vic-cascade-list" id="blog-category-cascadeList" role="blogCategory-container">
99
{% for category in form.rootCategories %}
10-
{{ _self.widget_prototype(category, loop.index0) }}
10+
{{ _self.widget_prototype(category, loop.index0) }}
1111
{% endfor %}
1212
</ul>
13+
1314
<div class='vic-form-group vic-add_blogCategory_sibling-Container'>
14-
<span><a href="#" onclick="addBlogCategoryRootItem(this);return false;" class="add_blogCategory_link vic-btn vic-btn-default add_blogCategory_sibling"><i class="fa fa-plus"></i> {{'victoire.blog.category.add.main.label'|trans}}</a></span>
15+
{% spaceless %}
16+
<span>
17+
<a href="#" onclick="addBlogCategoryRootItem(this);return false;" class="add_blogCategory_link vic-btn vic-btn-default add_blogCategory_sibling">
18+
<i class="fa fa-plus"></i> {{'victoire.blog.category.add.main.label'|trans}}
19+
</a>
20+
</span>
21+
{% endspaceless %}
1522
</div>
1623
</div>
17-
{{form_errors(form)}}
18-
{# Add this line to set the widget as rendered to not display it twice in form_rest #}
19-
{% do form.rootCategories.setRendered %}
24+
25+
{{ form_errors(form) }}
26+
27+
{# Add this line to set the widget as rendered to not display it twice in form_rest #}
28+
{% do form.rootCategories.setRendered %}
2029
</div>
30+
2131
{{ form_rest(form) }}
2232

23-
<button type="submit" href="#" class="vic-btn vic-btn-success" title="{{ ('modal.button.category.title')|trans({}, 'victoire') }}"><i class="fa fa-check-circle"></i> {{ ('modal.button.category.title')|trans({}, 'victoire') }}</submit>
33+
{% spaceless %}
34+
<button type="submit" href="#" class="vic-btn vic-btn-success vic-pull-right" title="{{ ('modal.button.category.title')|trans({}, 'victoire') }}">
35+
<i class="fa fa-check-circle"></i>
36+
{{ ('modal.button.category.title')|trans({}, 'victoire') }}
37+
</button>
38+
{% endspaceless %}
2439
</form>
2540
</div>
2641
</div>
@@ -33,6 +48,7 @@
3348
//for the existing blogCategories, we generate the js blogCategories
3449
initBlogCategories();
3550
});
51+
3652
$vic('#victoire_blog_category_type_status').on('change', function(){
3753
if ($vic(this).val() == '{{ constant('Victoire\\Bundle\\PageBundle\\Entity\\PageStatus::SCHEDULED') }}') {
3854
$vic('.publication-date-container').removeClass('vic-hidden');
@@ -48,32 +64,36 @@
4864
<script type="text/javascript" src="{{ asset_url }}"></script>
4965
{% endjavascripts %}
5066

51-
5267
{% macro widget_prototype(form, index) %}
53-
<li class='vic-form-group vic-blogcategoryWidget-item-formGroup' role="blogCategory" data-index="{{ index is not null ? index : '__blogCategory_index__' }}" data-blog-category="__blogCategory_id__" data-init="false">
54-
{{ _self.category_render_form(form) }}
55-
<span class='add_blogCategory_link-container'>
56-
<span><a href="#" onclick="addBlogCategoryRow(this);return false;" class="vic-btn vic-blogCategoryWidget-btn vic-btn-default add_blogCategory_link"><i class="fa fa-plus"></i> {{'victoire.blog.category.add.sub.label'|trans}}</a></span>
57-
</span>
58-
<ul class="vic-blogCategoryWidget-itemList" role="blogCategory-container">
59-
{% if form.children is defined %}
60-
{% for category in form.children %}
61-
{% if category.title is defined %}
62-
{{ _self.widget_prototype(category, loop.index0) }}
63-
{% endif %}
64-
{% endfor %}
65-
{% endif %}
66-
</ul>
67-
</li>
68+
<li class='vic-item vic-blogcategoryWidget-item-formGroup' role="blogCategory" data-index="{{ index is not null ? index : '__blogCategory_index__' }}" data-blog-category="__blogCategory_id__" data-init="false">
69+
{{ _self.category_render_form(form) }}
6870

71+
{% spaceless %}
72+
<span class='add_blogCategory_link-container'>
73+
<a href="#" onclick="addBlogCategoryRow(this);return false;" class="vic-btn -square vic-blogCategoryWidget-btn vic-btn-default add_blogCategory_link">
74+
<i class="fa fa-level-up fa-rotate-90"></i>
75+
</a>
76+
</span>
77+
{% endspaceless %}
6978

79+
<ul class="vic-cascade-sublist" role="blogCategory-container">
80+
{% if form.children is defined %}
81+
{% for category in form.children %}
82+
{% if category.title is defined %}
83+
{{ _self.widget_prototype(category, loop.index0) }}
84+
{% endif %}
85+
{% endfor %}
86+
{% endif %}
87+
</ul>
88+
</li>
7089
{% endmacro %}
7190

7291
{% macro category_render_form(form) %}
73-
7492
{{ form_widget(form.title, {'attr': {'placeholder': form.title.vars.label}, 'required' : true}) }}
75-
<span>
76-
<a onclick="deleteBlogCategoryRow(this);return false;" href="#" class="vic-btn vic-btn-danger vic-blogCategoryWidget-btn vic-blogCategoryWidget-deleteRow vic-btn" ><i class="fa fa-trash-o"></i></a>
77-
</span>
7893

79-
{% endmacro %}
94+
{% spaceless %}
95+
<a onclick="deleteBlogCategoryRow(this);return false;" href="#" class="vic-btn -square -framed vic-btn-danger vic-blogCategoryWidget-btn vic-blogCategoryWidget-deleteRow">
96+
<i class="fa fa-trash-o"></i>
97+
</a>
98+
{% endspaceless %}
99+
{% endmacro %}

‎Bundle/BlogBundle/Resources/views/Blog/Tabs/_settings.html.twig

Lines changed: 39 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
21
{% trans_default_domain "victoire" %}
2+
{% form_theme form 'VictoireFormBundle:Form:fields.html.twig' %}
3+
34
<div class="vic-tab-content vic-modal-tab-content">
45
{# Only display this business entity property list when related to a business entity #}
56
{% if blog.businessEntity is defined %}
@@ -8,38 +9,63 @@
89

910
<div class="vic-tab-pane vic-active" id="basics">
1011
<form method="POST" id="victoire_blog_settings_form" action="{{path('victoire_blog_settings', {'id':blog.id} )}}">
11-
<div class="vic-form-group">
12-
<div class="vic-col-lg-8">
12+
<div class="vic-row">
13+
<div class="vic-col-md-offset-8 vic-col-md-4">
14+
{{ form_row(form.status) }}
15+
</div>
16+
</div>
17+
18+
<div class="vic-row">
19+
<div class="vic-col-md-6">
1320
{{ form_row(form.name) }}
14-
{{ form_row(form.parent) }}
21+
</div>
22+
23+
<div class="vic-col-md-6">
1524
{{ form_row(form.template) }}
25+
</div>
1626

27+
<div class="vic-col-md-6">
1728
<div class="vic-form-group">
18-
<label for="victoire_blog_settings_type_bodyClass" class="vic-control-label control-label vic-optional">
29+
<label for="victoire_blog_settings_type_bodyClass">
1930
{{ 'form.blog.type.slug.label'|trans({}, 'victoire') }}
2031
</label>
2132

22-
<div class="vic-form-url-slug">
23-
{{ url('victoire_core_page_show', {'url' : blog.url })|replace({(blog.slug): ''}) }}
33+
<div class="vic-form-url">
34+
<div class="vic-url">
35+
{{ url('victoire_core_page_show', {'url' : blog.url })|replace({(blog.slug): ''}) }}
36+
</div>
37+
2438
{{ form_widget(form.slug) }}
2539
</div>
2640
</div>
2741
</div>
28-
<div class="vic-col-lg-4">
29-
{{ form_row(form.status) }}
42+
43+
<div class="vic-col-md-6">
44+
{{ form_row(form.locale) }}
45+
</div>
46+
47+
<div class="vic-col-md-6">
48+
{{ form_row(form.parent) }}
49+
</div>
50+
51+
<div class="vic-col-md-6">
3052
<div class="vic-form-group">
3153
<div class="publication-date-container{{ form.vars.value.status != constant('Victoire\\Bundle\\PageBundle\\Entity\\PageStatus::SCHEDULED') ? ' vic-hidden' }}">
3254
{{ form_widget(form.publishedAt) }}
3355
</div>
3456
</div>
3557
</div>
3658

37-
{{form_errors(form)}}
38-
{# Add this line to set the widget as rendered to not display it twice in form_rest #}
59+
<div class="vic-col-md-6">
60+
{{ form_errors(form) }}
61+
62+
{# Add this line to set the widget as rendered to not display it twice in form_rest #}
63+
{{ form_rest(form) }}
64+
</div>
3965
</div>
40-
{{ form_rest(form) }}
4166

42-
<button type="submit" href="#" class="vic-btn vic-btn-success" title="{{ ('modal.button.settings.title')|trans({}, 'victoire') }}"><i class="fa fa-check-circle"></i> {{ ('modal.button.settings.title')|trans({}, 'victoire') }}</submit>
67+
68+
<button type="submit" href="#" class="vic-btn vic-btn-success vic-pull-right" title="{{ ('modal.button.settings.title')|trans({}, 'victoire') }}"><i class="fa fa-check-circle"></i> {{ ('modal.button.settings.title')|trans({}, 'victoire') }}</submit>
4369
</form>
4470
</div>
4571
</div>

‎Bundle/CoreBundle/Resources/style/less/bricks/bricks.less

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,6 @@
2323
@import 'vic-custom-select';
2424
@import 'vic-alert';
2525
@import 'vic-shadow';
26+
@import 'vic-cascade-list';
2627

2728
@import '../parameters/parameters';

‎Bundle/CoreBundle/Resources/style/less/bricks/vic-btn.less

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,19 @@
1313
padding-left: @vicBtn_paddingHorizontal;
1414
padding-right: @vicBtn_paddingHorizontal;
1515
.box-sizing(border-box);
16+
17+
18+
&.-square {
19+
padding-left: 0;
20+
padding-right: 0;
21+
width: 40px;
22+
height: 40px;
23+
text-align: center;
24+
25+
.fa {
26+
margin-right: 0;
27+
}
28+
}
1629
}
1730

1831

@@ -132,4 +145,26 @@
132145
line-height: 28px;
133146
font-size: 14px;
134147
line-height: 18px;
148+
}
149+
150+
151+
// Btn variant
152+
// ===========
153+
154+
// Framed
155+
// ------
156+
157+
.vic-btn-danger {
158+
&.-framed {
159+
color: @vic-btn-default-backgroundColor;
160+
border-color: @vic-btn-default-backgroundColor;
161+
background-color: transparent;
162+
163+
&:hover, &.hover, &.vic-hover, &.is-hover, &.-hover,
164+
&:focus, &.focus, &.vic-focus, &.is-focus, &.-focus,
165+
&:active, &.active, &.vic-active, &.is-active, &.-active, {
166+
background-color: @vic-btn-default-backgroundColor;
167+
color: @white;
168+
}
169+
}
135170
}

‎Bundle/CoreBundle/Resources/style/less/bricks/vic-cascade-list.less

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
.vic-cascade-list {
2+
overflow: hidden;
3+
padding: 0;
4+
margin-top: @cascadeList_gutterSize / 2 * -1;
5+
margin-bottom: @cascadeList_gutterSize / 2 * -1;
6+
margin-left: 0;
7+
margin-right: 0;
8+
9+
.vic-item {
10+
margin-left: @cascadeList_gutterSize / 2 * -1;
11+
margin-right: @cascadeList_gutterSize / 2 * -1;
12+
13+
> * {
14+
margin: @cascadeList_gutterSize / 2;
15+
float: left;
16+
}
17+
18+
> .vic-cascade-sublist {
19+
margin: 0
20+
}
21+
}
22+
}
23+
24+
.vic-cascade-sublist {
25+
width: 100%;
26+
padding-left: @cascadeSublist_paddingLeft;
27+
}

0 commit comments

Comments
 (0)