gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-02-06 15:14:58 +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 2021-04-22 14:19:35 +02:00
commit 39b81e03c3
5 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
views/bootstrap/class.Bootstrap.php
View File

@ -2872,13 +2872,16 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
* @return string
*/
function getListRowPath($object) { /* {{{ */
$belowtitle = "<br /><span style=\"font-size: 85%;\">".getMLText('in_folder').": /";
$belowtitle = '';
$folder = $object->getParent();
$path = $folder->getPath();
for ($i = 1; $i < count($path); $i++) {
$belowtitle .= htmlspecialchars($path[$i]->getName())."/";
if($folder) {
$belowtitle .= "<br /><span style=\"font-size: 85%;\">".getMLText('in_folder').": /";
$path = $folder->getPath();
for ($i = 1; $i < count($path); $i++) {
$belowtitle .= htmlspecialchars($path[$i]->getName())."/";
}
$belowtitle .= "</span>";
}
$belowtitle .= "</span>";
return $belowtitle;
} /* }}} */

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

@ -237,7 +237,7 @@ class SeedDMS_View_Clipboard extends SeedDMS_Theme_Style {
$content .= "</table>";
} else {
}
$content .= "<div class=\"alert add-clipboard-area\">".getMLText("drag_icon_here")."</div>";
$content .= "<div class=\"alert alert-warning add-clipboard-area\">".getMLText("drag_icon_here")."</div>";
$txt = $this->callHook('postClipboard', $clipboard);
if(is_string($txt))
$content .= $txt;

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

@ -134,7 +134,7 @@ $(document).ready( function() {
'id'=>'login',
'name'=>'login',
'placeholder'=>'login',
'autocomplete'=>'off',
'autocomplete'=>'on',
'required'=>true
)
);

5
views/bootstrap/class.Search.php
View File

@ -298,9 +298,9 @@ function typeahead() { /* {{{ */
<td><?php printMLText("search_resultmode");?>:</td>
<td>
<select name="resultmode" class="form-control">
<option value="3" <?php echo ($resultmode=='3') ? "selected" : ""; ?>><?php printMLText("search_resultmode_both");?>
<option value="2"<?php echo ($resultmode=='2') ? "selected" : ""; ?>><?php printMLText("search_mode_folders");?>
<option value="1"<?php echo ($resultmode=='1') ? "selected" : ""; ?>><?php printMLText("search_mode_documents");?>
<option value="2"<?php echo ($resultmode=='2') ? "selected" : ""; ?>><?php printMLText("search_mode_folders");?>
<option value="3" <?php echo ($resultmode=='3') ? "selected" : ""; ?>><?php printMLText("search_resultmode_both");?>
</select>
</td>
</tr>
@ -851,6 +851,7 @@ foreach($facets as $facetname=>$values) {
$attrstr .= "</table>";
}
$extracontent = array();
$extracontent['below_title'] = $this->getListRowPath($folder);
if($attrstr)
$extracontent['bottom_title'] = '<br />'.$this->printPopupBox('<span class="btn btn-mini btn-secondary">'.getMLText('attributes').'</span>', $attrstr, true);
print $this->folderListRow($folder, false, $extracontent);

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

@ -373,7 +373,7 @@ $('body').on('click', '.order-btn', function(ev) {
else {
print "<table id=\"viewfolder-table\" class=\"table table-condensed table-sm table-hover\">";
print "<thead>\n<tr>\n";
print "<th>".($parent ? '<button class="btn btn-mini btn-secondary" id="goto-parent" data-parentid="'.$parent->getID().'"><i class="fa fa-arrow-up"></i></button>' : '')."</th>\n";
print "<th>".($parent ? '<button class="btn btn-mini btn-secondary btn-sm" id="goto-parent" data-parentid="'.$parent->getID().'"><i class="fa fa-arrow-up"></i></button>' : '')."</th>\n";
print "<th>".getMLText("name");
print " <a class=\"order-btn\" href=\"../out/out.ViewFolder.php?folderid=". $folderid .($orderby=="n"||$orderby=="na"?"&orderby=nd":"&orderby=n")."\" data-orderby=\"".($orderby=="n"||$orderby=="na"?"nd":"n")."\"title=\"".getMLText("sort_by_name")."\">".($orderby=="n"||$orderby=="na"?' <i class="fa fa-sort-alpha-asc selected"></i>':($orderby=="nd"?' <i class="fa fa-sort-alpha-desc selected"></i>':' <i class="fa fa-sort-alpha-asc"></i>'))."</a>";
print " <a class=\"order-btn\" href=\"../out/out.ViewFolder.php?folderid=". $folderid .($orderby=="s"||$orderby=="sa"?"&orderby=sd":"&orderby=s")."\" data-orderby=\"".($orderby=="s"||$orderby=="sa"?"sd":"s")."\" title=\"".getMLText("sort_by_sequence")."\">".($orderby=="s"||$orderby=="sa"?' <i class="fa fa-sort-numeric-asc selected"></i>':($orderby=="sd"?' <i class="fa fa-sort-numeric-desc selected"></i>':' <i class="fa fa-sort-numeric-asc"></i>'))."</a>";