hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-24 02:13:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Divers fix

Browse Source
This commit is contained in:
Nicolas Le Goff
2013-02-26 13:00:49 +01:00
committed by Romain Neutron
parent c7f30521ce
commit b018027998
14 changed files with 116 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
templates/web/login/cgus.html.twig
View File

@@ -3,19 +3,8 @@
{% block content %} {% block content %}
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
<div class="text-title">
Condition Générale d'Utilisation de la Base Beta Version 3.0
</div>
<div class="cgu-content"> <div class="cgu-content">
<p> {% block cgu_content %} {% endblock %}
Nulla pharetra vestibulum mollis. Donec auctor ultricies libero sit amet tempus. Quisque vulputate, metus non lacinia euismod, justo ipsum accumsan metus, id volutpat quam ante varius massa. In interdum sapien nec dolor tincidunt pulvinar. Nulla mattis, purus a pharetra sollicitudin, massa elit fringilla libero, non blandit velit diam vel sapien. Mauris consectetur, orci elementum tincidunt hendrerit, lorem tortor blandit arcu, ac elementum risus turpis a nisl. Donec at laoreet nisl.
</p>
<p>
Sed tortor lorem, semper eget volutpat id, placerat vel nibh. Quisque ornare, libero quis sagittis dictum, nunc leo scelerisque nisi, eu facilisis nisi sapien ac nisl. Vestibulum feugiat vestibulum orci, nec pharetra quam placerat nec. Vestibulum condimentum rhoncus scelerisque. Duis quis ipsum nec orci pellentesque luctus id quis ipsum. Curabitur placerat, neque non viverra sagittis, nisl orci pharetra lectus, ut sodales massa eros a orci. Quisque ac felis risus, hendrerit laoreet augue. Donec ac ante ipsum, ac placerat elit. Duis volutpat, turpis ut imperdiet ultrices, mauris nisi dignissim eros, a venenatis lacus elit id dui.
</p>
<p>
Sed at enim et felis dapibus rhoncus. Quisque bibendum diam at ipsum tempor blandit. Proin ut urna purus, faucibus aliquet lorem. Phasellus eu eros fermentum nunc gravida tincidunt. Nulla ac diam risus. Nulla ac lectus justo, ac sodales orci. Suspendisse volutpat neque sed sapien tempor quis lacinia magna rhoncus. Aliquam erat volutpat. Suspendisse bibendum lacinia euismod. Nulla sit amet scelerisque neque. Sed nec nunc ac leo pellentesque tempus non at urna.
</p>
</div> </div>
<a href="{{ path("homepage") }}" class="btn btn-success "> <a href="{{ path("homepage") }}" class="btn btn-success ">
<i class="icon-arrow-left icon-white"></i> {% trans "Return to login page" %} <i class="icon-arrow-left icon-white"></i> {% trans "Return to login page" %}

11
templates/web/login/common/language-block.html.twig
View File

@@ -1,11 +0,0 @@
<div id="authentication-sidebar-language" class="text-right well-small">
<span class="language"><b>{% trans "language" %}</b></span>
<div class="btn-group">
<button class="btn btn-mini btn-flat dropdown-toggle" data-toggle="dropdown">{% trans "English" %}<span class="caret"></span></button>
<ul class="dropdown-menu pull-right">
<li><a href="#">{% trans "French" %}</a></li>
<li><a href="#">{% trans "German" %}</a></li>
<li><a href="#">{% trans "Dutch" %}</a></li>
</ul>
</div>
</div>

6
templates/web/login/common/macros.html.twig
View File

@@ -112,13 +112,9 @@
{% endmacro %} {% endmacro %}
{% macro alert() %} {% macro alert() %}
{% for type, messages in app['session'].getFlashBag().all() %} {% for type, messages in app.getFlash() %}
{% for message in messages %} {% for message in messages %}
<alert type="{{ type }}">{{ message|trans }}</alert> <alert type="{{ type }}">{{ message|trans }}</alert>
{% endfor %} {% endfor %}
{% endfor %} {% endfor %}
{% if app.request.query.get("notice") is not none %}
<alert type="warning">{{ app.request.query.get("notice") }}</alert>
{% endif %}
{% endmacro %} {% endmacro %}

1
templates/web/login/forgot-password.html.twig
View File

@@ -64,3 +64,4 @@
</div> </div>
</div><!-- /row --> </div><!-- /row -->
{% endblock %} {% endblock %}

12
templates/web/login/include/language-block.html.twig Normal file
View File

@@ -0,0 +1,12 @@
{% set languages = app.getAvailableLanguages() %}
<div id="authentication-sidebar-language" class="text-right well-small">
<span class="language"><b>{% trans "language" %}</b></span>
<div class="btn-group">
<button class="btn btn-mini btn-flat dropdown-toggle" data-toggle="dropdown">{{ attribute(languages, app['locale']) }}<span class="caret"></span></button>
<ul class="dropdown-menu pull-right">
{% for code, language in languages if code != app['locale'] %}
<li><a href="#" data-country-code="{{ code }}">{{ language }}</a></li>
{% endfor %}
</ul>
</div>
</div>

0
templates/web/login/common/main-content.html.twig → templates/web/login/include/main-content.html.twig
View File

144
templates/web/login/layout/base-layout.html.twig
View File

@@ -1,58 +1,76 @@
{% set home_title = app['phraseanet.registry'].get('GV_homeTitle')|default('Phraseanet') %}
<!DOCTYPE html> <!DOCTYPE html>
<!--[if lt IE 7]> <html ng-app="phraseanetAuthentication" class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]--> <!--[if lt IE 7]> <html ng-app="phraseanetAuthentication" class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
<!--[if IE 7]> <html ng-app="phraseanetAuthentication" class="no-js lt-ie9 lt-ie8"> <![endif]--> <!--[if IE 7]> <html ng-app="phraseanetAuthentication" class="no-js lt-ie9 lt-ie8"> <![endif]-->
<!--[if IE 8]> <html ng-app="phraseanetAuthentication" class="no-js lt-ie9"> <![endif]--> <!--[if IE 8]> <html ng-app="phraseanetAuthentication" class="no-js lt-ie9"> <![endif]-->
<!--[if gt IE 8]><!--> <html ng-app="phraseanetAuthentication" class="no-js"> <!--<![endif]--> <!--[if gt IE 8]><!--> <html ng-app="phraseanetAuthentication" class="no-js"> <!--<![endif]-->
<head> <head>
<meta charset="utf-8"> {% block header %}
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta charset="utf-8">
<title>Phraseanet</title> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="description" content=""> <title>{% block title %}Phraseanet{% endblock title %}</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="/assets/normalize-css/normalize.css"> <meta content="{{ app['phraseanet.registry'].get('GV_metaDescription') }}" name="description"/>
<link rel="stylesheet" href="/skins/login/css/bootstrap-switch.css"> <meta http-equiv="X-UA-Compatible" content="chrome=1">
<link rel="stylesheet" href="/skins/login/css/style.css"> <meta content="{{ app['phraseanet.registry'].get('GV_metaKeywords') }}" name="keywords"/>
<meta content="phraseanet" name="generator"/>
<link rel="stylesheet" href="/assets/font-awesome/css/font-awesome.css"> {% for feed in feeds %}
<!--[if IE 7]> {% set link = feed.get_homepage_link(app['phraseanet.registry'], 'rss') %}
<link rel="stylesheet" href="/assets/font-awesome/css/font-awesome-ie7.min.css"> <link rel="alternate" type="{{ link.get_mimetype() }}" title="{{ link.get_title() }}" href="{{ link.get_href() }}" />
<![endif]--> {% set link = feed.get_homepage_link(app['phraseanet.registry'], 'atom') %}
<link rel="alternate" type="{{ link.get_mimetype() }}" title="{{ link.get_title() }}" href="{{ link.get_href() }}" />
{% endfor %}
<script src="/assets/modernizr/modernizr.js"></script> {% block favicon %}
<script src="/assets/jquery/jquery.js"></script> <link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" />
<script src="/assets/bootstrap/js/bootstrap-transition.js"></script> {% endblock favicon %}
<script src="/assets/bootstrap/js/bootstrap-alert.js"></script>
<script src="/assets/bootstrap/js/bootstrap-modal.js"></script>
<script src="/assets/bootstrap/js/bootstrap-dropdown.js"></script>
<script src="/assets/bootstrap/js/bootstrap-scrollspy.js"></script>
<script src="/assets/bootstrap/js/bootstrap-tab.js"></script>
<script src="/assets/bootstrap/js/bootstrap-tooltip.js"></script>
<script src="/assets/bootstrap/js/bootstrap-popover.js"></script>
<script src="/assets/bootstrap/js/bootstrap-button.js"></script>
<script src="/assets/bootstrap/js/bootstrap-collapse.js"></script>
<script src="/assets/bootstrap/js/bootstrap-carousel.js"></script>
<script src="/assets/bootstrap/js/bootstrap-typeahead.js"></script>
<script src="/assets/bootstrap/js/bootstrap-affix.js"></script>
<script src="/assets/angular/angular.js"></script>
<script src="/assets/angular-ui/build/angular-ui.js"></script>
<script src="/skins/login/js/bootstrap-switch.js"></script>
<script src="/assets/underscore/underscore.js"></script>
<script src="/skins/login/js/main.js"></script>
<!--[if lte IE 8]> {% block header_stylesheet %}
<script> <link rel="stylesheet" href="/assets/normalize-css/normalize.css">
// The ieshiv takes care of our ui.directives, bootstrap module directives and <link rel="stylesheet" href="/skins/login/css/bootstrap-switch.css">
// AngularJS's ng-view, ng-include, ng-pluralize and ng-switch directives. <link rel="stylesheet" href="/skins/login/css/style.css">
// However, IF you have custom directives (yours or someone else's) then <link rel="stylesheet" href="/assets/font-awesome/css/font-awesome.css">
// enumerate the list of tags in window.myCustomTags <!--[if IE 7]>
<link rel="stylesheet" href="/assets/font-awesome/css/font-awesome-ie7.min.css">
<![endif]-->
{% endblock header_stylesheet %}
window.myCustomTags = ['alert']; // optional {% block header_javascript %}
</script> <script src="/assets/modernizr/modernizr.js"></script>
<script src="/assets/angular-ui/build/angular-ui-ieshiv.js"></script> <script src="/assets/jquery/jquery.js"></script>
<![endif]--> <script src="/assets/bootstrap/js/bootstrap-transition.js"></script>
<script src="/assets/bootstrap/js/bootstrap-alert.js"></script>
<script src="/assets/bootstrap/js/bootstrap-modal.js"></script>
<script src="/assets/bootstrap/js/bootstrap-dropdown.js"></script>
<script src="/assets/bootstrap/js/bootstrap-scrollspy.js"></script>
<script src="/assets/bootstrap/js/bootstrap-tab.js"></script>
<script src="/assets/bootstrap/js/bootstrap-tooltip.js"></script>
<script src="/assets/bootstrap/js/bootstrap-popover.js"></script>
<script src="/assets/bootstrap/js/bootstrap-button.js"></script>
<script src="/assets/bootstrap/js/bootstrap-collapse.js"></script>
<script src="/assets/bootstrap/js/bootstrap-carousel.js"></script>
<script src="/assets/bootstrap/js/bootstrap-typeahead.js"></script>
<script src="/assets/bootstrap/js/bootstrap-affix.js"></script>
<script src="/assets/angular/angular.js"></script>
<script src="/assets/angular-ui/build/angular-ui.js"></script>
<script src="/skins/login/js/bootstrap-switch.js"></script>
<script src="/assets/underscore/underscore.js"></script>
<script src="/skins/login/js/main.js"></script>
<!--[if lte IE 8]>
<script>
// The ieshiv takes care of our ui.directives, bootstrap module directives and
// AngularJS's ng-view, ng-include, ng-pluralize and ng-switch directives.
// However, IF you have custom directives (yours or someone else's) then
// enumerate the list of tags in window.myCustomTags
window.myCustomTags = ['alert']; // optional
</script>
<script src="/assets/angular-ui/build/angular-ui-ieshiv.js"></script>
<![endif]-->
{% endblock header_javascript %}
{% endblock header %}
</head> </head>
<body> <body>
<!--[if lt IE 7]> <!--[if lt IE 7]>
@@ -63,23 +81,29 @@
{% endblock %} {% endblock %}
<div class="row-fluid"> <div class="row-fluid">
<div class="span12 footer well-small"> <div class="span12">
<div class="row-fluid"> <div class="footer well-small">
<div class="span9" > {% block footer %}
<div class="footer-block"> <div class="row-fluid">
<ul class="inline footer-list unstyled"> <div class="span9" >
<li class="item-first" >{% trans "Home" %}</li> {% block footer_content %}
<li>{% trans "Help" %}</li> <div class="footer-block">
<li><a href="{{ path("login_cgus") }}">{% trans "Terms of use" %}</a></li> <ul class="inline footer-list unstyled">
<li>&copy; Copyright Alchemy 2005-{{ "now"|date("Y") }}</li> <li class="item-first" >{% trans "Home" %}</li>
</ul> <li>{% trans "Help" %}</li>
</div> <li><a href="{{ path("login_cgus") }}">{% trans "Terms of use" %}</a></li>
</div> <li>&copy; Copyright Alchemy 2005-{{ "now"|date("Y") }}</li>
<div class="span3"> </ul>
<div class="footer-block text-right"> </div>
Phraseanet {% endblock footer_content %}
</div>
<div class="span3">
<div class="footer-block text-right">
{% block footer_logo %}Phraseanet{% endblock footer_logo %}
</div>
</div>
</div> </div>
</div> {% endblock footer %}
</div> </div>
</div><!--/span--> </div><!--/span-->
</div><!--/row--> </div><!--/row-->

17
templates/web/login/layout/sidebar-layout.html.twig
View File

@@ -1,5 +1,9 @@
{% extends "login/layout/base-layout.html.twig" %} {% extends "login/layout/base-layout.html.twig" %}
{% block title %}
{{ app['phraseanet.registry'].get('GV_homeTitle')|default('Phraseanet') }}
{% endblock %}
{% block scaffholding %} {% block scaffholding %}
<div class="row-fluid"> <div class="row-fluid">
<div class="span8 left-content"> <div class="span8 left-content">
@@ -15,11 +19,11 @@
<div class="header"> <div class="header">
{% block header %} {% block header %}
<div class="text-title"> <div class="text-title">
Welcome on {{ app['phraseanet.registry'].get('GV_homeTitle')|default('Tf1') }} Media gallery {% block main_title %}{% endblock %}
</div> </div>
<a class="visible-phone text-right" data-toggle="collapse" data-target="#headerDetail">More ...</a> <a class="visible-phone text-right" data-toggle="collapse" data-target="#headerDetail">{% trans "More" %} ...</a>
<p id="headerDetail" class="collapse"> <p id="headerDetail" class="collapse">
Vivamus justo mauris, elementum eu auctor tincidunt, viverra et erat. Nunc pretium dui eget purus rutrum malesuada. Donec pellentesque arcu quis lectus blandit ac mollis magna vehicula. Fusce non leo id leo blandit feugiat et nec massa. Sed viverra viverra fermentum. In sit amet varius turpis. {% block short_presentation %}{% endblock %}
</p> </p>
{% endblock %} {% endblock %}
</div> </div>
@@ -28,14 +32,14 @@
<div class="row-fluid hidden-phone"> <div class="row-fluid hidden-phone">
<div class="span12"> <div class="span12">
<div class="content"> <div class="content">
{% include "login/common/main-content.html.twig" with {"home_title" : home_title} %} {% include "login/include/main-content.html.twig" %}
</div> </div>
</div> </div>
</div> </div>
</div><!--/span--> </div><!--/span-->
<div class="span4 right-content"> <div class="span4 right-content">
<div class="authentication-sidebar"> <div class="authentication-sidebar">
{% include "login/common/language-block.html.twig" %} {% include "login/include/language-block.html.twig" %}
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
{% block sidebar %} {% endblock %} {% block sidebar %} {% endblock %}
@@ -45,6 +49,3 @@
</div><!--/span--> </div><!--/span-->
</div> </div>
{% endblock %} {% endblock %}
{% block javascript %}
{% endblock %}

1
templates/web/login/providers/mapping.html.twig
View File

@@ -126,3 +126,4 @@
</div> </div>
</div><!-- /sidebar block --> </div><!-- /sidebar block -->
{% endblock %} {% endblock %}