Commit Graph

246 Commits

Author SHA1 Message Date
Uwe Steinmann
a6d8ed829f add new parameter $base to htmlStartPage(), call hook for documentMenu propperly 2015-07-15 17:00:23 +02:00
Uwe Steinmann
1609610541 pass previewer to printClipboard, call hook for menuitems, ...
backported from develop
2015-07-15 07:24:32 +02:00
Uwe Steinmann
9604076555 printAttributeEditField() can be passed a default value
document menu can be extended by a hook
2015-07-14 21:27:41 +02:00
Uwe Steinmann
a6541296a1 list documents to receipt and revise in menu task list 2015-07-09 18:29:34 +02:00
Uwe Steinmann
59fd3c7170 add missing space between tag attributes 2015-07-09 08:01:21 +02:00
Uwe Steinmann
b8e9d3a6dd add missing space between tag attributes 2015-07-09 08:00:43 +02:00
Uwe Steinmann
4290e705cf add tasks to menu if configured 2015-07-09 07:59:54 +02:00
Uwe Steinmann
bf95beb536 put tasks into submenus 2015-07-08 19:48:18 +02:00
Uwe Steinmann
3583962085 new task menutask in op/op.Ajax.php which calls menuTask() 2015-07-08 18:58:38 +02:00
Uwe Steinmann
7902ab3fab Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-06-30 18:54:11 +02:00
Uwe Steinmann
77a5512f0b move code for easier merging 2015-06-30 18:53:40 +02:00
Uwe Steinmann
463e94ee8a Merge branch 'seeddms-4.3.x' into seeddms-5.0.x
Conflicts:
	CHANGELOG
	Makefile
	SeedDMS_Core/Core/inc.ClassDMS.php
	SeedDMS_Core/package.xml
	inc/inc.Utils.php
	inc/inc.Version.php
	install/install.php
	op/op.ApproveDocument.php
	op/op.Login.php
	op/op.RemoveDocumentLink.php
	op/op.ReviewDocument.php
	out/out.SetReviewersApprovers.php
	views/bootstrap/class.Bootstrap.php
2015-06-30 07:05:27 +02:00
Uwe Steinmann
52559730d9 use new customizable preview converters 2015-06-25 19:52:02 +02:00
Uwe Steinmann
88df1cee82 move printProtocol() into class.Bootstrap.php 2015-06-23 09:53:14 +02:00
Uwe Steinmann
195add869c move printProtocol() into class.Bootstrap.php
Conflicts:
	views/bootstrap/class.Bootstrap.php
	views/bootstrap/class.ViewDocument.php
2015-06-23 09:52:29 +02:00
Uwe Steinmann
73254d7346 move printProtocol() into class.Bootstrap.php 2015-06-23 09:49:34 +02:00
Uwe Steinmann
5b03c3dcc3 show link to Indexer only if fulltext is enabled 2015-06-15 15:29:07 +02:00
Uwe Steinmann
a7ff808787 show link to Indexer only if fulltext is enabled 2015-06-15 15:28:53 +02:00
Uwe Steinmann
1d186d230b show link to Indexer only if fulltext is enabled 2015-06-15 15:28:25 +02:00
Uwe Steinmann
e7ed3f7789 add optional parameter class to contentContainerStart() 2015-06-15 09:21:20 +02:00
Uwe Steinmann
22b7b3ce96 add optional parameter class to contentContainerStart() 2015-06-15 09:21:13 +02:00
Uwe Steinmann
ae481e6ac9 add optional parameter class to contentContainerStart() 2015-06-15 09:20:33 +02:00
Uwe Steinmann
2fceade3a2 show docs in root folder of document chooser 2015-06-11 11:27:14 +02:00
Uwe Steinmann
0c9714c37c show docs in root folder of document chooser 2015-06-11 11:27:07 +02:00
Uwe Steinmann
f02734b063 show docs in root folder of document chooser 2015-06-11 11:25:14 +02:00
Uwe Steinmann
45a9373bdd include DocumentChooser relative to out
this makes it possible to include the document chooser even in
op/op.xxx.php files
2015-06-11 07:56:04 +02:00
Uwe Steinmann
0e8a385b6d allow context sensitive help files 2015-06-11 06:42:33 +02:00
Uwe Steinmann
269355bb43 allow context sensitive help files 2015-06-11 06:42:28 +02:00
Uwe Steinmann
e527862c9d allow context sensitive help files 2015-06-11 06:41:49 +02:00
Uwe Steinmann
c48030d54e add more parameter to printDocumentChooser() 2015-05-29 20:47:03 +02:00
Uwe Steinmann
3bc72a46df do not include jquery-cookie/jquery.cookie.js
it's currently not needed and not available
2015-05-21 22:10:06 +02:00
Uwe Steinmann
536ead64ac allow to substitute user for regular users 2015-05-19 19:44:18 +02:00
Uwe Steinmann
bc7407ad85 add transmittal mgr to user menu, some code cleanup 2015-05-12 19:12:22 +02:00
Uwe Steinmann
654d8ac75a add parameter $version to documentListRow()
in order to show a specific version
2015-04-25 20:49:47 +02:00
Uwe Steinmann
5702708643 add link to out/out.ReceiptSummary.php in MyDocuments menu 2015-04-22 14:57:36 +02:00
Uwe Steinmann
696b5f0996 add checkout item to document menu 2015-04-17 20:11:51 +02:00
Uwe Steinmann
de40aa816a printAttributeEditField() outputs textarea for longer values
up to 30 chars it remains an input field
2015-04-16 08:05:11 +02:00
Uwe Steinmann
7d7a21fc9e printAttributeEditField() takes a second parameter the attribute
this was the attribute value
2015-04-15 14:11:52 +02:00
Uwe Steinmann
cb81eb7db4 Merge branch 'seeddms-4.3.16' into develop
Conflicts:
	Makefile
	views/bootstrap/class.UsrMgr.php
2015-03-20 08:32:29 +01:00
Uwe Steinmann
cb3392c774 propperly take new workflow mode traditional_only_approval into account 2015-03-17 11:19:55 +01:00
Uwe Steinmann
0335cc8bcd Merge branch 'seeddms-4.3.15' into develop
Conflicts:
	Makefile
	views/bootstrap/class.Search.php
	views/bootstrap/class.Settings.php
2015-03-17 06:52:33 +01:00
Uwe Steinmann
89ef1a58ec view parameter enableClipboard has been renamed to enableclipboard 2015-03-13 09:31:48 +01:00
Uwe Steinmann
0266c3a037 Merge branch 'seeddms-4.3.15' into develop 2015-02-24 19:53:59 +01:00
Uwe Steinmann
cb0d7d8d92 enableClipboard takes out all clipboard functions 2015-02-24 17:47:58 +01:00
Uwe Steinmann
6c3024e799 include application.css after all other css files 2015-02-13 17:41:12 +01:00
Uwe Steinmann
b3bfaf9ac5 Merge branch 'seeddms-4.3.15' into develop
Conflicts:
	SeedDMS_Core/Core/inc.ClassDMS.php
2015-02-05 09:37:52 +01:00
Uwe Steinmann
8963879f5d htmlencode() the complete content in deletion dialog
this used to be just the filename, but translations of the text
may also contain qoutes which break the javascript
2015-02-04 07:41:33 +01:00
Uwe Steinmann
93cb26e79d do not used hard coded class names of SeedDMS_Core_xxx anymore 2014-12-08 14:49:26 +01:00
Uwe Steinmann
985206f481 make last paramter of printFolderChooser() optional 2014-11-19 20:25:06 +01:00
Uwe Steinmann
15c5392ed8 Merge branch 'seeddms-4.3.11' into develop
Conflicts:
	Makefile
	views/bootstrap/class.Search.php
	views/bootstrap/class.ViewFolder.php
2014-11-13 09:21:08 +01:00
Uwe Steinmann
7c4e5a15aa strip html tags from sitename when using for html title 2014-11-07 08:54:47 +01:00
Uwe Steinmann
c1eeba573e Merge branch 'seeddms-4.3.10' into develop 2014-10-16 17:28:11 +02:00
Uwe Steinmann
8d4151893e use " instead of ' in javascript for deleting documents and folders 2014-10-16 17:27:07 +02:00
Uwe Steinmann
cbe0574388 Merge branch 'seeddms-4.3.9' into develop
Conflicts:
	views/bootstrap/class.Bootstrap.php
2014-07-23 06:55:44 +02:00
Uwe Steinmann
a011433d28 remove not used file upload code 2014-07-22 17:34:08 +02:00
Uwe Steinmann
e2974f2054 Merge branch 'seeddms-4.3.9' into develop
Conflicts:
	views/bootstrap/class.ViewFolder.php
2014-07-11 12:49:21 +02:00
Uwe Steinmann
458069fba1 div.#main-clipboard doesn't need ondrop-attr anymore 2014-07-11 08:42:17 +02:00
Uwe Steinmann
3a84ec91d4 fix php syntax error 2014-07-08 09:21:47 +02:00
Uwe Steinmann
4d8f9731d5 Merge branch 'seeddms-4.3.9' into develop
Conflicts:
	styles/bootstrap/application.js
	views/bootstrap/class.Bootstrap.php
2014-07-08 08:49:14 +02:00
Uwe Steinmann
73bfecb5a8 more general folder chooser
the choosen folder will no longer use targetidformx for the input field
containing the id. It is now independent of the form name.
2014-07-08 08:30:59 +02:00
Uwe Steinmann
cc61505825 document/folder chooser even works for forms not named 'form1' 2014-07-07 15:45:24 +02:00
Uwe Steinmann
579946d455 Merge branch 'seeddms-4.3.9' into develop
Conflicts:
	views/bootstrap/class.Bootstrap.php
2014-07-03 12:07:27 +02:00
Uwe Steinmann
d3451e0b7b temporarily take out new fileupload 2014-07-03 12:04:11 +02:00
Uwe Steinmann
b494e3c248 add title attribute 2014-06-11 11:02:25 +02:00
Uwe Steinmann
f1a9923f57 Merge branch 'seeddms-4.3.9' into develop
Conflicts:
	views/bootstrap/class.Bootstrap.php
2014-06-06 15:13:15 +02:00
Uwe Steinmann
3301dbeda5 showing the clipboard will filter out those objects which are no longer available 2014-06-06 15:08:44 +02:00
Uwe Steinmann
6325bd2844 Merge branch 'seeddms-4.3.9' into develop
Conflicts:
	views/bootstrap/class.Bootstrap.php
	views/bootstrap/class.ViewFolder.php
2014-06-06 14:15:39 +02:00
Uwe Steinmann
e552294073 add new methods documentListRow(), printLockDocumentBtn() 2014-06-06 14:00:28 +02:00
Uwe Steinmann
df3a55d39b make clipboard ajax aware 2014-06-05 15:02:19 +02:00
Uwe Steinmann
58cdecfe21 Merge branch 'seeddms-4.3.9' into develop
Conflicts:
	views/bootstrap/class.Bootstrap.php
	views/bootstrap/class.ViewFolder.php
2014-06-05 10:03:35 +02:00
Uwe Steinmann
1d8b73c2f9 add new method printDeleteFolderButton(), fix drag and drop from clipboard 2014-06-05 09:50:21 +02:00
Uwe Steinmann
aa6bdf000b Merge branch 'seeddms-4.3.9' into develop
Conflicts:
	views/bootstrap/class.Search.php
	views/bootstrap/class.ViewFolder.php
2014-06-04 21:25:30 +02:00
Uwe Steinmann
b950d22b60 javascript can be collected and output at end of page
add method to show icon for deleting documents in document/folder list
2014-06-04 19:20:07 +02:00
Uwe Steinmann
f13ef894b2 Merge branch 'seeddms-4.3.9' into develop
Conflicts:
	Makefile
	op/op.RemoveDocument.php
	op/op.UpdateDocument.php
	out/out.RemoveDocument.php
2014-06-04 07:58:06 +02:00
Uwe Steinmann
16e22ceafd check if expiration may be set 2014-06-03 17:51:44 +02:00
Uwe Steinmann
1fcc786d25 Merge branch 'seeddms-4.3.9' into develop
Conflicts:
	SeedDMS_Core/Core/inc.ClassDMS.php
	SeedDMS_Core/Core/inc.ClassUser.php
	op/op.AddDocument.php
	styles/bootstrap/application.css
	views/bootstrap/class.UsrMgr.php
2014-05-22 08:21:22 +02:00
Uwe Steinmann
2414d9e510 menu on myaccount page shows 'edit user' item if admin 2014-05-22 06:44:20 +02:00
Uwe Steinmann
8fc212966b add menu item for user list in admin menu 2014-05-20 06:26:23 +02:00
Uwe Steinmann
01e067a2c4 use container-fluid class for top navigation (Bug #157) 2014-05-16 11:05:53 +02:00
Uwe Steinmann
315111a778 add nicer looking file upload chooser 2014-05-16 09:17:43 +02:00
Uwe Steinmann
319b2cbe75 Merge branch 'seeddms-4.3.8' into develop 2014-04-15 18:53:21 +02:00
Uwe Steinmann
02d8da676e show predefined value of multivalue attribute only if not empty 2014-04-15 15:33:05 +02:00
Uwe Steinmann
c180f17f98 Merge branch 'seeddms-4.3.8' into develop
Conflicts:
	styles/bootstrap/application.js
	views/bootstrap/class.Bootstrap.php
2014-04-09 06:26:32 +02:00
Uwe Steinmann
2c4ce681ef add function for listing missing languages at end of page
also check if turned on
2014-04-08 10:47:28 +02:00
Uwe Steinmann
82c9dbe2aa add new page for charts to admin menu 2014-04-02 08:50:57 +02:00
Uwe Steinmann
729fff53ef include jquery.js before extra header 2014-04-01 21:04:55 +02:00
Uwe Steinmann
134bcd025d do not link '...' in page browser 2014-04-01 10:42:51 +02:00
Uwe Steinmann
a8ae1c5a89 better navigation in page browser 2014-04-01 09:20:58 +02:00
Uwe Steinmann
82184bdcae limit pager to one line by restricting the number of pages to 20 2014-04-01 07:39:16 +02:00
Uwe Steinmann
5944edd41b do not show two dividers in right most menu
was shown when no language menu item and no su user item was visible
2014-04-01 06:49:29 +02:00
Uwe Steinmann
eabfee8c76 set attribute target in folder chooser pointing the input field storing the folder id 2014-03-26 17:36:00 +01:00
Uwe Steinmann
a26270f5b6 add optional parameter 'formname' to printFolderChooser()
this allows to set the name of the input field containing the selected
folder
2014-03-26 08:17:55 +01:00
Uwe Steinmann
1d011feaf6 Merge branch 'seeddms-4.3.8' into develop 2014-03-26 07:29:28 +01:00
Uwe Steinmann
815ca1acf8 show link to indexer in folder menu (if admin) 2014-03-26 07:27:01 +01:00
Uwe Steinmann
468846b19f Merge branch 'seeddms-4.3.7' into develop
Conflicts:
	Makefile
	op/op.Download.php
2014-03-21 09:20:19 +01:00
Uwe Steinmann
646128cbd8 add dummy javascript function, Bug #135
when clicking on a folder in the document chooser, the none existing
javascript function folderSelectedform1() was called. This fix just
adds it.
2014-03-21 08:05:08 +01:00
Uwe Steinmann
5499dbeb66 Merge branch 'seeddms-4.3.6' into develop
Conflicts:
	languages/de_DE/lang.inc
2014-03-20 08:50:23 +01:00
Uwe Steinmann
b047f3a23f fix link to folder in clipboard menu 2014-03-20 08:37:47 +01:00
Uwe Steinmann
c1f5a31f13 Merge branch 'seeddms-4.3.6' into develop
Conflicts:
	Makefile
2014-03-18 16:55:06 +01:00
Uwe Steinmann
9032170149 pass sort order to ajax subtree command 2014-03-14 15:11:13 +01:00