small update

cp-script · cp-script · commit b3e1a40503d3 · 2015-03-27T20:04:32.000+01:00
diff --git a/src/COC/COCBundle/Resources/views/Default/index.html.twig b/src/COC/COCBundle/Resources/views/Default/index.html.twig
@@ -215,7 +215,7 @@
             {{ render(controller('AdminBundle:VideoAdmin:mainPageModule', {'id_clan': clan.id })) }}
 
             {% if is_granted('ROLE_USER') and app.user.player.clan.id is defined  %}
-                
+
                 {% include 'FOSCommentBundle:Thread:async.html.twig' with {'id': clan.id} %}
             {% endif %}
 
diff --git a/src/COC/COCBundle/Resources/views/ImageBase/category.html.twig b/src/COC/COCBundle/Resources/views/ImageBase/category.html.twig
@@ -41,7 +41,7 @@
                                 </a>
                             </div>
                             <div class="panel-footer">
-                                <h3 class="panel-title text-center">{{ 'label.posted_by'|trans }}{{ image.user.username }}  </h3>
+                                <h3 class="panel-title text-center">{{ 'label.posted_by'|trans }} {{ image.user.username }}  </h3>
                             </div>
 
 
diff --git a/src/COC/COCBundle/Resources/views/ImageBase/template.html.twig b/src/COC/COCBundle/Resources/views/ImageBase/template.html.twig
@@ -1,11 +1,12 @@
 <div class="row">
         {% if images|length != 0 %}
             <div class="row">
-                <div class="col-md-12">
+                <div class="col-md-10 col-md-offset-1">
                     <h3><a href="{{ path('coc_images_base_category', {'id': hall_town , 'id_clan': clan.id }) }}">{{ 'player.hall_town'|trans }} {{ hall_town }}</a></h3>
                 </div>
             </div>
 
+            <br>
             {% for image in images %}
                 <div class="col-md-4">
                     <div class="panel panel-default text-center">
diff --git a/src/COC/COCBundle/Resources/views/Player/activity.html.twig b/src/COC/COCBundle/Resources/views/Player/activity.html.twig
@@ -11,13 +11,9 @@
     <div class="row">
         <div class="col-lg-12">
             <h1 class="page-header">
+                {{ 'menu.activity'|trans }} ({{ season.name }})
                 {% if isCurrentSeason %}
-                    {{ 'menu.activity'|trans }} ({{ season.name }})
-                {% else %}
-                    {{ 'menu.activity'|trans }} ({{ season.name }})
-                    {%  if app.user.player.level is defined and clan.id == app.user.player.clan.id %}
-                        <a class="btn btn-normal pull-right btn-primary" href="{{ path('coc_players', {'id_clan': clan.id, 'type': '1' }) }}">{{ 'menu.current_season'|trans }}</a>
-                    {% endif %}
+                    <a class="btn btn-normal pull-right btn-primary" href="{{ path('coc_players', {'id_clan': clan.id, 'type': '1' }) }}">{{ 'menu.current_season'|trans }}</a>
                 {% endif %}
                 {% if is_granted('ROLE_ADMIN') and app.user.clan == clan %}
                     <a class="btn btn-normal btn-success btn-normal pull-right" href="{{ path('admin_players_actual_season', {'id_clan': clan.id } ) }}"> &nbsp;{{ 'menu.admin_activity'|trans }}</a>
diff --git a/src/COC/COCBundle/Resources/views/Player/index.html.twig b/src/COC/COCBundle/Resources/views/Player/index.html.twig
@@ -14,14 +14,11 @@
         <div class="row">
             <div class="col-lg-12">
                 <h1 class="page-header">
+                    {{ 'menu.general_ranking'|trans }} ({{ season.name }})
                     {% if isCurrentSeason %}
-                        {{ 'menu.general_ranking'|trans }}  ({{ season.name }})
-                    {% else %}
-                        {{ 'menu.general_ranking'|trans }} ({{ season.name }})
-                        {%  if app.user.player.level is defined and clan.id == app.user.player.clan.id %}
-                            <a class="btn btn-normal pull-right btn-primary" href="{{ path('coc_players', {'id_clan': clan.id, 'type': '0' }) }}">{{ 'menu.current_season'|trans }}</a>
-                        {% endif %}
+                        <a class="btn btn-normal pull-right btn-primary" href="{{ path('coc_players', {'id_clan': clan.id, 'type': '0' }) }}">{{ 'menu.current_season'|trans }}</a>
                     {% endif %}
+
                     {% if is_granted('ROLE_ADMIN') and app.user.clan == clan %}
                         <a class="btn btn-normal btn-success btn-normal pull-right" href="{{ path('admin_players', {'id_clan': clan.id } ) }}">{{ 'menu.admin_players'|trans }}</a>
                     {% endif %}
diff --git a/src/COC/VitrineBundle/Resources/views/Default/index.html.twig b/src/COC/VitrineBundle/Resources/views/Default/index.html.twig
@@ -93,7 +93,10 @@
                     <p class="lead">{{ 'intro.feature2_description'|trans }} </p>
                 </div>
                 <div class="col-lg-6 col-sm-pull-4  col-sm-6">
-                    <img class="img-responsive center-block" src="{{ asset('images/rank.png') }}" alt="">
+                    <a rel="gallery-1"  href="{{ asset('images/rank.png') }}" class="swipebox" title="">
+                        <img class="img-responsive center-block" src="{{ asset('images/rank.png') }}" alt="">
+                    </a>
+
                 </div>
             </div>
 
@@ -113,7 +116,10 @@
                     <p class="lead"> {{ 'intro.feature3_description'|trans }}</p>
                 </div>
                 <div class="col-lg-6 col-lg-offset-2 col-sm-6">
-                    <img class="img-responsive center-block" src="{{ asset('images/bases.png') }}" alt="">
+                    <a rel="gallery-1"  href="{{ asset('images/bases.png') }}" class="swipebox" title="">
+                        <img class="img-responsive center-block" src="{{ asset('images/bases.png') }}" alt="">
+                    </a>
+
                 </div>
             </div>
         </div>
diff --git a/web/images/bases.png b/web/images/bases.png
