commit cfd59b5c16ec019f69f590dd8c3fecfc39d00171
parent 3e5cde2ecc5274c55476c90c2e08d0cfcd103451
Author: Jan Dankert <devnull@localhost>
Date: Sat, 27 Oct 2012 04:26:01 +0200
Anzeige der Lizenzen in einer Tabelle. URL ist wieder klickbar und der Link erscheint im neuen Fenster.
Diffstat:
5 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/action/LoginAction.class.php b/action/LoginAction.class.php
@@ -1813,6 +1813,9 @@ class LoginAction extends Action
{
$software = array();
+ $software[] = array('name' =>'OpenRat Content Management System',
+ 'url' =>'http://www.openrat.de/',
+ 'license'=>'GPL v2');
$software[] = array('name' =>'jQuery Core Javascript Framework',
'url' =>'http://jquery.com/',
'license'=>'MPL, GPL v2');
@@ -1828,7 +1831,7 @@ class LoginAction extends Action
$software[] = array('name' =>'960 Grid System CSS',
'url' =>'http://960.gs/',
'license'=>'GPL v3, MIT');
- $software[] = array('name' =>'TAR file format from Josh Barger',
+ $software[] = array('name' =>'TAR file format',
'url' =>'http://www.phpclasses.org/package/529',
'license'=>'LGPL');
$software[] = array('name' =>'JSON file format',
diff --git a/language/de.ini.php b/language/de.ini.php
@@ -1158,3 +1158,4 @@ MENU_EXTRACT = Auspacken
MENU_EXTRACT_DESC = Archiv auspacken
MENU_SIZE =Bildgröße
MENU_SIZE_DESC =Bildgröße ändern
+LICENSE="Lizenz"
diff --git a/themes/default/include/html/link.inc.php b/themes/default/include/html/link.inc.php
@@ -50,4 +50,4 @@
// if ( substr($tmp_url,0,10) != 'javascript' )
// $tmp_url = "javascript:loadViewByName('".$attr_target."','".$tmp_url.(isset($attr_anchor)?'#'.$attr_anchor:'')."'); return false;";
-?><a target="<?php echo $attr_frame ?>"<?php if (isset($attr_name)) { ?> data-name="<?php echo $attr_name ?>" name="<?php echo $attr_name ?>"<?php }else{ ?> href="javascript:void(0);" <?php } ?> class="<?php echo $attr_class ?>" data-id="<?php echo $attr_id ?>" data-type="<?php echo $attr_type ?>" data-action="<?php echo $attr_action ?>" data-method="<?php echo $attr_subaction ?>" data-data="<?php echo $tmp_data ?>" <?php if (isset($attr_accesskey)) echo ' accesskey="'.$attr_accesskey.'"' ?> title="<?php echo encodeHtml($attr_title) ?>">
-\ No newline at end of file
+?><a data-url="<?php echo $attr_url ?>" target="<?php echo $attr_frame ?>"<?php if (isset($attr_name)) { ?> data-name="<?php echo $attr_name ?>" name="<?php echo $attr_name ?>"<?php }else{ ?> href="javascript:void(0);" <?php } ?> class="<?php echo $attr_class ?>" data-id="<?php echo $attr_id ?>" data-type="<?php echo $attr_type ?>" data-action="<?php echo $attr_action ?>" data-method="<?php echo $attr_subaction ?>" data-data="<?php echo $tmp_data ?>" <?php if (isset($attr_accesskey)) echo ' accesskey="'.$attr_accesskey.'"' ?> title="<?php echo encodeHtml($attr_title) ?>">
+\ No newline at end of file
diff --git a/themes/default/js/plugin/jquery-plugin-orLinkify.js b/themes/default/js/plugin/jquery-plugin-orLinkify.js
@@ -28,7 +28,7 @@ jQuery.fn.orLinkify = function()
else if ( type == 'external' )
{
- location.href = $(this).attr('data-url');
+ window.open( $(this).attr('data-url'),' _blank' );
}
else if ( type == 'popup' )
diff --git a/themes/default/templates/login/license.tpl.src.xml b/themes/default/templates/login/license.tpl.src.xml
@@ -1,7 +1,25 @@
<output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.openrat.de/template ../template.xsd">
- <header><link type="external" url="config:login/gpl/url" target="_top"
- class="copyright"><text key="GPL"></text></link><group></group><list list="software"
- extract="true"><link type="external" url="var:url"><text var="name"></text></link><text
- var="license"></text><newline></newline><newline></newline></list></header>
+ <table>
+ <row class="headline">
+ <column>
+ <text key="name" />
+ </column>
+ <column>
+ <text key="license" />
+ </column>
+ </row>
+ <list list="software" extract="true">
+ <row class="data">
+ <column class="clickable">
+ <link type="external" url="var:url">
+ <text var="name"></text>
+ </link>
+ </column>
+ <column>
+ <text var="license"></text>
+ </column>
+ </row>
+ </list>
+ </table>
</output>
\ No newline at end of file
