gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-02-11 09:35:00 +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 2019-10-28 12:08:43 +01:00
commit 572d776e55
30 changed files with 67 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.editorconfig Normal file
View File

@ -0,0 +1,8 @@
root = true
[*]
charset = utf-8
end_of_line = lf
trim_trailing_whitespaces = true
indent_style = tab
indent_size = 2

4
inc/inc.ClassSettings.php
View File

@ -133,6 +133,8 @@ class Settings { /* {{{ */
var $_enableConverting = false;
// default style
var $_theme = "bootstrap";
// experimental one page mode for ViewFolder page
var $_onePageMode = false;
// Workaround for page titles that go over more than 2 lines.
var $_titleDisplayHack = true;
// enable/disable automatic email notification
@ -479,6 +481,7 @@ class Settings { /* {{{ */
if(trim(strval($tab["availablelanguages"])))
$this->_availablelanguages = explode(',',strval($tab["availablelanguages"]));
$this->_theme = strval($tab["theme"]);
$this->_onePageMode = Settings::boolVal($tab["onePageMode"]);
if(isset($tab["previewWidthList"]))
$this->_previewWidthList = intval($tab["previewWidthList"]);
if(isset($tab["previewWidthMenuList"]))
@ -849,6 +852,7 @@ class Settings { /* {{{ */
$this->setXMLAttributValue($node, "language", $this->_language);
$this->setXMLAttributValue($node, "availablelanguages", implode(',', $this->_availablelanguages));
$this->setXMLAttributValue($node, "theme", $this->_theme);
$this->setXMLAttributValue($node, "onePageMode", $this->_onePageMode);
$this->setXMLAttributValue($node, "previewWidthList", $this->_previewWidthList);
$this->setXMLAttributValue($node, "previewWidthMenuList", $this->_previewWidthMenuList);
$this->setXMLAttributValue($node, "previewWidthDetail", $this->_previewWidthDetail);

2
languages/ar_EG/lang.inc
View File

@ -1375,6 +1375,8 @@ URL: [url]',
'settings_Notification' => '',
'settings_notwritable' => 'ﻻ ﻲﻤﻜﻧ ﺢﻔﻇ ﺎﻠﺘﻛﻮﻴﻧ ﻸﻧ ﻢﻠﻓ ﺎﻠﺘﻛﻮﻴﻧ ﻎﻳﺭ ﻕﺎﺒﻟ ﻞﻠﻜﺗﺎﺑﺓ',
'settings_no_content_dir' => '',
'settings_onePageMode' => '',
'settings_onePageMode_desc' => '',
'settings_overrideMimeType' => '',
'settings_overrideMimeType_desc' => '',
'settings_partitionSize' => '',

2
languages/bg_BG/lang.inc
View File

@ -1238,6 +1238,8 @@ $text = array(
'settings_Notification' => 'Настройка за известяване',
'settings_notwritable' => 'Конфигурацията не може да бъде съхранена, защото файлът на конфигурацията е само за четене.',
'settings_no_content_dir' => 'Каталог със съдържанието',
'settings_onePageMode' => '',
'settings_onePageMode_desc' => '',
'settings_overrideMimeType' => '',
'settings_overrideMimeType_desc' => '',
'settings_partitionSize' => 'Частичен размер на файла',

2
languages/ca_ES/lang.inc
View File

@ -1243,6 +1243,8 @@ URL: [url]',
'settings_Notification' => '',
'settings_notwritable' => '',
'settings_no_content_dir' => '',
'settings_onePageMode' => '',
'settings_onePageMode_desc' => '',
'settings_overrideMimeType' => '',
'settings_overrideMimeType_desc' => '',
'settings_partitionSize' => '',

2
languages/cs_CZ/lang.inc
View File

@ -1454,6 +1454,8 @@ Jméno: [username]
'settings_Notification' => 'Nastavení upozornění',
'settings_notwritable' => 'Konfigurace nemůže být uložena, protože se do konfiguračního souboru nedá zapsat.',
'settings_no_content_dir' => 'Content directory',
'settings_onePageMode' => '',
'settings_onePageMode_desc' => '',
'settings_overrideMimeType' => 'Přepsat typ MimeType',
'settings_overrideMimeType_desc' => 'Přepsat MimeType dodaný prohlížečem, pokud je nahrán soubor. Nový MimeType je určen samotným SeedDMS.',
'settings_partitionSize' => 'Částečná velikost souboru',

4
languages/de_DE/lang.inc
View File

@ -19,7 +19,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
// Translators: Admin (2697), dgrutsch (22)
// Translators: Admin (2699), dgrutsch (22)
$text = array(
'2_factor_auth' => '2-Faktor Authentifizierung',
@ -1464,6 +1464,8 @@ Name: [username]
'settings_Notification' => 'Benachrichtigungen-Einstellungen',
'settings_notwritable' => 'Die Konfiguration kann nicht gespeichert werden, weil die Konfigurationsdatei nicht schreibbar ist.',
'settings_no_content_dir' => 'Content directory',
'settings_onePageMode' => 'Einseiten-Modus',
'settings_onePageMode_desc' => 'Der Einseiten-Modus schaltet javascript auf der ViewFolder-Seite ein, der die Ordner- und Dokumentenliste, die Navigation, etc. aktualisiert, wenn auf einen Ordner geklickt wird.',
'settings_overrideMimeType' => 'Überschreibe MimeType',
'settings_overrideMimeType_desc' => 'Überschreibe den MimeType, der vom Browser beim Hochladen einer Datei übertragen wird. Der neue MimeType wird von SeedDMS selbst ermittelt.',
'settings_partitionSize' => 'Partitionsgröße',

2
languages/el_GR/lang.inc
View File

@ -1249,6 +1249,8 @@ URL: [url]',
'settings_Notification' => '',
'settings_notwritable' => '',
'settings_no_content_dir' => '',
'settings_onePageMode' => '',
'settings_onePageMode_desc' => '',
'settings_overrideMimeType' => '',
'settings_overrideMimeType_desc' => '',
'settings_partitionSize' => '',

4
languages/en_GB/lang.inc
View File

@ -19,7 +19,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
// Translators: Admin (1791), archonwang (3), dgrutsch (9), netixw (14)
// Translators: Admin (1793), archonwang (3), dgrutsch (9), netixw (14)
$text = array(
'2_factor_auth' => '2-factor authentication',
@ -1459,6 +1459,8 @@ Name: [username]
'settings_Notification' => 'Notification settings',
'settings_notwritable' => 'The configuration cannot be saved because the configuration file is not writable.',
'settings_no_content_dir' => 'Content directory',
'settings_onePageMode' => 'One page mode',
'settings_onePageMode_desc' => 'One page mode will turn on javascript code on the ViewFolder page, which updates the folder/document list, navigation, etc. when clicking on a folder or changing the sort parameter.',
'settings_overrideMimeType' => 'Override MimeType',
'settings_overrideMimeType_desc' => 'Override the MimeType delivered by the browser, if a file is uploaded. The new MimeType is determined by SeedDMS itself.',
'settings_partitionSize' => 'Partial filesize',

2
languages/es_ES/lang.inc
View File

@ -1390,6 +1390,8 @@ URL: [url]',
'settings_Notification' => 'Parámetros de notificación',
'settings_notwritable' => 'La configuración no se puede guardar porque el fichero de configuración no es escribible.',
'settings_no_content_dir' => 'Carpeta de contenidos',
'settings_onePageMode' => '',
'settings_onePageMode_desc' => '',
'settings_overrideMimeType' => 'Anular MimeType',
'settings_overrideMimeType_desc' => 'Permitir que SeedDMS fije el tipo MIME sobreescribiendo el que haya definido el navegador durante el proceso de carga de un archivo.',
'settings_partitionSize' => 'Tamaño de fichero parcial',

2
languages/fr_FR/lang.inc
View File

@ -1443,6 +1443,8 @@ Nom : [username]
'settings_Notification' => 'Notifications',
'settings_notwritable' => 'La configuration ne peut pas être enregistrée car le fichier de configuration n’est pas accessible en écriture.',
'settings_no_content_dir' => 'Répertoire de contenu',
'settings_onePageMode' => '',
'settings_onePageMode_desc' => '',
'settings_overrideMimeType' => 'Passer outre le type MIME',
'settings_overrideMimeType_desc' => 'Ne pas tenir compte du type MIME envoyé par le navigateur quand un fichier est téléversé. Le type MIME sera déterminé par SeedDMS.',
'settings_partitionSize' => 'Taille des fichiers partiels téléchargées par jumploader',

2
languages/hr_HR/lang.inc
View File

@ -1411,6 +1411,8 @@ Internet poveznica: [url]',
'settings_Notification' => 'Postavke bilježenja',
'settings_notwritable' => 'Konfiguracija se ne može pohraniti jer datoteka konfiguracije nema mogućnost upisivanja.',
'settings_no_content_dir' => 'Mapa sadržaja',
'settings_onePageMode' => '',
'settings_onePageMode_desc' => '',
'settings_overrideMimeType' => 'Premosti tip datoteke',
'settings_overrideMimeType_desc' => 'Premošćivanje tipa datoteke određenog od strane pretraživača ako je datoteka učitana. Novi tip datoteke se određuje od strane DMS sustava.',
'settings_partitionSize' => 'Veličina djelomične datoteke',

2
languages/hu_HU/lang.inc
View File

@ -1389,6 +1389,8 @@ URL: [url]',
'settings_Notification' => 'Értesítés beállításai',
'settings_notwritable' => 'A konfiguráció nem menthető, mert a konfigurációs állomány nem írható.',
'settings_no_content_dir' => 'Tartalom könyvtár',
'settings_onePageMode' => '',
'settings_onePageMode_desc' => '',
'settings_overrideMimeType' => '',
'settings_overrideMimeType_desc' => '',
'settings_partitionSize' => 'Részleges fájlméret',

2
languages/it_IT/lang.inc
View File

@ -1445,6 +1445,8 @@ Name: [username]
'settings_Notification' => 'Impostazioni di notifica',
'settings_notwritable' => 'La configurazione non può essere salvata perchè il file di configurazione non può essere sovrascritto.',
'settings_no_content_dir' => 'Cartella contenitore',
'settings_onePageMode' => '',
'settings_onePageMode_desc' => '',
'settings_overrideMimeType' => 'Ignora MimeType',
'settings_overrideMimeType_desc' => 'Ignora il MimeType impostato dal browser, se un file viene caricato. Il MimeType è determinato ed impostato dal DMS stesso.',
'settings_partitionSize' => 'Dimensione file parziale',

2
languages/ko_KR/lang.inc
View File

@ -1405,6 +1405,8 @@ URL : [url]',
'settings_Notification' => '알림 설정',
'settings_notwritable' => '구성값을 저장할 수 없습니다 구성 파일에 쓰기 권한이 없습니다.',
'settings_no_content_dir' => '내용 디렉토리',
'settings_onePageMode' => '',
'settings_onePageMode_desc' => '',
'settings_overrideMimeType' => 'MIME 타입 재정의',
'settings_overrideMimeType_desc' => '파일이 업로드 되는 경우, 브라우저에 의해 제공되는 MIME 타입을 재정의 합니다. 새로운 MIME 타입은 SeedDMS에 의해 결정 됩니다.',
'settings_partitionSize' => '조각 파일 크기',

2
languages/lo_LA/lang.inc
View File

@ -1438,6 +1438,8 @@ URL: [url]',
'settings_Notification' => 'ການຕັ້ງຄ່າການແຈ້ງເຕືອນ',
'settings_notwritable' => 'ການກຳນົດຄ່າທີ່ບໍ່ສາມາດບັນທືກໄດ້ຍ້ອນວ່າໄຟລກຳນົດຄ່າບໍ່ສາມາດຂຽນໄດ້',
'settings_no_content_dir' => 'ຜູ້ກຳກັບເນື້ອຫາ',
'settings_onePageMode' => '',
'settings_onePageMode_desc' => '',
'settings_overrideMimeType' => 'ชนิดละครใบ้แทนที่',
'settings_overrideMimeType_desc' => 'แทนที่ ชนิดละครใบ้ ที่จัดส่งโดยเบราว์เซอร์ถ้าไฟล์ถูกอัปโหลด ชนิดละครใบ้ใหม่จะถูกกำหนดโดย SeedDMS เอง.',
'settings_partitionSize' => 'ໄຟລບາງສ່ວນ',

2
languages/nl_NL/lang.inc
View File

@ -1435,6 +1435,8 @@ Name: [username]
'settings_Notification' => 'Notificatie instellingen',
'settings_notwritable' => 'De configuratie kan niet opgeslagen worden omdat het configuratiebestand niet beschrijfbaar is.',
'settings_no_content_dir' => 'Inhoud map',
'settings_onePageMode' => '',
'settings_onePageMode_desc' => '',
'settings_overrideMimeType' => 'Override MimeType',
'settings_overrideMimeType_desc' => 'Override MimeType',
'settings_partitionSize' => 'Partitie-grootte',

2
languages/pl_PL/lang.inc
View File

@ -1369,6 +1369,8 @@ URL: [url]',
'settings_Notification' => 'Ustawienia powiadomień',
'settings_notwritable' => 'Konfiguracja nie może zostać zapisana ponieważ plik konfiguracyjny nie jest zapisywalny.',
'settings_no_content_dir' => 'Katalog treści',
'settings_onePageMode' => '',
'settings_onePageMode_desc' => '',
'settings_overrideMimeType' => '',
'settings_overrideMimeType_desc' => '',
'settings_partitionSize' => 'Rozmiar części pliku',

2
languages/pt_BR/lang.inc
View File

@ -1457,6 +1457,8 @@ Nome: [username]
'settings_Notification' => 'Configurações de notificação',
'settings_notwritable' => 'A configuração não pode ser salva porque o arquivo de configuração não é gravável.',
'settings_no_content_dir' => 'Diretório de conteúdo',
'settings_onePageMode' => '',
'settings_onePageMode_desc' => '',
'settings_overrideMimeType' => 'Substituir MimeType',
'settings_overrideMimeType_desc' => 'Substitua o MimeType entregue pelo navegador, se um arquivo for carregado. O novo MimeType é determinado pelo próprio SeedDMS.',
'settings_partitionSize' => 'Tamanho de arquivo parcial',

2
languages/ro_RO/lang.inc
View File

@ -1412,6 +1412,8 @@ URL: [url]',
'settings_Notification' => 'Setările de notificare',
'settings_notwritable' => 'Configurația nu poate fi salvată deoarece fișierul de configurare nu poate fi scris.',
'settings_no_content_dir' => 'Director conținut',
'settings_onePageMode' => '',
'settings_onePageMode_desc' => '',
'settings_overrideMimeType' => 'Suprascrie MMimeType',
'settings_overrideMimeType_desc' => 'Suprascrie MimeType expus de browser, dacă un fișier este încărcat. MimeType este determinat de SeedDMS.',
'settings_partitionSize' => 'Dimensiune fișier parțială',

2
languages/ru_RU/lang.inc
View File

@ -1419,6 +1419,8 @@ URL: [url]',
'settings_Notification' => 'Настройки извещения',
'settings_notwritable' => 'Конфигурация не может быть сохранена, потому что файл конфигурации только для чтения.',
'settings_no_content_dir' => 'Каталог содержимого',
'settings_onePageMode' => '',
'settings_onePageMode_desc' => '',
'settings_overrideMimeType' => 'Переопределить mime тип',
'settings_overrideMimeType_desc' => 'Переопределение mime типа предоставленного браузером, если файл загружен. Новый mime тип определяется самой SeedDMS.',
'settings_partitionSize' => 'Частичный размер файла',

2
languages/sk_SK/lang.inc
View File

@ -1459,6 +1459,8 @@ Meno: [username]
'settings_Notification' => 'Nastavenia notifikácií',
'settings_notwritable' => 'The configuration cannot be saved because the configuration file is not writable.',
'settings_no_content_dir' => 'Content directory',
'settings_onePageMode' => '',
'settings_onePageMode_desc' => '',
'settings_overrideMimeType' => 'Override MimeType',
'settings_overrideMimeType_desc' => 'Override the MimeType delivered by the browser, if a file is uploaded. The new MimeType is determined by SeedDMS itself.',
'settings_partitionSize' => 'Čiastočná veľkosť súboru',

2
languages/sv_SE/lang.inc
View File

@ -1432,6 +1432,8 @@ Kommentar: [comment]',
'settings_Notification' => 'Meddelandeinställningar',
'settings_notwritable' => 'Konfigurationen kunde inte sparas, eftersom konfigurationsfilen inte är skrivbar.',
'settings_no_content_dir' => 'Mapp för innehåll',
'settings_onePageMode' => '',
'settings_onePageMode_desc' => '',
'settings_overrideMimeType' => 'Åsido Mediatyp (Mime)',
'settings_overrideMimeType_desc' => 'Åsidosätta MimeType levererad av webbläsaren, om en fil överförs. Den nya Mediatyp bestäms av SeedDMS själv.',
'settings_partitionSize' => 'Uppdelad filstorlek',

2
languages/tr_TR/lang.inc
View File

@ -1391,6 +1391,8 @@ URL: [url]',
'settings_Notification' => 'Bildirim ayarları',
'settings_notwritable' => 'Konfigürasyon dosyası yazılabilir olmadığından ayarlar kaydedilmeyecek.',
'settings_no_content_dir' => 'İçerik dizini',
'settings_onePageMode' => '',
'settings_onePageMode_desc' => '',
'settings_overrideMimeType' => '',
'settings_overrideMimeType_desc' => '',
'settings_partitionSize' => 'Kısmi dosya boyutu',

2
languages/uk_UA/lang.inc
View File

@ -1412,6 +1412,8 @@ URL: [url]',
'settings_Notification' => 'Налаштування сповіщення',
'settings_notwritable' => 'Конфігурація не може бути збережена, тому що файл налаштувань доступний лише на читання.',
'settings_no_content_dir' => 'Каталог вмісту',
'settings_onePageMode' => '',
'settings_onePageMode_desc' => '',
'settings_overrideMimeType' => 'Перевизначити mime тип',
'settings_overrideMimeType_desc' => 'Перевизначення mime типу наданого браузером, якщо файл завантажений. Новий mime тип визначається самою SeedDMS.',
'settings_partitionSize' => 'Частковий розмір файлу',

2
languages/zh_CN/lang.inc
View File

@ -1393,6 +1393,8 @@ URL: [url]',
'settings_Notification' => '通知设置',
'settings_notwritable' => '设置_不可写',
'settings_no_content_dir' => '内容目录',
'settings_onePageMode' => '',
'settings_onePageMode_desc' => '',
'settings_overrideMimeType' => '覆盖Mime Type',
'settings_overrideMimeType_desc' => '',
'settings_partitionSize' => '',

2
languages/zh_TW/lang.inc
View File

@ -1242,6 +1242,8 @@ URL: [url]',
'settings_Notification' => '通知設置',
'settings_notwritable' => '',
'settings_no_content_dir' => '',
'settings_onePageMode' => '',
'settings_onePageMode_desc' => '',
'settings_overrideMimeType' => '',
'settings_overrideMimeType_desc' => '',
'settings_partitionSize' => '',

1
op/op.Settings.php
View File

@ -64,6 +64,7 @@ if ($action == "saveSettings")
else
$settings->_availablelanguages = $_POST["availablelanguages"];
$settings->_theme = $_POST["theme"];
$settings->_onePageMode = $_POST["onePageMode"];
$settings->_previewWidthList = $_POST["previewWidthList"];
$settings->_previewWidthMenuList = $_POST["previewWidthMenuList"];
$settings->_previewWidthDropFolderList = $_POST["previewWidthDropFolderList"];

2
out/out.ViewFolder.php
View File

@ -98,7 +98,7 @@ if($view) {
$view->setParam('incItemsPerPage', $settings->_incItemsPerPage != 0 ? $settings->_incItemsPerPage : $settings->_maxItemsPerPage);
$view->setParam('offset', $offset);
$view->setParam('limit', $limit);
$view->setParam('onepage', true); // do most navigation by reloading areas of pages with ajax
$view->setParam('onepage', $settings->_onePageMode); // do most navigation by reloading areas of pages with ajax
$view($_GET);
exit;
}

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

@ -273,6 +273,7 @@ $this->showStartPaneContent('site', (!$currenttab || $currenttab == 'site'));
<?php $this->showConfigOption('settings_available_languages', 'availablelanguages', getAvailableLanguages(), true, true); ?>
<?php $this->showConfigOption('settings_language', 'language', getAvailableLanguages(), false, true); ?>
<?php $this->showConfigOption('settings_theme', 'theme', UI::getStyles(), false, false); ?>
<?php $this->showConfigCheckbox('settings_onePageMode', 'onePageMode'); ?>
<?php $this->showConfigText('settings_previewWidthList', 'previewWidthList'); ?>
<?php $this->showConfigText('settings_previewWidthMenuList', 'previewWidthMenuList'); ?>
<?php $this->showConfigText('settings_previewWidthDropFolderList', 'previewWidthDropFolderList'); ?>