Merge branch 'develop' · mgabarda.com/upvcarshare@9b941ce

+1 -1

package.json

··· 9 9 }, 10 10 "scripts": { 11 11 "watch": "gulp", 12 - "build": "gulp build" 12 + "build": "gulp deploy" 13 13 }, 14 14 "devDependencies": { 15 15 "angular": "^1.5.5",

upvcarshare/static/src/img/EMASupv.png

This is a binary file and will not be displayed.

upvcarshare/static/src/img/campus_excelenciaH5.png

This is a binary file and will not be displayed.

upvcarshare/static/src/img/campus_excelenciaVLC.png

This is a binary file and will not be displayed.

upvcarshare/static/src/img/hero.png

This is a binary file and will not be displayed.

+25

upvcarshare/static/src/sass/access.scss

··· 1 + .access-hero { 2 + margin: 0 -15px; 3 + width: auto; 4 + height: 240px; 5 + background-image: url("../img/hero.png"); 6 + background-size: 100% 100%; 7 + } 8 + 9 + h1.access-title { 10 + color: $upv-purple-2; 11 + text-align: center; 12 + font-size: 32px; 13 + } 14 + 15 + .access-link { 16 + font-size: 16px; 17 + margin-top: 15px; 18 + height: 105px; 19 + background-color: $upv-purple-3; 20 + text-align: center; 21 + padding-top: 55px; 22 + a, a:hover { 23 + color: #fff; 24 + } 25 + }

+2

upvcarshare/static/src/sass/colors.scss

··· 8 8 $upv-green: #515B0B; 9 9 $upv-purple: #452637; 10 10 $upv-yellow: #3D344E; 11 + $upv-purple-2: #7D0032; 12 + $upv-purple-3: #321D3D;

+11

upvcarshare/static/src/sass/footer.scss

··· 1 + footer { 2 + @extend .container; 3 + padding-top: 5px; 4 + font-size: 90%; 5 + background-color: #fff; 6 + border-top: 1px solid #000; 7 + .list-inline { 8 + margin-bottom: 0; 9 + } 10 + min-height: 77px; 11 + }

+2

upvcarshare/static/src/sass/project.scss

··· 21 21 @import "notifications"; 22 22 @import "messenger"; 23 23 @import "maps"; 24 + @import "access"; 25 + @import "footer"; 24 26 25 27 html, body{ 26 28 height:100%;

+1

upvcarshare/templates/base.html

··· 34 34 {% endblock container %} 35 35 </div> 36 36 {% endblock body %} 37 + {% block footer %}{% endblock footer %} 37 38 38 39  39 40 <script src="//cdnjs.cloudflare.com/ajax/libs/underscore.js/1.8.3/underscore-min.js"></script>

+45 -1

upvcarshare/templates/header.html

··· 18 18 <img src="{% static "img/upv.png" %}"> 19 19 </div> 20 20 <div class="col-sm-5 text-xs-right"> 21 - <img src="{% static "img/logo.png" %}" alt="{% trans "poli Car" %}" class="title"> 21 + <img src="{% static "img/logo.png" %}" alt="{% trans "PoliCar" %}" class="title"> 22 22 </div> 23 23 </div> 24 24 </div> 25 + {% block navbar %} 25 26 <div class="container section-navbar"> 26 27 <nav class="navbar navbar-full navbar-dark bg-upv-dark-grey"> 27 28 {% if request.user.is_authenticated %} ··· 74 75 {% endif %} 75 76 </nav> 76 77 </div> 78 + {% endblock navbar %} 77 79 {% endblock header %} 80 + 81 + {% block footer %} 82 + <footer> 83 + <div class="row"> 84 + <div class="col-xs-7"> 85 + <ul class="list-inline"> 86 + <li class="list-inline-item"> 87 + <a href="http://www.upv.es/otros/como-llegar-upv/index-es.html" title="{% trans "Cómo llegar" %}"> 88 + {% trans "Cómo llegar" %} 89 + </a> I 90 + </li> 91 + <li class="list-inline-item"> 92 + <a href="http://www.upv.es/plano/plano-2d-es.html" title="{% trans "Planos" %}"> 93 + {% trans "Planos" %} 94 + </a> I 95 + </li> 96 + <li class="list-inline-item"> 97 + <a href="http://www.upv.es/otros/contacto-es.html" title="{% trans "Contacto" %}"> 98 + {% trans "Contacto" %} 99 + </a> 100 + </li> 101 + </ul> 102 + <p>Universitat Politècnica de València © 2017 · Tel. (+34) 96 387 70 00 · <a href="mailto:informacion@upv.es">informacion@upv.es</a></p> 103 + </div> 104 + <div class="col-xs-2"> 105 + <a href="http://www.campushabitat5u.com/" title="{% trans "CAMPUS HABITAT (abre ventana nueva)" %}" rel="external" onclick="target='_blank'"> 106 + <img src="{% static "img/campus_excelenciaH5.png" %}" alt="{% trans "CAMPUS HABITAT" %}"> 107 + </a> 108 + </div> 109 + <div class="col-xs-2"> 110 + <a href="http://www.vlc-campus.com/" title="{% trans "VLC-CAMPUS (abre ventana nueva)" %}" rel="external" onclick="target='_blank'"> 111 + <img src="{% static "img/campus_excelenciaVLC.png" %}" alt="{% trans "VLC-CAMPUS" %}"> 112 + </a> 113 + </div> 114 + <div class="col-xs-1 text-xs-right"> 115 + <a href="http://www.upv.es/entidades/AMAPUOC/" title="{% trans "EMAS" %}"> 116 + <img src="{% static "img/EMASupv.png" %}" alt="{% trans "EMAS upv" %}" width="33" height="62"> 117 + </a> 118 + </div> 119 + </div> 120 + </footer> 121 + {% endblock footer %}

+9 -8

upvcarshare/templates/users/sign_in.html

··· 2 2 {% load i18n %} 3 3 {% load socialaccount %} 4 4 5 - {% block section_title %} 6 - <div class="row"> 7 - <div class="col-xs-12"> 8 - <h2>{% trans "Acceder" %}</h2> 9 - </div> 5 + {% block navbar %} 6 + <div class="container"> 7 + <div class="access-hero"></div> 10 8 </div> 11 - {% endblock %} 9 + {% endblock navbar %} 12 10 13 11 {% block content %} 14 12 <div class="row"> 15 13 <div class="col-xs-12"> 16 - <a href="{% provider_login_url "openid" openid="https://yo.rediris.es/soy/@upv.es" next=next %}" class="btn btn-primary"> 17 - {% trans "Acceso con credenciales UPV" %} 14 + <h1 class="access-title">{% trans "Compartir coche en la UPV" %}</h1> 15 + </div> 16 + <div class="col-xs-12 access-link"> 17 + <a href="{% provider_login_url "openid" openid="https://yo.rediris.es/soy/@upv.es" next=next %}"> 18 + [ {% trans "Acceso" %} ] 18 19 </a> 19 20 </div> 20 21 </div>

Configure Feed

Configure Feed