Skip to content

Commit

Permalink
Updated Homepage
Browse files Browse the repository at this point in the history
  • Loading branch information
gerardcobas committed Mar 15, 2014
1 parent 2fcb8c6 commit 70b48a0
Show file tree
Hide file tree
Showing 12 changed files with 91 additions and 17 deletions.
4 changes: 2 additions & 2 deletions src/ADG/ArxiuBundle/Resources/views/Default/arxiu.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
<h1>Arxiu diocesà</h1>
</div>
<div class="row">
<div class="col-md-7 col-lg-7" style="padding-right: 0px;">
<div class="col-md-7 col-lg-7">
<article>L’Arxiu diocesà conserva la memòria documental de la diòcesi de Girona des del segle IX fins a l’actualitat. Està en primer lloc al servei dels organismes i institucions de la diòcesi per a ajudar especialment la seva gestió administrativa i, també, al servei dels investigadors com una col·laboració de l’Església a la cultura de la nostra societat.</article>
<br>
<article>L’Arxiu, per complir la seva funció d’arxiu històric de la diòcesi va rebent tota la documentació generada pels diversos organismes de la Cúria diocesana, igualment de les altres entitats o associacions públiques de la diòcesi. També conserva la documentació dels arxius parroquials de més de 100 anys d’acord amb les disposicions diocesanes.</article>
</div>
<div class="col-md-5 col-lg-5">
Foto llibre:todo
<img class="imatges" src="{{ asset('bundles/ADG/img/diocesa.png') }}"/>
</div>
</div>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@
</div>
<div class="row">
<div class="col-md-7 col-lg-7">
<em>{{ 'capitular.avis' | trans }}</em>
<object data="{{ asset('bundles/ADG/docs/capitular.pdf') }}" type="application/pdf" style="width: 100%;height:100%;min-height: 550px;"></object>

</div>
<div class="col-md-5 col-lg-5">
<img class="imatges" src="{{ asset('bundles/ADG/img/capitular.png') }}"/>
</div>
</div>
{% endblock %}
16 changes: 10 additions & 6 deletions src/ADG/PrincipalBundle/Resources/views/Default/contacte.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,24 @@

<div class="col-md-5 col-lg-5">
<h3>Informació</h3>
<address>
Pujada Sant Martí,12<br>
<address>
<i class="icon-map-marker"></i>
Pujada Sant Martí, 12<br>
17004, GIRONA
</address>
<address>
<strong>Telèfon</strong><br>
972 48 73 46
<i class="icon-phone"></i>
972 48 73 46
</address>
<hr>

<h3>Contactes</h3>

<p>[email protected]<br>
[email protected]</p>
<address>
<a class="icon-envelope-alt" href="mailto:[email protected]" target="_top">&nbsp;[email protected]</a>
<br>
<a class="icon-envelope-alt" href="mailto:[email protected]" target="_top">&nbsp;[email protected]</a>
</address>

<p>
<b>Director</b><br>
Expand Down
53 changes: 46 additions & 7 deletions src/ADG/PrincipalBundle/Resources/views/Default/index.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,39 @@
{% block title %}{{ 'index.inici' | trans}}{% endblock %}

{% block body %}
<div class="row">


<img class="gironaCover" src="{{ asset('bundles/ADG/img/girona.png') }}"/>


<div class="row" style="margin-top: 20px">
<div class="col-lg-4" align="center">
<div class="space100"></div>
<img src="{{ asset('bundles/ADG/img/logo-bisbat.jpg') }}"/><br>
{{ 'index.propietat' | trans}}
<div class="space10"></div>
<img src="{{ asset('bundles/ADG/img/logo-diputacio.gif') }}"/><br>
{{ 'index.colaborador' | trans}}
<div class="space100 visible-lg"></div>
<div class="coverInfo">

<h2>{{ 'contacte.head' | trans }}</h2>

<address>
<i class="icon-map-marker"></i>
Pujada Sant Martí, 12<br>
17004, GIRONA
</address>

<address>
<i class="icon-phone"></i>
972 48 73 46
</address>
<address>
<a class="icon-envelope-alt" href="mailto:[email protected]" target="_top">&nbsp;[email protected]</a>
<br>
<a class="icon-envelope-alt" href="mailto:[email protected]" target="_top">&nbsp;[email protected]</a>
</address>

<p><strong><i class="icon-time"></i>&nbsp;Horari</strong><br>
De dilluns a dijous, de 16 h a 20 h<br>
Consultes convingudes: dijous de 10 h a 14 h<br>
Tancat: Juliol i agost / 24 desembre a 6 gener</p>
</div>
</div>

<div class="col-lg-8" style="padding-right: 0px;">
Expand All @@ -30,4 +55,18 @@

</div>
</div>

<div class="row" style="padding-top: 20px; margin-bottom: 20px;">

<div class="col-lg-offset-2 col-lg-4 col-md-6 col-sm-6 col-xs-12" align="center">
<img style="height: 80px" src="{{ asset('bundles/ADG/img/logo-bisbat.jpg') }}"/><br>
{{ 'index.propietat' | trans}}
</div>

<div class="col-lg-4 col-xs-offset-2 col-md-6 col-sm-6 col-xs-12" align="center">
<img src="{{ asset('bundles/ADG/img/logo-diputacio.png') }}"/><br>
{{ 'index.colaborador' | trans}}
</div>
</div>

{% endblock %}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{% block body %}


<object data="{{ asset('bundles/ADG/docs/normativa.pdf') }}" type="application/pdf" style="width: 100%;height:100%;"></object>
<object data="{{ asset('bundles/ADG/docs/normativa.pdf') }}" type="application/pdf" style="width: 100%;height:100%;min-height: 500px;"></object>



Expand Down
30 changes: 30 additions & 0 deletions web/bundles/ADG/css/comu.css
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,36 @@ pre {
text-align: justify;
padding-right: 15px;
}
.imatges {
width: 100%;
-webkit-border-radius: 4px;
box-shadow: 0 1px 2px 0 rgba(0,0,0,0.35);
}

/* Cover */
.gironaCover {
width: 100%;
-webkit-border-radius: 15px;
}
.coverInfo {
-webkit-border-radius: 4px;
box-shadow: 0 1px 2px 0 rgba(0,0,0,0.35);
padding: 5px 1px 5px 5px;
color: #656565;
}
.coverInfo > h2 {
font-weight: normal;
color: #800000;
text-shadow: 0 1px 0 #f0f0f0;
}
.coverInfo a {
color: #656565;
}
.coverInfo a:hover, .coverInfo a:focus {
color: #222;
text-decoration: inherit;
}


/* General color styles*/
.page-header {
Expand Down
Binary file added web/bundles/ADG/docs/capitular.pdf
Binary file not shown.
Binary file modified web/bundles/ADG/docs/normativa.pdf
Binary file not shown.
Binary file added web/bundles/ADG/img/capitular.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added web/bundles/ADG/img/diocesa.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added web/bundles/ADG/img/girona.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added web/bundles/ADG/img/logo-diputacio.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 70b48a0

Please sign in to comment.