hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #425 from nlegoff/fix_847

Browse Source 
[3.8] Fix #847 About link in lightbox
This commit is contained in:
Romain Neutron
2013-06-25 01:25:58 -07:00
parent 94ed0a90e4 0bc951baba
commit 7a241bd103
9 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/web/common/menubar.html.twig
View File

@@ -171,7 +171,7 @@
</div> </div>
{% endif %} {% endif %}
<div title="" class="context-menu-item menu3-custom-item"> <div title="" class="context-menu-item menu3-custom-item">
<div style="" class="context-menu-item-inner infoDialog" infos="<div><span style='color:#F7F7F7;font-size:18px;'>PHRASEANET</span> {{ app['phraseanet.version'].getName() }} (V{{ app['phraseanet.version'].getNumber() }})</div><div></div><br/><div><a href='http://www.gnu.org/licenses/gpl.html' target='_blank'><img src='http://www.gnu.org/graphics/gplv3-88x31.png' style='vertical-align:middle;'/><span>License GNU GPL v3</span></a></div><br/><div><a href='http://www.phraseanet.com/' target='_blank'> &copy; Copyright Alchemy 2005-{{ "now"|date("Y") }}</a></div>">{% trans 'phraseanet:: a propos' %}</div> <div style="" class="context-menu-item-inner infoDialog" infos="<div><span style='font-size:18px;'>PHRASEANET</span> {{ app['phraseanet.version'].getName() }} (V{{ app['phraseanet.version'].getNumber() }})</div><div></div><br/><div><a href='http://www.gnu.org/licenses/gpl.html' target='_blank'><img src='http://www.gnu.org/graphics/gplv3-88x31.png' style='vertical-align:middle;'/><span>License GNU GPL v3</span></a></div><br/><div><a href='http://www.phraseanet.com/' target='_blank'> &copy; Copyright Alchemy 2005-{{ "now"|date("Y") }}</a></div>">{% trans 'phraseanet:: a propos' %}</div>
</div> </div>
</div> </div>
</td> </td>

2
templates/web/lightbox/IE6/feed.html.twig
View File

@@ -1,4 +1,4 @@
{% extends "common/index_bootstrap.html.twig" %} {% extends "lightbox/index_layout.html.twig" %}
{% import 'common/thumbnail.html.twig' as thumbnail %} {% import 'common/thumbnail.html.twig' as thumbnail %}
{% import 'common/caption_templates/preview.html.twig' as caption %} {% import 'common/caption_templates/preview.html.twig' as caption %}

2
templates/web/lightbox/IE6/index.html.twig
View File

@@ -1,4 +1,4 @@
{% extends "common/index_bootstrap.html.twig" %} {% extends "lightbox/index_layout.html.twig" %}
{% import 'common/thumbnail.html.twig' as thumbnail %} {% import 'common/thumbnail.html.twig' as thumbnail %}

2
templates/web/lightbox/IE6/validate.html.twig
View File

@@ -1,4 +1,4 @@
{% extends "common/index_bootstrap.html.twig" %} {% extends "lightbox/index_layout.html.twig" %}
{% import 'common/thumbnail.html.twig' as thumbnail %} {% import 'common/thumbnail.html.twig' as thumbnail %}
{% import 'common/caption_templates/preview.html.twig' as caption %} {% import 'common/caption_templates/preview.html.twig' as caption %}

2
templates/web/lightbox/error.html.twig
View File

@@ -1,4 +1,4 @@
{% extends "common/index_bootstrap.html.twig" %} {% extends "lightbox/index_layout.html.twig" %}
{% block stylesheet %} {% block stylesheet %}
<link type="text/css" rel="stylesheet" <link type="text/css" rel="stylesheet"

2
templates/web/lightbox/feed.html.twig
View File

@@ -1,4 +1,4 @@
{% extends "common/index_bootstrap.html.twig" %} {% extends "lightbox/index_layout.html.twig" %}
{% import 'common/thumbnail.html.twig' as thumbnail %} {% import 'common/thumbnail.html.twig' as thumbnail %}
{% import 'common/caption_templates/preview.html.twig' as caption %} {% import 'common/caption_templates/preview.html.twig' as caption %}

2
templates/web/lightbox/index.html.twig
View File

@@ -1,4 +1,4 @@
{% extends "common/index_bootstrap.html.twig" %} {% extends "lightbox/index_layout.html.twig" %}
{% import 'common/thumbnail.html.twig' as thumbnail %} {% import 'common/thumbnail.html.twig' as thumbnail %}

5
templates/web/lightbox/index_layout.html.twig Normal file
View File

@@ -0,0 +1,5 @@
{% extends "common/index_bootstrap.html.twig" %}
{% block extra_content %}
<div id="DIALOG"></div>
{% endblock %}

2
templates/web/lightbox/validate.html.twig
View File

@@ -1,4 +1,4 @@
{% extends "common/index_bootstrap.html.twig" %} {% extends "lightbox/index_layout.html.twig" %}
{% import 'common/thumbnail.html.twig' as thumbnail %} {% import 'common/thumbnail.html.twig' as thumbnail %}
{% import 'common/caption_templates/preview.html.twig' as caption %} {% import 'common/caption_templates/preview.html.twig' as caption %}