commit df643e680a736c2cd76443ed8336f9f544ed0719
parent f45449f9ddb8334ccd03c1044a3ecf529afeef42
Author: Jan Dankert <develop@jandankert.de>
Date: Sat, 17 Apr 2021 01:59:54 +0200
Cleanup license info, dropped Jquery UI
Diffstat:
3 files changed, 20 insertions(+), 24 deletions(-)
diff --git a/modules/cms/action/login/LoginLicenseAction.class.php b/modules/cms/action/login/LoginLicenseAction.class.php
@@ -8,26 +8,22 @@ use util\Session;
class LoginLicenseAction extends LoginAction implements Method {
public function view() {
- $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');
- $software[] = array('name' =>'jQuery UI Javascript Framework',
- 'url' =>'http://jqueryui.com/',
- 'license'=>'MPL, GPL v2');
- $software[] = array('name' =>'GeSHi - Generic Syntax Highlighter',
- 'url' =>'http://qbnz.com/highlighter/',
- 'license'=>'GPL v2');
- $software[] = array('name' =>'TAR file format',
- 'url' =>'http://www.phpclasses.org/package/529',
- 'license'=>'LGPL');
- $software[] = array('name' =>'JSON file format',
- 'url' =>'http://pear.php.net/pepr/pepr-proposal-show.php?id=198',
- 'license'=>'BSD');
+ $software = array_map( function($lib) {
+ return [
+ 'name' => $lib[0],
+ 'url' => $lib[1],
+ 'license' => $lib[2]
+ ];
+ },[
+ ['OpenRat Content Management System' ,'http://www.openrat.de/' ,'GPL v2' ],
+ ['jQuery Core Javascript Framework' ,'http://jquery.com/' ,'MPL, GPL v2'],
+ ['GeSHi - Generic Syntax Highlighter','http://qbnz.com/highlighter/','GPL v2' ],
+ ['CodeMirror' ,'https://codemirror.net/' ,'MIT' ],
+ ['SimpleMDE' ,'https://simplemde.com/' ,'MIT' ],
+ ['Trumbowyg' ,'https://alex-d.github.io/Trumbowyg/','MIT' ],
+ ['TAR file format' ,'http://www.phpclasses.org/package/529','LGPL'],
+ ['JSON file format' ,'http://pear.php.net/pepr/pepr-proposal-show.php?id=198','BSD'],
+ ] );
$this->setTemplateVar('software',$software);
diff --git a/modules/cms/ui/themes/default/html/views/login/license.php b/modules/cms/ui/themes/default/html/views/login/license.php
@@ -93,11 +93,11 @@
<div class="<?php echo O::escapeHtml('or-table-wrapper') ?>"><?php echo O::escapeHtml('') ?>
<div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?>
<table class="<?php echo O::escapeHtml('or-table') ?>"><?php echo O::escapeHtml('') ?>
- <tr class="<?php echo O::escapeHtml('or-table-header') ?>"><?php echo O::escapeHtml('') ?>
+ <tr class="<?php echo O::escapeHtml('or-table-column-auto or-table-header') ?>"><?php echo O::escapeHtml('') ?>
<td><?php echo O::escapeHtml('') ?>
<span><?php echo O::escapeHtml(''.@O::lang('name').'') ?></span>
</td>
- <td><?php echo O::escapeHtml('') ?>
+ <td class="<?php echo O::escapeHtml('or-table-column-date') ?>"><?php echo O::escapeHtml('') ?>
<span><?php echo O::escapeHtml(''.@O::lang('license').'') ?></span>
</td>
</tr>
diff --git a/modules/cms/ui/themes/default/html/views/login/license.tpl.src.xml b/modules/cms/ui/themes/default/html/views/login/license.tpl.src.xml
@@ -40,11 +40,11 @@
</group>
<group title="${message:LICENSE}">
<table filter="false">
- <row header="true">
+ <row header="true" class="table-column-auto">
<column>
<text value="${message:name}"/>
</column>
- <column>
+ <column class="table-column-date">
<text value="${message:license}"/>
</column>
</row>