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

add support for configuring folder sort method of folders

Browse Source
This commit is contained in:
Uwe Steinmann 2014-02-01 15:23:19 +01:00
parent b5ceaaecaf
commit 3596a7a191
6 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
languages/de_DE/lang.inc
View File

@ -19,7 +19,7 @@
// along with this program; if not, write to the Free Software // along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
// //
// Translators: Admin (1809) // Translators: Admin (1816)
$text = array( $text = array(
'accept' => 'Übernehmen', 'accept' => 'Übernehmen',
@ -318,6 +318,7 @@ Elternordner: [folder_path]
Benutzer: [username] Benutzer: [username]
URL: [url]', URL: [url]',
'expiry_changed_email_subject' => '[sitename]: [name] - Expiry date changed', 'expiry_changed_email_subject' => '[sitename]: [name] - Expiry date changed',
'extension_manager' => 'Erweiterungen verwalten',
'february' => 'Februar', 'february' => 'Februar',
'file' => 'Datei', 'file' => 'Datei',
'files' => 'Dateien', 'files' => 'Dateien',
@ -819,6 +820,7 @@ URL: [url]',
'settings_expandFolderTree_val0' => 'versteckt', 'settings_expandFolderTree_val0' => 'versteckt',
'settings_expandFolderTree_val1' => 'sichtbar und erste Ebene ausgeklappt', 'settings_expandFolderTree_val1' => 'sichtbar und erste Ebene ausgeklappt',
'settings_expandFolderTree_val2' => 'sichtbar und komplett ausgeklappt', 'settings_expandFolderTree_val2' => 'sichtbar und komplett ausgeklappt',
'settings_Extensions' => 'Erweiterungen',
'settings_extraPath' => 'Extra PHP Include-Pfad', 'settings_extraPath' => 'Extra PHP Include-Pfad',
'settings_extraPath_desc' => 'Pfad für zusätzliche Software. Dies ist das Verzeichnis, welches die zusätzlichen PEAR-Pakete beinhaltet.', 'settings_extraPath_desc' => 'Pfad für zusätzliche Software. Dies ist das Verzeichnis, welches die zusätzlichen PEAR-Pakete beinhaltet.',
'settings_firstDayOfWeek' => 'Erster Tag der Woche', 'settings_firstDayOfWeek' => 'Erster Tag der Woche',
@ -907,6 +909,11 @@ URL: [url]',
'settings_smtpServer_desc' => 'SMTP Server-Hostname', 'settings_smtpServer_desc' => 'SMTP Server-Hostname',
'settings_smtpUser' => 'SMTP Server User', 'settings_smtpUser' => 'SMTP Server User',
'settings_smtpUser_desc' => 'SMTP Server User', 'settings_smtpUser_desc' => 'SMTP Server User',
'settings_sortFoldersDefault' => 'Voreingestellte Sortiermethode',
'settings_sortFoldersDefault_desc' => 'Setzt die Sortiermethode für Ordner und Dokumente in der Ordneransicht.',
'settings_sortFoldersDefault_val_name' => 'nach Name',
'settings_sortFoldersDefault_val_sequence' => 'nach Folge',
'settings_sortFoldersDefault_val_unsorted' => 'unsortiert',
'settings_sortUsersInList' => 'Sortiere Benutzer in Listen', 'settings_sortUsersInList' => 'Sortiere Benutzer in Listen',
'settings_sortUsersInList_desc' => 'Stellt ein, ob die Benutzer in Listen nach Login oder Name sortiert werden sollen.', 'settings_sortUsersInList_desc' => 'Stellt ein, ob die Benutzer in Listen nach Login oder Name sortiert werden sollen.',
'settings_sortUsersInList_val_fullname' => 'Sortiere nach Name', 'settings_sortUsersInList_val_fullname' => 'Sortiere nach Name',

9
languages/en_GB/lang.inc
View File

@ -19,7 +19,7 @@
// along with this program; if not, write to the Free Software // along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
// //
// Translators: Admin (965), netixw (14) // Translators: Admin (972), netixw (14)
$text = array( $text = array(
'accept' => 'Accept', 'accept' => 'Accept',
@ -318,6 +318,7 @@ Parent folder: [folder_path]
User: [username] User: [username]
URL: [url]', URL: [url]',
'expiry_changed_email_subject' => '[sitename]: [name] - Expiry date changed', 'expiry_changed_email_subject' => '[sitename]: [name] - Expiry date changed',
'extension_manager' => 'Manage extensions',
'february' => 'February', 'february' => 'February',
'file' => 'File', 'file' => 'File',
'files' => 'Files', 'files' => 'Files',
@ -819,6 +820,7 @@ URL: [url]',
'settings_expandFolderTree_val0' => 'start with tree hidden', 'settings_expandFolderTree_val0' => 'start with tree hidden',
'settings_expandFolderTree_val1' => 'start with tree shown and first level expanded', 'settings_expandFolderTree_val1' => 'start with tree shown and first level expanded',
'settings_expandFolderTree_val2' => 'start with tree shown fully expanded', 'settings_expandFolderTree_val2' => 'start with tree shown fully expanded',
'settings_Extensions' => 'Extensions',
'settings_extraPath' => 'Extra PHP include Path', 'settings_extraPath' => 'Extra PHP include Path',
'settings_extraPath_desc' => 'Path to additional software. This is the directory containing e.g. the adodb directory or additional pear packages', 'settings_extraPath_desc' => 'Path to additional software. This is the directory containing e.g. the adodb directory or additional pear packages',
'settings_firstDayOfWeek' => 'First day of the week', 'settings_firstDayOfWeek' => 'First day of the week',
@ -907,6 +909,11 @@ URL: [url]',
'settings_smtpServer_desc' => 'SMTP Server hostname', 'settings_smtpServer_desc' => 'SMTP Server hostname',
'settings_smtpUser' => 'SMTP Server user', 'settings_smtpUser' => 'SMTP Server user',
'settings_smtpUser_desc' => 'SMTP Server user', 'settings_smtpUser_desc' => 'SMTP Server user',
'settings_sortFoldersDefault' => 'Default sort method',
'settings_sortFoldersDefault_desc' => 'This sets the sort methods for folders and documents in the folder view.',
'settings_sortFoldersDefault_val_name' => 'by name',
'settings_sortFoldersDefault_val_sequence' => 'by sequence',
'settings_sortFoldersDefault_val_unsorted' => 'unsorted',
'settings_sortUsersInList' => 'Sort users in list', 'settings_sortUsersInList' => 'Sort users in list',
'settings_sortUsersInList_desc' => 'Sets if users in selection menus are ordered by login or by its full name', 'settings_sortUsersInList_desc' => 'Sets if users in selection menus are ordered by login or by its full name',
'settings_sortUsersInList_val_fullname' => 'Sort by full name', 'settings_sortUsersInList_val_fullname' => 'Sort by full name',

1
op/op.Settings.php
View File

@ -73,6 +73,7 @@ if ($action == "saveSettings")
$settings->_expandFolderTree = intval($_POST["expandFolderTree"]); $settings->_expandFolderTree = intval($_POST["expandFolderTree"]);
$settings->_stopWordsFile = $_POST["stopWordsFile"]; $settings->_stopWordsFile = $_POST["stopWordsFile"];
$settings->_sortUsersInList = $_POST["sortUsersInList"]; $settings->_sortUsersInList = $_POST["sortUsersInList"];
$settings->_sortFoldersDefault = $_POST["sortFoldersDefault"];
// SETTINGS - SITE - CALENDAR // SETTINGS - SITE - CALENDAR
$settings->_enableCalendar = getBoolValue("enableCalendar"); $settings->_enableCalendar = getBoolValue("enableCalendar");

2
out/out.ViewFolder.php
View File

@ -49,7 +49,7 @@ $showtree=showtree();
if (isset($_GET["orderby"]) && strlen($_GET["orderby"])==1 ) { if (isset($_GET["orderby"]) && strlen($_GET["orderby"])==1 ) {
$orderby=$_GET["orderby"]; $orderby=$_GET["orderby"];
} else $orderby=""; } else $orderby=$settings->_sortFoldersDefault;
if ($folder->getAccessMode($user) < M_READ) { if ($folder->getAccessMode($user) < M_READ) {
UI::exitError(getMLText("folder_title", array("foldername" => htmlspecialchars($folder->getName()))),getMLText("access_denied")); UI::exitError(getMLText("folder_title", array("foldername" => htmlspecialchars($folder->getName()))),getMLText("access_denied"));

9
views/bootstrap/class.Settings.php
View File

@ -184,6 +184,15 @@ if(!is_writeable($settings->_configFilePath)) {
<OPTION VALUE="fullname" <?php if ($settings->_sortUsersInList=='fullname') echo "SELECTED" ?> ><?php printMLText("settings_sortUsersInList_val_fullname");?></OPTION> <OPTION VALUE="fullname" <?php if ($settings->_sortUsersInList=='fullname') echo "SELECTED" ?> ><?php printMLText("settings_sortUsersInList_val_fullname");?></OPTION>
</SELECT> </SELECT>
</tr> </tr>
<tr title="<?php printMLText("settings_sortFoldersDefault_desc");?>">
<td><?php printMLText("settings_sortFoldersDefault");?>:</td>
<td>
<SELECT name="sortFoldersDefault">
<OPTION VALUE="u" <?php if ($settings->_sortFoldersDefault=='') echo "SELECTED" ?> ><?php printMLText("settings_sortFoldersDefault_val_unsorted");?></OPTION>
<OPTION VALUE="n" <?php if ($settings->_sortFoldersDefault=='s') echo "SELECTED" ?> ><?php printMLText("settings_sortFoldersDefault_val_sequence");?></OPTION>
<OPTION VALUE="n" <?php if ($settings->_sortFoldersDefault=='n') echo "SELECTED" ?> ><?php printMLText("settings_sortFoldersDefault_val_name");?></OPTION>
</SELECT>
</tr>
<!-- <!--
-- SETTINGS - SITE - CALENDAR -- SETTINGS - SITE - CALENDAR

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

@ -195,7 +195,7 @@ class SeedDMS_View_ViewFolder extends SeedDMS_Bootstrap_Style {
print "<table class=\"table\">"; print "<table class=\"table\">";
print "<thead>\n<tr>\n"; print "<thead>\n<tr>\n";
print "<th></th>\n"; print "<th></th>\n";
print "<th><a href=\"../out/out.ViewFolder.php?folderid=". $folderid .($orderby=="n"?"":"&orderby=n")."\">".getMLText("name")."</a></th>\n"; print "<th><a href=\"../out/out.ViewFolder.php?folderid=". $folderid .($orderby=="n"?"&orderby=s":"&orderby=n")."\">".getMLText("name")."</a></th>\n";
// print "<th>".getMLText("owner")."</th>\n"; // print "<th>".getMLText("owner")."</th>\n";
print "<th>".getMLText("status")."</th>\n"; print "<th>".getMLText("status")."</th>\n";
// print "<th>".getMLText("version")."</th>\n"; // print "<th>".getMLText("version")."</th>\n";