gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-09 04:56:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2022-10-13 16:36:16 +02:00
commit d48af54737
5 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -242,6 +242,7 @@
- user information in user manager failed to load when a document content
with 0 bytes was created by the user
- fix repair of wrong file extension
- fix regression in password forgotten function
--------------------------------------------------------------------------------
Changes in version 5.1.27

2
op/op.PasswordForgotten.php
View File

@ -27,7 +27,7 @@ include("../inc/inc.Extension.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.ClassSession.php");
include("../inc/inc.ClassUI.php");
//include("../inc/inc.ClassEmailNotify.php");
include("../inc/inc.ClassEmailNotify.php");
include $settings->_rootDir . "languages/" . $settings->_language . "/lang.inc";

22
views/bootstrap/class.ExtensionMgr.php
View File

@ -175,6 +175,24 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Theme_Style {
}
} /* }}} */
function readme() { /* {{{ */
$dms = $this->params['dms'];
$user = $this->params['user'];
$extdir = $this->params['extdir'];
$extmgr = $this->params['extmgr'];
$extname = $this->params['extname'];
$extconf = $extmgr->getExtensionConfiguration();
if(isset($extconf[$extname])) {
$extconf = $extconf[$extname];
if(file_exists($extdir."/".$extname."/README.md")) {
// echo '<div style="white-space: pre-wrap; font-family: monospace; padding: 0px;">'.file_get_contents($extdir."/".$extname."/README.md")."</div>";
$Parsedown = new Parsedown();
echo $Parsedown->text(file_get_contents($extdir."/".$extname."/README.md"));
}
}
} /* }}} */
function installedList() { /* {{{ */
$dms = $this->params['dms'];
$user = $this->params['user'];
@ -219,6 +237,9 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Theme_Style {
echo "</td>";
echo "<td nowrap>";
echo "<div class=\"list-action\">";
if(file_exists($extdir."/".$extname."/README.md")) {
echo $this->getModalBoxLink(array('target'=>'extensionReadme', 'remote'=>'out.ExtensionMgr.php?action=readme&extensionname='.$extname, 'class'=>'', 'title'=>'<i class="fa fa-question"></i>', 'attributes'=>array('title'=>getMLText('show_extension_readme'))));
}
if(!empty($extconf['changelog']) && file_exists($extdir."/".$extname."/".$extconf['changelog'])) {
echo $this->getModalBoxLink(array('target'=>'extensionChangelog', 'remote'=>'out.ExtensionMgr.php?action=changelog&extensionname='.$extname, 'class'=>'', 'title'=>'<i class="fa fa-reorder"></i>', 'attributes'=>array('title'=>getMLText('show_extension_changelog'))));
}
@ -366,6 +387,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Theme_Style {
$this->rowEnd();
echo $this->getModalBox(array('id'=>'extensionInfo', 'title'=>getMLText('extension_version_list'), 'content'=>'<p>'.getMLText('extension_loading').'</p>', 'buttons'=>array(array('title'=>getMLText('close')))));
echo $this->getModalBox(array('id'=>'extensionChangelog', 'title'=>getMLText('extension_changelog'), 'content'=>'<p>'.getMLText('changelog_loading').'</p>', 'buttons'=>array(array('title'=>getMLText('close')))));
echo $this->getModalBox(array('id'=>'extensionReadme', 'title'=>getMLText('extension_readme'), 'content'=>'<p>'.getMLText('readme_loading').'</p>', 'buttons'=>array(array('title'=>getMLText('close')))));
$this->contentEnd();
$this->htmlEndPage();
} /* }}} */

2
views/bootstrap/class.ViewDocument.php
View File

@ -315,7 +315,7 @@ $(document).ready( function() {
if (count($files) > 0) {
print "<table class=\"table\">";
print "<table class=\"table table-condensed table-sm\">";
print "<thead>\n<tr>\n";
print "<th width='20%'></th>\n";
print "<th width='20%'>".getMLText("file")."</th>\n";

4
views/bootstrap4/styles/application.css
View File

@ -14,6 +14,10 @@ body { /* Add top padding for full-width layout */
}
}
.nav.nav-pills {
margin-bottom: 10px;
}
a.navbar-brand img {
height: 2.0rem;
}