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

.htaccess

@@ -14,7 +14,7 @@ RewriteRule "^doc/.*$" "" [F]
 
 # Anything below the following dirs will never be rewritten
 RewriteRule "^pdfviewer/.*$" "-" [L]
-RewriteRule "^views/bootstrap/images.*$" "-" [L]
+RewriteRule "^views/.*/images.*$" "-" [L]
 RewriteRule "^out/images.*$" "-" [L]
 RewriteRule "^styles/.*$" "-" [L]
 

CHANGELOG

@@ -178,6 +178,14 @@
   (go to folder page if the whole document was removed, go to previous tab
   if an old version was removed and there are other older version, otherwise
   to to current tab)
+- expiration of document can be set through webdav
+- prefix each attribute with 'attr_' when read through webdav
+- actually set owner as notified user, not the logged in user,
+  check if notified user has access on document not the logged in user.
+- fix getting group for notification when transition has fired (Closes: #483)
+- move lots of javascript packages into views/bootstrap/vendors and update
+  them with npm and grunt
+- update to font-awesome 4.7.1
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.18

Gruntfile.js

@@ -0,0 +1,242 @@
+module.exports = function (grunt) {
+    'use strict';
+
+    var vendorDir = 'views/bootstrap/vendors',
+        nodeDir = 'node_modules';
+
+    grunt.initConfig({
+        clean: {
+            vendors: [ vendorDir ]
+        },
+        copy: {
+					'jquery': {
+						files: [{
+								expand: true,
+								src: [
+										nodeDir + '/jquery/dist/*'
+								],
+								dest: vendorDir + '/jquery',
+								flatten: true
+						}]
+					},
+					'chartjs': {
+						files: [{
+								expand: true,
+								src: [
+										nodeDir + '/chartjs/chart.js',
+										nodeDir + '/chartjs/README.md',
+										nodeDir + '/chartjs/LICENSE'
+								],
+								dest: vendorDir + '/chartjs',
+								flatten: true
+						}]
+					},
+					'cytoscape': {
+						files: [{
+								expand: true,
+								src: [
+										nodeDir + '/cytoscape/dist/*',
+										nodeDir + '/cytoscape-grid-guide/cytoscape-grid-guide.js'
+								],
+								dest: vendorDir + '/cytoscape',
+								flatten: true
+						}]
+					},
+					'jqtree': {
+						files: [{
+								expand: true,
+								src: [
+										nodeDir + '/jqtree/tree.jquery.js',
+										nodeDir + '/jqtree/jqtree.css'
+								],
+								dest: vendorDir + '/jqtree',
+								flatten: true
+						}]
+					},
+					'noty': {
+						files: [{
+								expand: true,
+								src: [
+										nodeDir + '/noty/js/noty/jquery.noty.js'
+								],
+								dest: vendorDir + '/noty',
+								flatten: true
+						},{
+								expand: true,
+								src: [
+										nodeDir + '/noty/js/noty/themes/*'
+								],
+								dest: vendorDir + '/noty/themes',
+								flatten: true
+						},{
+								expand: true,
+								src: [
+										nodeDir + '/noty/js/noty/layouts/*'
+								],
+								dest: vendorDir + '/noty/layouts',
+								flatten: true
+						}]
+					},
+					'select2': {
+						files: [{
+								expand: true,
+								src: [
+										nodeDir + '/select2/dist/js/*'
+								],
+								dest: vendorDir + '/select2/js',
+								flatten: true
+						},{
+								expand: true,
+								src: [
+										nodeDir + '/select2/dist/css/*'
+								],
+								dest: vendorDir + '/select2/css',
+								flatten: true
+						}]
+					},
+					'fine-uploader': {
+						files: [{
+								expand: true,
+								src: [
+										nodeDir + '/fine-uploader/jquery.fine-uploader/*'
+								],
+								dest: vendorDir + '/fine-uploader',
+								flatten: true
+						}]
+					},
+					'jquery-validation': {
+						files: [{
+								expand: true,
+								src: [
+										nodeDir + '/jquery-validation/dist/*'
+								],
+								dest: vendorDir + '/jquery-validation',
+								flatten: true
+						}]
+					},
+					'flot': {
+						files: [{
+								expand: true,
+								src: [
+										nodeDir + '/flot/source/jquery.canvaswrapper.js',
+										nodeDir + '/flot/source/jquery.colorhelpers.js',
+										nodeDir + '/flot/source/jquery.flot.*'
+								],
+								dest: vendorDir + '/flot',
+								flatten: true
+						}]
+					},
+					'font-awesome': {
+						files: [{
+								expand: true,
+								src: [
+										nodeDir + '/font-awesome/fonts/*'
+								],
+								dest: vendorDir + '/font-awesome/fonts',
+								flatten: true
+						},{
+								expand: true,
+								src: [
+										nodeDir + '/font-awesome/css/*'
+								],
+								dest: vendorDir + '/font-awesome/css',
+								flatten: true
+						}]
+					},
+					'fullcalendar': {
+						files: [{
+								expand: true,
+								src: [
+										nodeDir + '/fullcalendar/LICENSE.txt',
+										nodeDir + '/fullcalendar/dist/*'
+								],
+								dest: vendorDir + '/fullcalendar',
+								flatten: true
+						},{
+								expand: true,
+								src: [
+										nodeDir + '/fullcalendar/dist/locale/*'
+								],
+								dest: vendorDir + '/fullcalendar/locale',
+								flatten: true
+						}]
+					},
+					'moment': {
+						files: [{
+								expand: true,
+								src: [
+										nodeDir + '/moment/LICENSE.txt',
+										nodeDir + '/moment/min/*'
+								],
+								dest: vendorDir + '/moment',
+								flatten: true
+						},{
+								expand: true,
+								src: [
+										nodeDir + '/moment/dist/locale/*'
+								],
+								dest: vendorDir + '/moment/locale',
+								flatten: true
+						}]
+					},
+					'bootstrap-datepicker': {
+						files: [{
+								expand: true,
+								src: [
+										nodeDir + '/bootstrap-datepicker/dist/js/*'
+								],
+								dest: vendorDir + '/bootstrap-datepicker/js',
+								flatten: true
+						},{
+								expand: true,
+								src: [
+										nodeDir + '/bootstrap-datepicker/dist/css/*'
+								],
+								dest: vendorDir + '/bootstrap-datepicker/css',
+								flatten: true
+						},{
+								expand: true,
+								src: [
+										nodeDir + '/bootstrap-datepicker/dist/locales/*'
+								],
+								dest: vendorDir + '/bootstrap-datepicker/locales',
+								flatten: true
+						}]
+					},
+					'coreui': {
+						files: [{
+								expand: true,
+								src: [
+										nodeDir + '/@coreui/coreui/dist/js/*'
+								],
+								dest: vendorDir + '/coreui/js',
+								flatten: true
+						},{
+								expand: true,
+								src: [
+										nodeDir + '/@coreui/coreui/dist/css/*'
+								],
+								dest: vendorDir + '/coreui/css',
+								flatten: true
+						}]
+					}
+				}
+    });
+
+    grunt.registerTask('createVendorDir', 'Creates the necessary vendor directory', function() {
+        // Create the vendorDir when it doesn't exists.
+        if (!grunt.file.isDir(vendorDir)) {
+            grunt.file.mkdir(vendorDir);
+
+            // Output a success message
+            grunt.log.oklns(grunt.template.process(
+                'Directory "<%= directory %>" was created successfully.',
+                { data: { directory: vendorDir } }
+            ));
+        }
+    });
+
+    grunt.registerTask('default', [ 'clean', 'createVendorDir', 'copy' ]);
+    grunt.loadNpmTasks('grunt-contrib-clean');
+    grunt.loadNpmTasks('grunt-contrib-copy');
+};

controllers/class.AddDocument.php

@@ -150,11 +150,11 @@ class SeedDMS_Controller_AddDocument extends SeedDMS_Controller_Common {
 
 			/* Add a default notification for the owner of the document */
 			if($settings->_enableOwnerNotification) {
-				$res = $document->addNotify($user->getID(), true);
+				$res = $document->addNotify($owner->getID(), true);
 			}
 			/* Check if additional notification shall be added */
 			foreach($notificationusers as $notuser) {
-				if($document->getAccessMode($user) >= M_READ)
+				if($document->getAccessMode($notuser) >= M_READ)
 					$res = $document->addNotify($notuser->getID(), true);
 			}
 			foreach($notificationgroups as $notgroup) {

controllers/class.Login.php

@@ -36,6 +36,7 @@ class SeedDMS_Controller_Login extends SeedDMS_Controller_Common {
 		$settings = $this->params['settings'];
 		$session = $this->params['session'];
 		$sesstheme = $this->params['sesstheme'];
+		$referuri = $this->params['referuri'];
 		$lang = $this->params['lang'];
 		$login = $this->params['login'];
 		$pwd = $this->params['pwd'];
@@ -209,8 +210,8 @@ class SeedDMS_Controller_Login extends SeedDMS_Controller_Common {
 			$dms_session = $_COOKIE["mydms_session"];
 			if(!$resArr = $session->load($dms_session)) {
 				/* Turn off http only cookies if jumploader is enabled */
-				setcookie("mydms_session", $dms_session, time()-3600, $settings->_httpRoot, null, null, !$settings->_enableLargeFileUpload); //delete cookie
+				setcookie("mydms_session", $dms_session, time()-3600, $settings->_httpRoot, null, false, true); //delete cookie
-				header("Location: " . $settings->_httpRoot . "out/out.Login.php?referuri=".$refer);
+				header("Location: " . $settings->_httpRoot . "out/out.Login.php?referuri=".$referuri);
 				exit;
 			} else {
 				$session->updateAccess($dms_session);
@@ -228,7 +229,7 @@ class SeedDMS_Controller_Login extends SeedDMS_Controller_Common {
 				$lifetime = time() + intval($settings->_cookieLifetime);
 			else
 				$lifetime = 0;
-			setcookie("mydms_session", $id, $lifetime, $settings->_httpRoot, null, null, !$settings->_enableLargeFileUpload);
+			setcookie("mydms_session", $id, $lifetime, $settings->_httpRoot, null, false, true);
 		}
 
 		if($this->callHook('postLogin', $user)) {

doc/README.Install.md

@@ -54,7 +54,7 @@ Do not set the DocumentRoot or Alias to
 the `seeddms51x` directory, because this will allow anybody to access
 your `data` and `conf` directory. This is a major security risk.
 
-Make sure that the subdіrectory `seeddms51x/data` and the configuration file
+Make sure that the subdirectory `seeddms51x/data` and the configuration file
 `seeddms51/conf/settings.xml` is writeable by your web server. All other
 directories must just be readable by your web server.
 
@@ -120,6 +120,13 @@ As a hoster you may not want this configuration options being set by a SeedDMS
 administrator. For now you need to make the configuration file `settings.xml`
 unwritable for the web server.
 
+Setting a new encryption key
+------------------------------
+Though this is not related to setting up the web server environment, it is
+important to recreated the encryption key in SeedDMS once SeedDMS is running.
+Just open the settings in the admin tools and empty the currently set
+encryption key on the tab 'System'. Save the settings and check the key again.
+It should be new one. Save the settings again
 
 UPDATING FROM A PREVIOUS VERSION OR SEEDDMS
 =============================================

doc/README.WebDAV

@@ -53,7 +53,7 @@ and possibly add your login data to /etc/davfs2/secrets
 Making applications work with WebDAV
 =====================================
 
-Various programms have differnt strategies to save files to disk and
+Various programms have differnt strategies to save files to disc and
 prevent data lost under all circumstances. Those strategies often don't
 work very well an a WebDAV-Server. The following will list some of those
 strategies.
@@ -91,3 +91,39 @@ set noswapfile
 Creating the backup file in a directory outside of WebDAV doesn't help in
 this case, because it still does the file renaming which is turned of by
 'nowritebackup'.
+
+cdaver
+========
+
+cadaver is a webdav client similar to classical command line based ftp clients.
+It can be used to browse through the folders, downloads and uploads files, and
+also for removing and moving folders and documents (called resources in webdav terminilogy).
+It's also capable of setting and getting properties of folders and documents.
+If webdav access isn't working, this client is probably the best for testing.
+
+Just run
+
+cadaver https://<your-domain>/<your-basedir>/webdav/index.php
+
+It will ask for the user name and password. Once you are logged in just
+type `help` for a list of commands.
+
+SeedDMS stores a lot more properties not covered by the webdav standard.
+Those have its own namespace called 'SeedDMS:'. Just type
+
+propget <resource>
+
+with `resource` being either the name of a folder or document. You will
+get a list of all properties stored for this resource. Setting a property
+requires to set the namespace first
+
+set namespace SeedDMS:
+
+Afterwards, you may set a property, e.g. the comment, with
+
+propset <resource> comment 'Just a comment'
+
+or even delete a property
+
+propdel <resource> comment
+

op/op.Login.php

@@ -75,6 +75,7 @@ $session = new SeedDMS_Session($db);
 // TODO: by the PHP manual: The superglobals $_GET and $_REQUEST are already decoded.
 // Using urldecode() on an element in $_GET or $_REQUEST could have unexpected and dangerous results.
 
+$referuri = '';
 if (isset($_POST["referuri"]) && strlen($_POST["referuri"])>0) {
 	$referuri = trim(urldecode($_POST["referuri"]));
 }
@@ -88,6 +89,7 @@ $controller->setParam('login', $login);
 $controller->setParam('pwd', $pwd);
 $controller->setParam('lang', $lang);
 $controller->setParam('sesstheme', $sesstheme);
+$controller->setParam('referuri', $referuri);
 $controller->setParam('session', $session);
 if(!$controller->run()) {
 	add_log_line("login failed", PEAR_LOG_ERR);

op/op.TriggerWorkflow.php

@@ -126,7 +126,7 @@ if($version->triggerWorkflowTransition($user, $transition, $_POST["comment"])) {
 					}
 				}
 				foreach($ntransition->getGroups() as $tuser) {
-					if(!in_array($tuser->getUser()->getID(), $groupsinformed)) {
+					if(!in_array($tuser->getGroup()->getID(), $groupsinformed)) {
 						$groupsinformed[] = $tuser->getGroup()->getID();
 						$notifier->toGroup($user, $tuser->getGroup(), $subject, $message, $params);
 					}

op/op.UploadChunks.php

@@ -26,11 +26,13 @@ include("../inc/inc.Init.php");
 include("../inc/inc.Extension.php");
 include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
-include("../inc/inc.Authentication.php");
+//include("../inc/inc.Authentication.php");
 
-//print_r($_FILES);
+if(empty($_GET['formkey']) || $_GET['formkey'] != md5($settings->_encryptionKey.'uploadchunks')) {
-//print_r($_POST);
+	header("Content-Type: text/plain");
-//exit;
+	echo json_encode(array('success'=>false, 'error'=>'Wrong formkey'));
+	exit;
+}
 
 $file_param_name = 'qqfile';
 $file_name = $_FILES[ $file_param_name ][ 'name' ];

package.json

@@ -0,0 +1,31 @@
+{
+  "name": "seeddms",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "Uwe Steinmann",
+  "license": "ISC",
+  "dependencies": {
+    "@coreui/coreui": "^3.2.2",
+    "bootstrap-datepicker": "^1.9.0",
+    "chartjs": "^0.3.24",
+    "cytoscape": "^3.15.2",
+    "cytoscape-grid-guide": "^2.3.2",
+    "fine-uploader": "^5.16.2",
+    "flot": "^4.2.1",
+    "font-awesome": "^4.7.0",
+    "fullcalendar": "^3.*",
+    "grunt": "^1.3.0",
+    "grunt-contrib-clean": "^2.0.0",
+    "grunt-contrib-copy": "^1.0.0",
+    "jqtree": "^1.4.12",
+    "jquery": "^1.12.4",
+    "jquery-validation": "^1.19.2",
+    "moment": "^2.17.1",
+    "noty": "^2.4.1",
+    "select2": "^4.0.13"
+  }
+}

styles/bootstrap/application.css

@@ -30,7 +30,7 @@ span.list-details {
 #admin-tools i {
 	font-size: 300%;
 	line-height: 110%;
-	min-height: 100px;
+/*	min-height: 100px; */
 }
 
 #admin-tools a {

styles/bootstrap/application.js

@@ -12,13 +12,13 @@ chzn_template_func =  function (state) {
 	if($(state.element).data('warning'))
 		warning = $(state.element).data('warning')+''; /* make sure it is a string */
 	var html = '<span>';
-	if($(state.element).data('icon-before'))
+	if($(state.element).data('fa fa-before'))
-		html += '<i class="icon-'+$(state.element).data('icon-before')+'"></i> ';
+		html += '<i class="fa fa-'+$(state.element).data('fa fa-before')+'"></i> ';
 	html += state.text.replace(/</g, '&lt;')+'';
 	if(subtitle)
 		html += '<br /><i>'+subtitle.replace(/</g, '&lt;')+'</i>';
 	if(warning)
-		html += '<br /><span class="label label-warning"><i class="icon-warning-sign"></i></span> '+warning+'';
+		html += '<br /><span class="label label-warning"><i class="fa fa-warning"></i></span> '+warning+'';
 	html += '</span>';
 	var $newstate = $(html);
 	return $newstate;
@@ -39,7 +39,7 @@ $(document).ready( function() {
 	 * remove icon
 	 */
 	$('html').on('click', function(e) {
-		if (typeof $(e.target).data('original-title') == 'undefined' && !$(e.target).parents().is('.popover.in') && !$(e.target).is('.icon-remove')) {
+		if (typeof $(e.target).data('original-title') == 'undefined' && !$(e.target).parents().is('.popover.in') && !$(e.target).is('.fa fa-remove')) {
 			$('[data-original-title]').popover('hide');
 		}
 	});
@@ -104,11 +104,11 @@ $(document).ready( function() {
 		},
 		highlighter : function (item) {
 			if(item.charAt(0) == 'D')
-				return '<i class="icon-file"></i> ' + item.substring(1).replace(/</g, '&lt;');
+				return '<i class="fa fa-file"></i> ' + item.substring(1).replace(/</g, '&lt;');
 			else if(item.charAt(0) == 'F')
-				return '<i class="icon-folder-close-alt"></i> ' + item.substring(1).replace(/</g, '&lt;');
+				return '<i class="fa fa-folder-o"></i> ' + item.substring(1).replace(/</g, '&lt;');
 			else
-				return '<i class="icon-search"></i> ' + item.substring(1).replace(/</g, '&lt;');
+				return '<i class="fa fa-search"></i> ' + item.substring(1).replace(/</g, '&lt;');
 		}
 	}); /* }}} */
 
@@ -136,7 +136,7 @@ $(document).ready( function() {
 		},
 		highlighter : function (item) {
 			strarr = item.split("#");
-			return '<i class="icon-file"></i> ' + strarr[1].replace(/</g, '&lt;');
+			return '<i class="fa fa-file"></i> ' + strarr[1].replace(/</g, '&lt;');
 		}
 	}); /* }}} */
 
@@ -165,7 +165,7 @@ $(document).ready( function() {
 		},
 		highlighter : function (item) {
 			strarr = item.split("#");
-			return '<i class="icon-folder-close-alt"></i> ' + strarr[1].replace(/</g, '&lt;');
+			return '<i class="fa fa-folder-o"></i> ' + strarr[1].replace(/</g, '&lt;');
 		}
 	}); /* }}} */
 
@@ -784,9 +784,9 @@ $(document).ready(function() { /* {{{ */
 				if(source_type == 'document') {
 					var bootbox_message = trans.confirm_move_document;
 					if(source_info.name)
-						bootbox_message += "<p> "+escapeHtml(source_info.name)+' <i class="icon-arrow-right"></i> '+escapeHtml(target_name)+"</p>";
+						bootbox_message += "<p> "+escapeHtml(source_info.name)+' <i class="fa fa-arrow-right"></i> '+escapeHtml(target_name)+"</p>";
 					bootbox.dialog(bootbox_message, [{
-						"label" : "<i class='icon-remove'></i> "+trans.move_document,
+						"label" : "<i class='fa fa-remove'></i> "+trans.move_document,
 						"class" : "btn-danger",
 						"callback": function() {
 							$.get('../op/op.Ajax.php',
@@ -828,9 +828,9 @@ $(document).ready(function() { /* {{{ */
 				} else if(source_type == 'folder' && source_id != target_id) {
 					var bootbox_message = trans.confirm_move_folder;
 					if(source_info.name)
-						bootbox_message += "<p> "+escapeHtml(source_info.name)+' <i class="icon-arrow-right"></i> '+escapeHtml(target_name)+"</p>";
+						bootbox_message += "<p> "+escapeHtml(source_info.name)+' <i class="fa fa-arrow-right"></i> '+escapeHtml(target_name)+"</p>";
 					bootbox.dialog(bootbox_message, [{
-						"label" : "<i class='icon-remove'></i> "+trans.move_folder,
+						"label" : "<i class='fa fa-remove'></i> "+trans.move_folder,
 						"class" : "btn-danger",
 						"callback": function() {
 							$.get('../op/op.Ajax.php',
@@ -885,7 +885,7 @@ $(document).ready(function() { /* {{{ */
 				if(source_type == 'document') {
 					if(source_id != target_id) {
 						bootbox.dialog(trans.confirm_transfer_link_document, [{
-							"label" : "<i class='icon-remove'></i> "+trans.transfer_content,
+							"label" : "<i class='fa fa-remove'></i> "+trans.transfer_content,
 							"class" : "btn-danger",
 							"callback": function() {
 								$.get('../op/op.Ajax.php',
@@ -1050,7 +1050,7 @@ $(document).ready(function() { /* {{{ */
 		formtoken = source_info.formtoken;
 		if(source_type == 'document') {
 			bootbox.dialog(trans.confirm_move_document, [{
-				"label" : "<i class='icon-remove'></i> "+trans.move_document,
+				"label" : "<i class='fa fa-remove'></i> "+trans.move_document,
 				"class" : "btn-danger",
 				"callback": function() {
 					$.get('../op/op.Ajax.php',
@@ -1091,7 +1091,7 @@ $(document).ready(function() { /* {{{ */
 //			document.location = url;
 		} else if(source_type == 'folder' && source_id != target_id) {
 			bootbox.dialog(trans.confirm_move_folder, [{
-				"label" : "<i class='icon-remove'></i> "+trans.move_folder,
+				"label" : "<i class='fa fa-remove'></i> "+trans.move_folder,
 				"class" : "btn-danger",
 				"callback": function() {
 					$.get('../op/op.Ajax.php',

styles/bootstrap/markitup/jquery.markitup.js

@@ -45,6 +45,7 @@
 					previewParser:			false,
 					previewParserPath:		'',
 					previewParserVar:		'data',
+					previewParserAjaxType:	'POST',
 					resizeHandle:			true,
 					beforeInsert:			'',
 					afterInsert:			'',
@@ -59,7 +60,7 @@
 		// compute markItUp! path
 		if (!options.root) {
 			$('script').each(function(a, tag) {
-				miuScript = $(tag).get(0).src.match(/(.*)jquery\.markitup(\.pack)?\.js$/);
+				var miuScript = $(tag).get(0).src.match(/(.*)jquery\.markitup(\.pack)?\.js$/);
 				if (miuScript !== null) {
 					options.root = miuScript[1];
 				}
@@ -202,7 +203,7 @@
 				$('li:hover > ul', ul).css('display', 'block');
 				$.each(markupSet, function() {
 					var button = this, t = '', title, li, j;
-					title = (button.key) ? (button.name||'')+' [Ctrl+'+button.key+']' : (button.name||'');
+					button.title ? title = (button.key) ? (button.title||'')+' [Ctrl+'+button.key+']' : (button.title||'') : title = (button.key) ? (button.name||'')+' [Ctrl+'+button.key+']' : (button.name||'');
 					key   = (button.key) ? 'accesskey="'+button.key+'"' : '';
 					if (button.separator) {
 						li = $('<li class="markItUpSeparator">'+(button.separator||'')+'</li>').appendTo(ul);
@@ -211,16 +212,16 @@
 						for (j = levels.length -1; j >= 0; j--) {
 							t += levels[j]+"-";
 						}
-						li = $('<li class="markItUpButton markItUpButton'+t+(i)+' '+(button.className||'')+'"><a href="" '+key+' title="'+title+'">'+(button.name||'')+'</a></li>')
+						li = $('<li class="markItUpButton markItUpButton'+t+(i)+' '+(button.className||'')+'"><a href="#" '+key+' title="'+title+'">'+(button.name||'')+'</a></li>')
 						.bind("contextmenu.markItUp", function() { // prevent contextmenu on mac and allow ctrl+click
 							return false;
 						}).bind('click.markItUp', function(e) {
 							e.preventDefault();
 						}).bind("focusin.markItUp", function(){
                             $$.focus();
-						}).bind('mouseup', function() {
+						}).bind('mouseup', function(e) {
 							if (button.call) {
-								eval(button.call)();
+								eval(button.call)(e); // Pass the mouseup event to custom delegate
 							}
 							setTimeout(function() { markup(button) },1);
 							return false;
@@ -537,18 +538,19 @@
 
 			function renderPreview() {
 				var phtml;
+				var parsedData = $$.val();
+				if (options.previewParser && typeof options.previewParser === 'function') {
+					parsedData = options.previewParser(parsedData); 
+				}
 				if (options.previewHandler && typeof options.previewHandler === 'function') {
-					options.previewHandler( $$.val() );
+					options.previewHandler(parsedData);
-				} else if (options.previewParser && typeof options.previewParser === 'function') {
-					var data = options.previewParser( $$.val() );
-					writeInPreview(localize(data, 1) ); 
 				} else if (options.previewParserPath !== '') {
 					$.ajax({
-						type: 'POST',
+						type: options.previewParserAjaxType,
 						dataType: 'text',
 						global: false,
 						url: options.previewParserPath,
-						data: options.previewParserVar+'='+encodeURIComponent($$.val()),
+						data: options.previewParserVar+'='+encodeURIComponent(parsedData),
 						success: function(data) {
 							writeInPreview( localize(data, 1) ); 
 						}
@@ -560,7 +562,7 @@
 							dataType: 'text',
 							global: false,
 							success: function(data) {
-								writeInPreview( localize(data, 1).replace(/<!-- content -->/g, $$.val()) );
+								writeInPreview( localize(data, 1).replace(/<!-- content -->/g, parsedData) );
 							}
 						});
 					}
@@ -636,6 +638,12 @@
 			function remove() {
 				$$.unbind(".markItUp").removeClass('markItUpEditor');
 				$$.parent('div').parent('div.markItUp').parent('div').replaceWith($$);
+
+				var relativeRef = $$.parent('div').parent('div.markItUp').parent('div');
+				if (relativeRef.length) {
+				    relativeRef.replaceWith($$);
+				}
+				
 				$$.data('markItUp', null);
 			}
 

styles/bootstrap/markitup/sets/default/set.js

@@ -24,7 +24,7 @@ var mySettings = {
 		{name:'Picture', key:'P', replaceWith:'<img src="[![Source:!:http://]!]" alt="[![Alternative text]!]" />' },
 		{name:'Link', key:'L', openWith:'<a href="[![Link:!:http://]!]"(!( title="[![Title]!]")!)>', closeWith:'</a>', placeHolder:'Your text to link...' },
 		{separator:'---------------' },
-		{name:'Clean', className:'clean', replaceWith:function(markitup) { return markitup.selection.replace(/<(.*?)>/g, "") } }/*,		
+		{name:'Clean', className:'clean', replaceWith:function(markitup) { return markitup.selection.replace(/<(.*?)>/g, "") } },		
-		{name:'Preview', className:'preview',  call:'preview'}*/
+		{name:'Preview', className:'preview',  call:'preview'}
 	]
 }

styles/bootstrap/markitup/skins/simple/style.css

@@ -12,7 +12,7 @@
 	text-decoration:none;
 }
 .markItUp  {
-	width:100%;
+	width:700px;
 	margin:5px 0 5px 0;
 }
 .markItUpContainer  {
@@ -20,9 +20,9 @@
 }
 .markItUpEditor {
 	font:12px 'Courier New', Courier, monospace;
-	padding:0px;
+	padding:5px;
-	width:100%;
+	width:690px;
-	_height:320px;
+	height:320px;
 	clear:both;
 	line-height:18px;
 	overflow:auto;

utils/indexer.php

@@ -7,7 +7,7 @@ if(isset($_SERVER['SEEDDMS_HOME'])) {
 
 function usage() { /* {{{ */
 	echo "Usage:".PHP_EOL;
-	echo "  seeddms-indexer [-h] [-v] [--config <file>]".PHP_EOL;
+	echo "  seeddms-indexer [-h] [-v] [-c] [--config <file>]".PHP_EOL;
 	echo "".PHP_EOL;
 	echo "Description:".PHP_EOL;
 	echo "  This program recreates the full text index of SeedDMS.".PHP_EOL;

views/bootstrap/class.AddDocument.php

@@ -178,9 +178,9 @@ $(document).ready(function() {
 		$folderid = $folder->getId();
 		$accessop = $this->params['accessobject'];
 
-		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/validate/jquery.validate.js"></script>'."\n", 'js');
+		$this->htmlAddHeader('<script type="text/javascript" src="../views/'.$this->theme.'/vendors/jquery-validation/jquery.validate.js"></script>'."\n", 'js');
 		if($enablelargefileupload) {
-			$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/fine-uploader/jquery.fine-uploader.min.js"></script>'."\n", 'js');
+			$this->htmlAddHeader('<script type="text/javascript" src="../views/'.$this->theme.'/vendors/fine-uploader/jquery.fine-uploader.min.js"></script>'."\n", 'js');
 			$this->htmlAddHeader($this->getFineUploaderTemplate(), 'js');
 		}
 
@@ -796,7 +796,7 @@ $(document).ready(function() {
 			)
 		);
 		}
-		$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('add_document'));
+		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('add_document'));
 ?>
 		</form>
 <?php

views/bootstrap/class.AddFile.php

@@ -128,9 +128,9 @@ $(document).ready( function() {
 		$enablelargefileupload = $this->params['enablelargefileupload'];
 		$maxuploadsize = $this->params['maxuploadsize'];
 
-		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/validate/jquery.validate.js"></script>'."\n", 'js');
+		$this->htmlAddHeader('<script type="text/javascript" src="../views/'.$this->theme.'/vendors/jquery-validation/jquery.validate.js"></script>'."\n", 'js');
 		if($enablelargefileupload) {
-			$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/fine-uploader/jquery.fine-uploader.min.js"></script>'."\n", 'js');
+			$this->htmlAddHeader('<script type="text/javascript" src="../views/'.$this->theme.'/vendors/fine-uploader/jquery.fine-uploader.min.js"></script>'."\n", 'js');
 			$this->htmlAddHeader($this->getFineUploaderTemplate(), 'js');
 		}
 

views/bootstrap/class.AddSubFolder.php

@@ -69,7 +69,7 @@ $(document).ready( function() {
 		$strictformcheck = $this->params['strictformcheck'];
 		$orderby = $this->params['orderby'];
 
-		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/validate/jquery.validate.js"></script>'."\n", 'js');
+		$this->htmlAddHeader('<script type="text/javascript" src="../views/'.$this->theme.'/vendors/jquery-validation/jquery.validate.js"></script>'."\n", 'js');
 
 		$this->htmlStartPage(getMLText("folder_title", array("foldername" => htmlspecialchars($folder->getName()))));
 		$this->globalNavigation($folder);
@@ -128,7 +128,7 @@ $(document).ready( function() {
 			echo $arrs;
 		}
 
-		$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('add_subfolder'));
+		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('add_subfolder'));
 ?>
 </form>
 <?php

views/bootstrap/class.AdminTools.php

@@ -44,7 +44,7 @@ class SeedDMS_View_AdminTools extends SeedDMS_Bootstrap_Style {
 	} /* }}} */
 
 	static function rowButton($link, $icon, $label) { /* {{{ */
-		return '<a href="'.$link.'" class="span2 btn btn-medium"><i class="icon-'.$icon.'"></i><br />'.getMLText($label).'</a>';
+		return '<a href="'.$link.'" class="span2 btn btn-medium"><i class="fa fa-'.$icon.'"></i><br />'.getMLText($label).'</a>';
 	} /* }}} */
 
 	function show() { /* {{{ */
@@ -79,7 +79,7 @@ class SeedDMS_View_AdminTools extends SeedDMS_Bootstrap_Style {
 	<?= self::startRow(); ?>
 		<?php echo $this->callHook('startOfRow', 2); ?>
 <?php if($accessop->check_view_access('BackupTools')) { ?>
-		<?= self::rowButton("../out/out.BackupTools.php", "hdd", "backup_tools"); ?>
+		<?= self::rowButton("../out/out.BackupTools.php", "life-saver", "backup_tools"); ?>
 <?php } ?>
 <?php		
 		if ($logfileenable && ($accessop->check_view_access('LogManagement')))
@@ -129,7 +129,7 @@ class SeedDMS_View_AdminTools extends SeedDMS_Bootstrap_Style {
 		<?= self::rowButton("../out/out.CreateIndex.php", "search", "create_fulltext_index"); ?>
 <?php } ?>
 <?php if($accessop->check_view_access('IndexInfo')) { ?>
-		<?= self::rowButton("../out/out.IndexInfo.php", "info-sign", "fulltext_info"); ?>
+		<?= self::rowButton("../out/out.IndexInfo.php", "info-circle", "fulltext_info"); ?>
 <?php } ?>
 		<?php echo $this->callHook('endOfRow', 5); ?>
 	<?= self::endRow(); ?>
@@ -161,10 +161,10 @@ class SeedDMS_View_AdminTools extends SeedDMS_Bootstrap_Style {
 		<?= self::rowButton("../out/out.ExtensionMgr.php", "cogs", "extension_manager"); ?>
 <?php } ?>
 <?php if($accessop->check_view_access('SchedulerTaskMgr')) { ?>
-		<?= self::rowButton("../out/out.SchedulerTaskMgr.php", "time", "scheduler_task_mgr"); ?>
+		<?= self::rowButton("../out/out.SchedulerTaskMgr.php", "clock-o", "scheduler_task_mgr"); ?>
 <?php } ?>
 <?php if($accessop->check_view_access('Info')) { ?>
-		<?= self::rowButton("../out/out.Info.php", "info-sign", "version_info"); ?>
+		<?= self::rowButton("../out/out.Info.php", "info-circle", "version_info"); ?>
 <?php } ?>
 		<?php echo $this->callHook('endOfRow', 7); ?>
 	<?= self::endRow(); ?>

views/bootstrap/class.AttributeMgr.php

@@ -110,7 +110,7 @@ $(document).ready( function() {
 							if($user->isAdmin()) {
 								$content .= $this->printDeleteAttributeValueButton($selattrdef, implode(';', $value), 'splash_rm_attr_value', true);
 							} else {
-								$content .= '<span style="padding: 2px; color: #CCC;"><i class="icon-remove"></i></span>';
+								$content .= '<span style="padding: 2px; color: #CCC;"><i class="fa fa-remove"></i></span>';
 							}
 							$content .= "</div>";
 							$content .= "</td>";
@@ -171,7 +171,7 @@ $(document).ready( function() {
 				<?php echo createHiddenFieldWithKey('removeattrdef'); ?>
 				<input type="hidden" name="attrdefid" value="<?php echo $selattrdef->getID()?>">
 				<input type="hidden" name="action" value="removeattrdef">
-				<button type="submit" class="btn"><i class="icon-remove"></i> <?php echo getMLText("rm_attrdef")?></button>
+				<button type="submit" class="btn"><i class="fa fa-remove"></i> <?php echo getMLText("rm_attrdef")?></button>
 			</form>
 <?php
 		}
@@ -288,7 +288,7 @@ $(document).ready( function() {
 				'value'=>($attrdef ? $attrdef->getRegex() : ''),
 			)
 		);
-		$this->formSubmit('<i class="icon-save"></i> '.getMLText('save'));
+		$this->formSubmit('<i class="fa fa-save"></i> '.getMLText('save'));
 ?>
 			</form>
 <?php

views/bootstrap/class.BackupTools.php

@@ -130,7 +130,7 @@ class SeedDMS_View_BackupTools extends SeedDMS_Bootstrap_Style {
 					print "<td>".SeedDMS_Core_File::format_filesize(filesize($backupdir.$entry))."</td>\n";
 					print "<td>";
 					if($accessop->check_controller_access('RemoveArchive', array('action'=>'run')))
-						print "<a href=\"out.RemoveArchive.php?arkname=".$entry."\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("backup_remove")."</a>";
+						print "<a href=\"out.RemoveArchive.php?arkname=".$entry."\" class=\"btn btn-mini\"><i class=\"fa fa-remove\"></i> ".getMLText("backup_remove")."</a>";
 					print "</td>\n";	
 					print "</tr>\n";
 				}
@@ -186,7 +186,7 @@ class SeedDMS_View_BackupTools extends SeedDMS_Bootstrap_Style {
 					print "<td>".SeedDMS_Core_File::format_filesize(filesize($backupdir.$entry))."</td>\n";
 					print "<td>";
 					if($accessop->check_controller_access('RemoveDump', array('action'=>'run')))
-						print "<a href=\"out.RemoveDump.php?dumpname=".$entry."\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("dump_remove")."</a>";
+						print "<a href=\"out.RemoveDump.php?dumpname=".$entry."\" class=\"btn btn-mini\"><i class=\"fa fa-remove\"></i> ".getMLText("dump_remove")."</a>";
 					print "</td>\n";	
 					print "</tr>\n";
 				}

views/bootstrap/class.Bootstrap.php

@@ -92,11 +92,10 @@ class SeedDMS_Bootstrap_Style extends SeedDMS_View_Common {
 			echo '<link rel="search" type="application/opensearchdescription+xml" href="../out/out.OpensearchDesc.php" title="'.(strlen($sitename)>0 ? $sitename : "SeedDMS").'"/>'."\n";
 		echo '<link href="../styles/'.$this->theme.'/bootstrap/css/bootstrap.css" rel="stylesheet">'."\n";
 		echo '<link href="../styles/'.$this->theme.'/bootstrap/css/bootstrap-responsive.css" rel="stylesheet">'."\n";
-		echo '<link href="../styles/'.$this->theme.'/font-awesome/css/font-awesome.css" rel="stylesheet">'."\n";
+		echo '<link href="../views/'.$this->theme.'/vendors/font-awesome/css/font-awesome.min.css" rel="stylesheet">'."\n";
-//		echo '<link href="../styles/'.$this->theme.'/datepicker/css/datepicker.css" rel="stylesheet">'."\n";
+		echo '<link href="../views/'.$this->theme.'/vendors/bootstrap-datepicker/css/bootstrap-datepicker.css" rel="stylesheet">'."\n";
-		echo '<link href="../styles/'.$this->theme.'/datepicker/css/bootstrap-datepicker.css" rel="stylesheet">'."\n";
 		echo '<link href="../styles/'.$this->theme.'/chosen/css/chosen.css" rel="stylesheet">'."\n";
-		echo '<link href="../styles/'.$this->theme.'/select2/css/select2.min.css" rel="stylesheet">'."\n";
+		echo '<link href="../views/'.$this->theme.'/vendors/select2/css/select2.min.css" rel="stylesheet">'."\n";
 		echo '<link href="../styles/'.$this->theme.'/select2/css/select2-bootstrap.css" rel="stylesheet">'."\n";
 		echo '<link href="../styles/'.$this->theme.'/jqtree/jqtree.css" rel="stylesheet">'."\n";
 		echo '<link href="../styles/'.$this->theme.'/application.css" rel="stylesheet">'."\n";
@@ -105,14 +104,14 @@ class SeedDMS_Bootstrap_Style extends SeedDMS_View_Common {
 		if(method_exists($this, 'css'))
 			echo '<link href="'.$this->params['absbaseprefix'].'out/out.'.$this->params['class'].'.php?action=css'.(!empty($_SERVER['QUERY_STRING']) ? '&'.$_SERVER['QUERY_STRING'] : '').'" rel="stylesheet">'."\n";
 
-		echo '<script type="text/javascript" src="../styles/'.$this->theme.'/jquery/jquery.min.js"></script>'."\n";
+		echo '<script type="text/javascript" src="../views/'.$this->theme.'/vendors/jquery/jquery.min.js"></script>'."\n";
 		if($this->extraheader['js'])
 			echo $this->extraheader['js'];
 		echo '<script type="text/javascript" src="../styles/'.$this->theme.'/passwordstrength/jquery.passwordstrength.js"></script>'."\n";
-		echo '<script type="text/javascript" src="../styles/'.$this->theme.'/noty/jquery.noty.js"></script>'."\n";
+		echo '<script type="text/javascript" src="../views/'.$this->theme.'/vendors/noty/jquery.noty.js"></script>'."\n";
-		echo '<script type="text/javascript" src="../styles/'.$this->theme.'/noty/layouts/topRight.js"></script>'."\n";
+		echo '<script type="text/javascript" src="../views/'.$this->theme.'/vendors/noty/layouts/topRight.js"></script>'."\n";
-		echo '<script type="text/javascript" src="../styles/'.$this->theme.'/noty/layouts/topCenter.js"></script>'."\n";
+		echo '<script type="text/javascript" src="../views/'.$this->theme.'/vendors/noty/layouts/topCenter.js"></script>'."\n";
-		echo '<script type="text/javascript" src="../styles/'.$this->theme.'/noty/themes/default.js"></script>'."\n";
+		echo '<script type="text/javascript" src="../views/'.$this->theme.'/vendors/noty/themes/default.js"></script>'."\n";
 		echo '<script type="text/javascript" src="../styles/'.$this->theme.'/jqtree/tree.jquery.js"></script>'."\n";
 //		echo '<script type="text/javascript" src="../styles/'.$this->theme.'/jquery-cookie/jquery.cookie.js"></script>'."\n";
 		echo '<link rel="shortcut icon" href="../styles/'.$this->theme.'/favicon.ico" type="image/x-icon"/>'."\n";
@@ -161,9 +160,9 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 			}
 		}
 		echo '<script src="../styles/'.$this->theme.'/bootstrap/js/bootstrap.min.js"></script>'."\n";
-		echo '<script src="../styles/'.$this->theme.'/datepicker/js/bootstrap-datepicker.js"></script>'."\n";
+		echo '<script src="../views/'.$this->theme.'/vendors/bootstrap-datepicker/js/bootstrap-datepicker.js"></script>'."\n";
 		foreach(array('de', 'es', 'ar', 'el', 'bg', 'ru', 'hr', 'hu', 'ko', 'pl', 'ro', 'sk', 'tr', 'uk', 'ca', 'nl', 'fi', 'cs', 'it', 'fr', 'sv', 'sl', 'pt-BR', 'zh-CN', 'zh-TW') as $lang)
-			echo '<script src="../styles/'.$this->theme.'/datepicker/locales/bootstrap-datepicker.'.$lang.'.min.js"></script>'."\n";
+			echo '<script src="../views/'.$this->theme.'/vendors/bootstrap-datepicker/locales/bootstrap-datepicker.'.$lang.'.min.js"></script>'."\n";
 		echo '<script src="../styles/'.$this->theme.'/chosen/js/chosen.jquery.min.js"></script>'."\n";
 		echo '<script src="../styles/'.$this->theme.'/select2/js/select2.min.js"></script>'."\n";
 		parse_str($_SERVER['QUERY_STRING'], $tmp);
@@ -362,16 +361,16 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		echo " <div class=\"navbar-inner\">\n";
 		echo "  <div class=\"container-fluid\">\n";
 		echo "   <a class=\"btn btn-navbar\" data-toggle=\"collapse\" data-target=\".nav-col1\">\n";
-		echo "     <span class=\"icon-bar\"></span>\n";
+		echo "     <span class=\"fa fa-bar\"></span>\n";
-		echo "     <span class=\"icon-bar\"></span>\n";
+		echo "     <span class=\"fa fa-bar\"></span>\n";
-		echo "     <span class=\"icon-bar\"></span>\n";
+		echo "     <span class=\"fa fa-bar\"></span>\n";
 		echo "   </a>\n";
 		echo "   <a class=\"brand\" href=\"../out/out.ViewFolder.php?folderid=".$this->params['rootfolderid']."\">".(strlen($this->params['sitename'])>0 ? $this->params['sitename'] : "SeedDMS")."</a>\n";
 		if(isset($this->params['user']) && $this->params['user']) {
 			echo "   <div class=\"nav-collapse nav-col1\">\n";
 			echo "   <ul id=\"main-menu-admin\" class=\"nav pull-right\">\n";
 			echo "    <li class=\"dropdown\">\n";
-			echo "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".($this->params['session']->getSu() ? getMLText("switched_to") : getMLText("signed_in_as"))." '".htmlspecialchars($this->params['user']->getFullName())."' <i class=\"icon-caret-down\"></i></a>\n";
+			echo "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".($this->params['session']->getSu() ? getMLText("switched_to") : getMLText("signed_in_as"))." '".htmlspecialchars($this->params['user']->getFullName())."' <i class=\"fa fa-caret-down\"></i></a>\n";
 			echo "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
 //			if (!$this->params['user']->isGuest()) {
 				$menuitems = array();
@@ -485,7 +484,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 			foreach($menuitems as $menuitem) {
 				if(!empty($menuitem['children'])) {
 					echo "    <li class=\"dropdown\">\n";
-					echo "     <a class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText($menuitem['label'])." <i class=\"icon-caret-down\"></i></a>\n";
+					echo "     <a class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText($menuitem['label'])." <i class=\"fa fa-caret-down\"></i></a>\n";
 					echo "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
 					foreach($menuitem['children'] as $submenuitem) {
 						echo "      <li><a href=\"".$submenuitem['link']."\"".(isset($submenuitem['target']) ? ' target="'.$submenuitem['target'].'"' : '').">".getMLText($submenuitem['label'])."</a></li>\n";
@@ -545,9 +544,9 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 			echo " <div class=\"navbar-inner\">\n";
 			echo "  <div class=\"container\">\n";
 			echo "   <a class=\"btn btn-navbar\" data-toggle=\"collapse\" data-target=\".col2\">\n";
-			echo " 		<span class=\"icon-bar\"></span>\n";
+			echo " 		<span class=\"fa fa-bar\"></span>\n";
-			echo " 		<span class=\"icon-bar\"></span>\n";
+			echo " 		<span class=\"fa fa-bar\"></span>\n";
-			echo " 		<span class=\"icon-bar\"></span>\n";
+			echo " 		<span class=\"fa fa-bar\"></span>\n";
 			echo "   </a>\n";
 			switch ($pageType) {
 				case "view_folder":
@@ -594,7 +593,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		foreach($menuitems as $menuitem) {
 			if(!empty($menuitem['children'])) {
 				echo "    <li class=\"dropdown\">\n";
-				echo "     <a class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText($menuitem['label'])." <i class=\"icon-caret-down\"></i></a>\n";
+				echo "     <a class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText($menuitem['label'])." <i class=\"fa fa-caret-down\"></i></a>\n";
 				echo "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
 				foreach($menuitem['children'] as $submenuitem) {
 					echo "      <li><a href=\"".$submenuitem['link']."\"".(isset($submenuitem['target']) ? ' target="'.$submenuitem['target'].'"' : '').">".getMLText($submenuitem['label'])."</a></li>\n";
@@ -1288,7 +1287,7 @@ $(document).ready(function() {
 		$content = '
 			<span class="input-append date span12 datepicker" id="'.$varName.'date" data-date="'.$defDate.'" data-selectmenu="presetexpdate" data-date-format="'.$dateformat.'"'.($lang ? ' data-date-language="'.str_replace('_', '-', $lang).'"' : '').($startdate ? ' data-date-start-date="'.$startdate.'"' : '').($enddate ? ' data-date-end-date="'.$enddate.'"' : '').'>
 				<input class="span6" size="16" name="'.$varName.'" id="'.$varName.'" type="text" value="'.$defDate.'" autocomplete="off">
-				<span class="add-on"><i class="icon-calendar"></i></span>
+				<span class="add-on"><i class="fa fa-calendar"></i></span>
 			</span>';
 		return $content;
 	} /* }}} */
@@ -1425,12 +1424,12 @@ function folderSelected<?php echo $formName ?>(id, name) {
 	function getFolderChooserHtml($form, $accessMode, $exclude = -1, $default = false, $formname = '') { /* {{{ */
 		if(!$formname)
 			$formname = "targetid";
-		$formid = $formname.$form;
+		$formid = md5($formname.$form);
 		$content = '';
 		$content .= "<input type=\"hidden\" id=\"".$formid."\" name=\"".$formname."\" value=\"". (($default) ? $default->getID() : "") ."\">";
 		$content .= "<div class=\"input-append\">\n";
 		$content .= "<input type=\"text\" id=\"choosefoldersearch".$form."\" data-target=\"".$formid."\" data-provide=\"typeahead\"  name=\"targetname".$form."\" value=\"". (($default) ? htmlspecialchars($default->getName()) : "") ."\" placeholder=\"".getMLText('type_to_search')."\" autocomplete=\"off\" target=\"".$formid."\"/>";
-		$content .= "<button type=\"button\" class=\"btn\" id=\"clearfolder".$form."\"><i class=\"icon-remove\"></i></button>";
+		$content .= "<button type=\"button\" class=\"btn\" id=\"clearfolder".$form."\"><i class=\"fa fa-remove\"></i></button>";
 		$content .= "<a data-target=\"#folderChooser".$form."\" href=\"../out/out.FolderChooser.php?form=".$form."&mode=".$accessMode."&exclude=".$exclude."\" role=\"button\" class=\"btn\" data-toggle=\"modal\">".getMLText("folder")."…</a>\n";
 		$content .= "</div>\n";
 		$content .= '
@@ -1457,7 +1456,7 @@ function folderSelected<?php echo $formName ?>(id, name) {
 	function printFolderChooserJs($form, $formname='') { /* {{{ */
 		if(!$formname)
 			$formname = "targetid";
-		$formid = $formname.$form;
+		$formid = md5($formname.$form);
 ?>
 function folderSelected<?php echo $form ?>(id, name) {
 	$('#<?php echo $formid ?>').val(id);
@@ -1519,7 +1518,7 @@ $(document).ready(function() {
 		print "<input type=\"hidden\" name=\"categoryid".$formName."\" value=\"".implode(',', $ids)."\">";
 		print "<div class=\"input-append\">\n";
 		print "<input type=\"text\" disabled name=\"categoryname".$formName."\" value=\"".implode(' ', $names)."\">";
-		print "<button type=\"button\" class=\"btn\" onclick=\"javascript:clearCategory".$formName."();\"><i class=\"icon-remove\"></i></button>";
+		print "<button type=\"button\" class=\"btn\" onclick=\"javascript:clearCategory".$formName."();\"><i class=\"fa fa-remove\"></i></button>";
 		print "<a data-target=\"#categoryChooser\" href=\"../out/out.CategoryChooser.php?form=form1&cats=".implode(',', $ids)."\" role=\"button\" class=\"btn\" data-toggle=\"modal\">".getMLText("category")."…</a>\n";
 		print "</div>\n";
 ?>
@@ -1533,7 +1532,7 @@ $(document).ready(function() {
   </div>
   <div class="modal-footer">
     <button class="btn btn-primary" data-dismiss="modal" aria-hidden="true"><?php printMLText("close") ?></button>
-    <button class="btn" data-dismiss="modal" aria-hidden="true" onClick="acceptCategories();"><i class="icon-save"></i> <?php printMLText("save") ?></button>
+    <button class="btn" data-dismiss="modal" aria-hidden="true" onClick="acceptCategories();"><i class="fa fa-save"></i> <?php printMLText("save") ?></button>
   </div>
 </div>
 <?php
@@ -1561,7 +1560,7 @@ $(document).ready(function() {
   </div>
   <div class="modal-footer">
     <button class="btn" data-dismiss="modal" aria-hidden="true">'. getMLText("close").'</button>
-    <button class="btn btn-primary" data-dismiss="modal" aria-hidden="true" id="acceptkeywords"><i class="icon-save"></i> '.getMLText("save").'</button>
+    <button class="btn btn-primary" data-dismiss="modal" aria-hidden="true" id="acceptkeywords"><i class="fa fa-save"></i> '.getMLText("save").'</button>
   </div>
 </div>';
 		return $content;
@@ -1652,7 +1651,7 @@ $(document).ready(function() {
 				$objvalue = $attribute ? (is_object($attribute) ? $attribute->getValue() : $attribute) : '';
         $content .= '<span class="input-append date datepicker" data-date="'.date('Y-m-d').'" data-date-format="yyyy-mm-dd" data-date-language="'.str_replace('_', '-', $this->params['session']->getLanguage()).'">
 					<input id="'.$fieldname.'_'.$attrdef->getId().'" class="span9" size="16" name="'.$fieldname.'['.$attrdef->getId().']" type="text" value="'.($objvalue ? $objvalue : '').'">
-          <span class="add-on"><i class="icon-calendar"></i></span>
+          <span class="add-on"><i class="fa fa-calendar"></i></span>
 				</span>';
 			break;
 		case SeedDMS_Core_AttributeDefinition::type_email:
@@ -1708,7 +1707,7 @@ $(document).ready(function() {
 	function getDropFolderChooserHtml($formName, $dropfolderfile="", $showfolders=0) { /* {{{ */
 		$content =  "<div class=\"input-append\">\n";
 		$content .= "<input readonly type=\"text\" id=\"dropfolderfile".$formName."\" name=\"dropfolderfile".$formName."\" value=\"".$dropfolderfile."\">";
-		$content .= "<button type=\"button\" class=\"btn\" id=\"clearfilename".$formName."\"><i class=\"icon-remove\"></i></button>";
+		$content .= "<button type=\"button\" class=\"btn\" id=\"clearfilename".$formName."\"><i class=\"fa fa-remove\"></i></button>";
 		$content .= "<a data-target=\"#dropfolderChooser\" href=\"../out/out.DropFolderChooser.php?form=".$formName."&dropfolderfile=".urlencode($dropfolderfile)."&showfolders=".$showfolders."\" role=\"button\" class=\"btn\" data-toggle=\"modal\">".($showfolders ? getMLText("choose_target_folder"): getMLText("choose_target_file"))."…</a>\n";
 		$content .= "</div>\n";
 		$content .= '
@@ -1973,8 +1972,8 @@ $(function() {
 		selectable: true,
 		data: data,
 		saveState: 'jqtree<?php echo $formid; ?>',
-		openedIcon: $('<i class="icon-minus-sign"></i>'),
+		openedIcon: $('<i class="fa fa-minus-circle"></i>'),
-		closedIcon: $('<i class="icon-plus-sign"></i>'),
+		closedIcon: $('<i class="fa fa-plus-circle"></i>'),
 		_onCanSelectNode: function(node) {
 			if(node.is_folder) {
 				folderSelected<?php echo $formid ?>(node.id, node.name);
@@ -1986,9 +1985,9 @@ $(function() {
     onCreateLi: function(node, $li) {
         // Add 'icon' span before title
 				if(node.is_folder)
-					$li.find('.jqtree-title').before('<i class="icon-folder-close-alt table-row-folder droptarget" data-droptarget="folder_' + node.id + '" rel="folder_' + node.id + '"></i> ').attr('rel', 'folder_' + node.id).attr('formtoken', '<?php echo createFormKey(''); ?>').attr('data-uploadformtoken', '<?php echo createFormKey(''); ?>');
+					$li.find('.jqtree-title').before('<i class="fa fa-folder-o table-row-folder droptarget" data-droptarget="folder_' + node.id + '" rel="folder_' + node.id + '"></i> ').attr('rel', 'folder_' + node.id).attr('formtoken', '<?php echo createFormKey(''); ?>').attr('data-uploadformtoken', '<?php echo createFormKey(''); ?>');
 				else
-					$li.find('.jqtree-title').before('<i class="icon-file"></i> ');
+					$li.find('.jqtree-title').before('<i class="fa fa-file"></i> ');
     }
 	});
 	// Unfold node for currently selected folder
@@ -2079,7 +2078,7 @@ $(function() {
 	 */
 	function __printTreeNavigation($folderid, $showtree){ /* {{{ */
 		if ($showtree==1){
-			$this->contentHeading("<a href=\"../out/out.ViewFolder.php?folderid=". $folderid."&showtree=0\"><i class=\"icon-minus-sign\"></i></a>", true);
+			$this->contentHeading("<a href=\"../out/out.ViewFolder.php?folderid=". $folderid."&showtree=0\"><i class=\"fa fa-minus-circle\"></i></a>", true);
 			$this->contentContainerStart();
 ?>
 	<script language="JavaScript">
@@ -2091,7 +2090,7 @@ $(function() {
 			$this->printNewTreeNavigation($folderid, M_READ, 0, '');
 			$this->contentContainerEnd();
 		} else {
-			$this->contentHeading("<a href=\"../out/out.ViewFolder.php?folderid=". $folderid."&showtree=1\"><i class=\"icon-plus-sign\"></i></a>", true);
+			$this->contentHeading("<a href=\"../out/out.ViewFolder.php?folderid=". $folderid."&showtree=1\"><i class=\"fa fa-plus-circle\"></i></a>", true);
 		}
 	} /* }}} */
 
@@ -2102,7 +2101,7 @@ $(function() {
 	 */
 	function printClipboard($clipboard, $previewer){ /* {{{ */
 		echo "<div id=\"clipboard-container\" class=\"_clipboard-container\">\n";
-		$this->contentHeading(getMLText("clipboard").'<span id="clipboard-float"><i class="icon-sort"></i></span>', true);
+		$this->contentHeading(getMLText("clipboard").'<span id="clipboard-float"><i class="fa fa-sort"></i></span>', true);
 		echo "<div id=\"main-clipboard\">\n";
 ?>
 		<div class="ajax" data-view="Clipboard" data-action="mainClipboard"></div>
@@ -2132,7 +2131,7 @@ $(function() {
 	function printDeleteDocumentButton($document, $msg, $return=false){ /* {{{ */
 		$docid = $document->getID();
 		$content = '';
-    $content .= '<a class="delete-document-btn" rel="'.$docid.'" msg="'.getMLText($msg).'" confirmmsg="'.htmlspecialchars(getMLText("confirm_rm_document", array ("documentname" => $document->getName())), ENT_QUOTES).'"><i class="icon-remove"></i></a>';
+    $content .= '<a class="delete-document-btn" rel="'.$docid.'" msg="'.getMLText($msg).'" confirmmsg="'.htmlspecialchars(getMLText("confirm_rm_document", array ("documentname" => $document->getName())), ENT_QUOTES).'"><i class="fa fa-remove"></i></a>';
 		if($return)
 			return $content;
 		else
@@ -2151,7 +2150,7 @@ $(function() {
 				msg = $(ev.currentTarget).attr('msg');
 				formtoken = '".createFormKey('removedocument')."';
 				bootbox.dialog(confirmmsg, [{
-					\"label\" : \"<i class='icon-remove'></i> ".getMLText("rm_document")."\",
+					\"label\" : \"<i class='fa fa-remove'></i> ".getMLText("rm_document")."\",
 					\"class\" : \"btn-danger\",
 					\"callback\": function() {
 						$.get('../op/op.Ajax.php',
@@ -2206,7 +2205,7 @@ $(function() {
 	function printDeleteFolderButton($folder, $msg, $return=false){ /* {{{ */
 		$folderid = $folder->getID();
 		$content = '';
-		$content .= '<a class="delete-folder-btn" rel="'.$folderid.'" msg="'.getMLText($msg).'" confirmmsg="'.htmlspecialchars(getMLText("confirm_rm_folder", array ("foldername" => $folder->getName())), ENT_QUOTES).'"><i class="icon-remove"></i></a>';
+		$content .= '<a class="delete-folder-btn" rel="'.$folderid.'" msg="'.getMLText($msg).'" confirmmsg="'.htmlspecialchars(getMLText("confirm_rm_folder", array ("foldername" => $folder->getName())), ENT_QUOTES).'"><i class="fa fa-remove"></i></a>';
 		if($return)
 			return $content;
 		else
@@ -2225,7 +2224,7 @@ $(function() {
 				msg = $(ev.currentTarget).attr('msg');
 				formtoken = '".createFormKey('removefolder')."';
 				bootbox.dialog(confirmmsg, [{
-					\"label\" : \"<i class='icon-remove'></i> ".getMLText("rm_folder")."\",
+					\"label\" : \"<i class='fa fa-remove'></i> ".getMLText("rm_folder")."\",
 					\"class\" : \"btn-danger\",
 					\"callback\": function() {
 						$.get('../op/op.Ajax.php',
@@ -2278,7 +2277,7 @@ $(function() {
 			$title = 'lock_document';
 		}
 		$content = '';
-    $content .= '<a class="lock-document-btn" rel="'.$docid.'" msg="'.getMLText($msg).'" title="'.getMLText($title).'"><i class="icon-'.$icon.'"></i></a>';
+    $content .= '<a class="lock-document-btn" rel="'.$docid.'" msg="'.getMLText($msg).'" title="'.getMLText($title).'"><i class="fa fa-'.$icon.'"></i></a>';
 		if($return)
 			return $content;
 		else
@@ -2297,7 +2296,7 @@ $(function() {
 	 * @param array $ids list of option values
 	 */
 	function getSelectPresetButtonHtml($name, $ids) { /* {{{ */
-		return '<span id="'.$name.'_btn" class="selectpreset_btn" style="cursor: pointer;" title="'.getMLText("takeOver".$name).'" data-ref="'.$name.'" data-ids="'.implode(",", $ids).'"><i class="icon-arrow-left"></i></span>';
+		return '<span id="'.$name.'_btn" class="selectpreset_btn" style="cursor: pointer;" title="'.getMLText("takeOver".$name).'" data-ref="'.$name.'" data-ids="'.implode(",", $ids).'"><i class="fa fa-arrow-left"></i></span>';
 	} /* }}} */
 
 	/**
@@ -2349,7 +2348,7 @@ $(document).ready( function() {
 	 * @param string $text text
 	 */
 	function getInputPresetButtonHtml($name, $text, $sep='') { /* {{{ */
-		return '<span id="'.$name.'_btn" class="inputpreset_btn" style="cursor: pointer;" title="'.getMLText("takeOverAttributeValue").'" data-ref="'.$name.'" data-text="'.(is_array($text) ? implode($sep, $text) : htmlspecialchars($text)).'"'.($sep ? " data-sep=\"".$sep."\"" : "").'><i class="icon-arrow-left"></i></span>';
+		return '<span id="'.$name.'_btn" class="inputpreset_btn" style="cursor: pointer;" title="'.getMLText("takeOverAttributeValue").'" data-ref="'.$name.'" data-text="'.(is_array($text) ? implode($sep, $text) : htmlspecialchars($text)).'"'.($sep ? " data-sep=\"".$sep."\"" : "").'><i class="fa fa-arrow-left"></i></span>';
 	} /* }}} */
 
 	/**
@@ -2406,7 +2405,7 @@ $(document).ready( function() {
 	 */
 	function getCheckboxPresetButtonHtml($name, $text) { /* {{{ */
 ?>
-		return '<span id="'.$name.'_btn" class="checkboxpreset_btn" style="cursor: pointer;" title="'.getMLText("takeOverAttributeValue").'" data-ref="'.$name.'" data-text="'.(is_array($text) ? implode($sep, $text) : htmlspecialchars($text)).'"'.($sep ? " data-sep=\"".$sep."\"" : "").'><i class="icon-arrow-left"></i></span>';
+		return '<span id="'.$name.'_btn" class="checkboxpreset_btn" style="cursor: pointer;" title="'.getMLText("takeOverAttributeValue").'" data-ref="'.$name.'" data-text="'.(is_array($text) ? implode($sep, $text) : htmlspecialchars($text)).'"'.($sep ? " data-sep=\"".$sep."\"" : "").'><i class="fa fa-arrow-left"></i></span>';
 <?php
 	} /* }}} */
 
@@ -2467,7 +2466,7 @@ $(document).ready( function() {
 	 */
 	function printDeleteAttributeValueButton($attrdef, $value, $msg, $return=false){ /* {{{ */
 		$content = '';
-    $content .= '<a class="delete-attribute-value-btn" rel="'.$attrdef->getID().'" msg="'.getMLText($msg).'" attrvalue="'.htmlspecialchars($value, ENT_QUOTES).'" confirmmsg="'.htmlspecialchars(getMLText("confirm_rm_attr_value", array ("attrdefname" => $attrdef->getName())), ENT_QUOTES).'"><i class="icon-remove"></i></a>';
+    $content .= '<a class="delete-attribute-value-btn" rel="'.$attrdef->getID().'" msg="'.getMLText($msg).'" attrvalue="'.htmlspecialchars($value, ENT_QUOTES).'" confirmmsg="'.htmlspecialchars(getMLText("confirm_rm_attr_value", array ("attrdefname" => $attrdef->getName())), ENT_QUOTES).'"><i class="fa fa-remove"></i></a>';
 		if($return)
 			return $content;
 		else
@@ -2486,7 +2485,7 @@ $(document).ready( function() {
 				msg = $(ev.currentTarget).attr('msg');
 				formtoken = '".createFormKey('removeattrvalue')."';
 				bootbox.dialog(confirmmsg, [{
-					\"label\" : \"<i class='icon-remove'></i> ".getMLText("rm_attr_value")."\",
+					\"label\" : \"<i class='fa fa-remove'></i> ".getMLText("rm_attr_value")."\",
 					\"class\" : \"btn-danger\",
 					\"callback\": function() {
 						$.post('../op/op.AttributeMgr.php',
@@ -2722,18 +2721,18 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
 			if($document->getAccessMode($user) >= M_ALL) {
 				$content .= $this->printDeleteDocumentButton($document, 'splash_rm_document', true);
 			} else {
-				$content .= '<span style="padding: 2px; color: #CCC;"><i class="icon-remove"></i></span>';
+				$content .= '<span style="padding: 2px; color: #CCC;"><i class="fa fa-remove"></i></span>';
 			}
 			if($document->getAccessMode($user) >= M_READWRITE) {
-				$content .= '<a href="../out/out.EditDocument.php?documentid='.$docID.'" title="'.getMLText("edit_document_props").'"><i class="icon-edit"></i></a>';
+				$content .= '<a href="../out/out.EditDocument.php?documentid='.$docID.'" title="'.getMLText("edit_document_props").'"><i class="fa fa-edit"></i></a>';
 			} else {
-				$content .= '<span style="padding: 2px; color: #CCC;"><i class="icon-edit"></i></span>';
+				$content .= '<span style="padding: 2px; color: #CCC;"><i class="fa fa-edit"></i></span>';
 			}
 			if($document->getAccessMode($user) >= M_READWRITE) {
 				$content .= $this->printLockButton($document, 'splash_document_locked', 'splash_document_unlocked', true);
 			}
 			if($enableClipboard) {
-				$content .= '<a class="addtoclipboard" rel="D'.$docID.'" msg="'.getMLText('splash_added_to_clipboard').'" title="'.getMLText("add_to_clipboard").'"><i class="icon-copy"></i></a>';
+				$content .= '<a class="addtoclipboard" rel="D'.$docID.'" msg="'.getMLText('splash_added_to_clipboard').'" title="'.getMLText("add_to_clipboard").'"><i class="fa fa-copy"></i></a>';
 			}
 			if(!empty($extracontent['end_action_list']))
 				$content .= $extracontent['end_action_list'];
@@ -2852,15 +2851,15 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
 		if($subFolderAccessMode >= M_ALL) {
 			$content .= $this->printDeleteFolderButton($subFolder, 'splash_rm_folder', true);
 		} else {
-			$content .= '<span style="padding: 2px; color: #CCC;"><i class="icon-remove"></i></span>';
+			$content .= '<span style="padding: 2px; color: #CCC;"><i class="fa fa-remove"></i></span>';
 		}
 		if($subFolderAccessMode >= M_READWRITE) {
-			$content .= '<a class_="btn btn-mini" href="../out/out.EditFolder.php?folderid='.$subFolder->getID().'" title="'.getMLText("edit_folder_props").'"><i class="icon-edit"></i></a>';
+			$content .= '<a class_="btn btn-mini" href="../out/out.EditFolder.php?folderid='.$subFolder->getID().'" title="'.getMLText("edit_folder_props").'"><i class="fa fa-edit"></i></a>';
 		} else {
-			$content .= '<span style="padding: 2px; color: #CCC;"><i class="icon-edit"></i></span>';
+			$content .= '<span style="padding: 2px; color: #CCC;"><i class="fa fa-edit"></i></span>';
 		}
 		if($enableClipboard) {
-			$content .= '<a class="addtoclipboard" rel="F'.$subFolder->getID().'" msg="'.getMLText('splash_added_to_clipboard').'" title="'.getMLText("add_to_clipboard").'"><i class="icon-copy"></i></a>';
+			$content .= '<a class="addtoclipboard" rel="F'.$subFolder->getID().'" msg="'.getMLText('splash_added_to_clipboard').'" title="'.getMLText("add_to_clipboard").'"><i class="fa fa-copy"></i></a>';
 		}
 		if(!empty($extracontent['end_action_list']))
 			$content .= $extracontent['end_action_list'];
@@ -3017,7 +3016,7 @@ $(document).ready(function() {
 		element: $('#<?php echo $prefix; ?>-fine-uploader')[0],
 		template: 'qq-template',
 		request: {
-			endpoint: '<?php echo $uploadurl; ?>'
+			endpoint: '<?php echo $uploadurl."?formkey=".md5($this->params['settings']->_encryptionKey.'uploadchunks'); ?>'
 		},
 <?php echo ($maxuploadsize > 0 ? '
 		validation: {
@@ -3133,14 +3132,14 @@ $(document).ready(function() {
 				if($accessop->check_controller_access('Download', array('action'=>'review')))
 					if($rec['file']) {
 						echo "<br />";
-						echo "<a href=\"../op/op.Download.php?documentid=".$document->getID()."&reviewlogid=".$rec['reviewLogID']."\" class=\"btn btn-mini\"><i class=\"icon-download\"></i> ".getMLText('download')."</a>";
+						echo "<a href=\"../op/op.Download.php?documentid=".$document->getID()."&reviewlogid=".$rec['reviewLogID']."\" class=\"btn btn-mini\"><i class=\"fa fa-download\"></i> ".getMLText('download')."</a>";
 					}
 				break;
 			case "approval":
 				if($accessop->check_controller_access('Download', array('action'=>'approval')))
 					if($rec['file']) {
 						echo "<br />";
-						echo "<a href=\"../op/op.Download.php?documentid=".$document->getID()."&approvelogid=".$rec['approveLogID']."\" class=\"btn btn-mini\"><i class=\"icon-download\"></i> ".getMLText('download')."</a>";
+						echo "<a href=\"../op/op.Download.php?documentid=".$document->getID()."&approvelogid=".$rec['approveLogID']."\" class=\"btn btn-mini\"><i class=\"fa fa-download\"></i> ".getMLText('download')."</a>";
 					}
 				break;
 			}
@@ -3278,7 +3277,7 @@ $("body").on("click", "span.openpopupbox", function(e) {
 		<span class="openpopupbox" data-href="#'.$id.'">'.$title.'</span>
 		<div id="'.$id.'" class="popupbox" style="display: none;">
 		'.$content.'
-			<span class="closepopupbox"><i class="icon-remove"></i></span>
+			<span class="closepopupbox"><i class="fa fa-remove"></i></span>
 		</div>';
 		if($ret)
 			return $html;

views/bootstrap/class.Calendar.php

@@ -100,7 +100,7 @@ class SeedDMS_View_Calendar extends SeedDMS_Bootstrap_Style {
 					'required'=>$strictformcheck
 				)
 			);
-			$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('save'));
+			$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
 ?>
 </form>
 <?php
@@ -112,7 +112,7 @@ class SeedDMS_View_Calendar extends SeedDMS_Bootstrap_Style {
   <?php echo createHiddenFieldWithKey('removeevent'); ?>
 	<input type="hidden" name="eventid" value="<?php echo intval($event["id"]); ?>">
 	<p><?php printMLText("confirm_rm_event", array ("name" => htmlspecialchars($event["name"])));?></p>
-	<button class="btn" type="submit"><i class="icon-remove"></i> <?php printMLText("delete");?></button>
+	<button class="btn" type="submit"><i class="fa fa-remove"></i> <?php printMLText("delete");?></button>
 </form>
 <?php
 			$this->contentContainerEnd();
@@ -381,12 +381,12 @@ $(document).ready(function() {
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
 
-		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/validate/jquery.validate.js"></script>'."\n", 'js');
+		$this->htmlAddHeader('<script type="text/javascript" src="../views/'.$this->theme.'/vendors/jquery-validation/jquery.validate.js"></script>'."\n", 'js');
-		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/fullcalendar/lib/moment.min.js"></script>'."\n", 'js');
+		$this->htmlAddHeader('<script type="text/javascript" src="../views/'.$this->theme.'/vendors/moment/moment.min.js"></script>'."\n", 'js');
-		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/fullcalendar/fullcalendar.min.js"></script>'."\n", 'js');
+		$this->htmlAddHeader('<script type="text/javascript" src="../views/'.$this->theme.'/vendors/fullcalendar/fullcalendar.min.js"></script>'."\n", 'js');
-		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/fullcalendar/locale-all.js"></script>'."\n", 'js');
+		$this->htmlAddHeader('<script type="text/javascript" src="../views/'.$this->theme.'/vendors/fullcalendar/locale-all.js"></script>'."\n", 'js');
-		$this->htmlAddHeader('<link href="../styles/'.$this->theme.'/fullcalendar/fullcalendar.min.css" rel="stylesheet"></link>'."\n", 'css');
+		$this->htmlAddHeader('<link href="../views/'.$this->theme.'/vendors/fullcalendar/fullcalendar.min.css" rel="stylesheet"></link>'."\n", 'css');
-		$this->htmlAddHeader('<link href="../styles/'.$this->theme.'/fullcalendar/fullcalendar.print.min.css" rel="stylesheet" media="print"></link>'."\n", 'css');
+		$this->htmlAddHeader('<link href="../views/'.$this->theme.'/vendors/fullcalendar/fullcalendar.print.min.css" rel="stylesheet" media="print"></link>'."\n", 'css');
 
 		$this->htmlStartPage(getMLText("calendar"));
 		$this->globalNavigation();

views/bootstrap/class.Categories.php

@@ -97,7 +97,7 @@ $(document).ready( function() {
 						<?php echo createHiddenFieldWithKey('removecategory'); ?>
 						<input type="hidden" name="categoryid" value="<?php echo $selcat->getID()?>">
 						<input type="hidden" name="action" value="removecategory">
-						<button class="btn" type="submit"><i class="icon-remove"></i> <?php echo getMLText("rm_document_category")?></button>
+						<button class="btn" type="submit"><i class="fa fa-remove"></i> <?php echo getMLText("rm_document_category")?></button>
 						</form>
 <?php
 		}
@@ -124,7 +124,7 @@ $(document).ready( function() {
 					'value'=>($category ? htmlspecialchars($category->getName()) : '')
 				)
 			);
-			$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('save'));
+			$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
 ?>
 				</form>
 

views/bootstrap/class.ClearCache.php

@@ -61,7 +61,7 @@ class SeedDMS_View_ClearCache extends SeedDMS_Bootstrap_Style {
 				echo "<p><input type=\"checkbox\" name=\"".$c[0]."\" value=\"1\" checked> ".$c[1]."</p>";
 		}
 ?>
-<p><button type="submit" class="btn"><i class="icon-remove"></i> <?php printMLText("clear_cache");?></button></p>
+<p><button type="submit" class="btn"><i class="fa fa-remove"></i> <?php printMLText("clear_cache");?></button></p>
 </form>
 <?php
 		$this->contentContainerEnd();

views/bootstrap/class.Clipboard.php

@@ -53,15 +53,15 @@ class SeedDMS_View_Clipboard extends SeedDMS_Bootstrap_Style {
 		$content = '';
 		$content .= "   <ul id=\"main-menu-clipboard\" class=\"nav pull-right\">\n";
 		$content .= "    <li class=\"dropdown add-clipboard-area\">\n";
-		$content .= "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\" class=\"add-clipboard-area\">".getMLText('clipboard')." (".count($clipboard['folders'])."/".count($clipboard['docs']).") <i class=\"icon-caret-down\"></i></a>\n";
+		$content .= "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\" class=\"add-clipboard-area\">".getMLText('clipboard')." (".count($clipboard['folders'])."/".count($clipboard['docs']).") <i class=\"fa fa-caret-down\"></i></a>\n";
 		$content .= "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
 		foreach($clipboard['folders'] as $folderid) {
 			if($folder = $this->params['dms']->getFolder($folderid))
-				$content .= "    <li><a href=\"../out/out.ViewFolder.php?folderid=".$folder->getID()."\" class=\"table-row-folder droptarget\" data-droptarget=\"folder_".$folder->getID()."\" rel=\"folder_".$folder->getID()."\" data-name=\"".htmlspecialchars($folder->getName(), ENT_QUOTES)."\" data-uploadformtoken=\"".createFormKey('')."\" formtoken=\"".createFormKey('')."\"><i class=\"icon-folder-close-alt\"></i> ".htmlspecialchars($folder->getName())."</a></li>\n";
+				$content .= "    <li><a href=\"../out/out.ViewFolder.php?folderid=".$folder->getID()."\" class=\"table-row-folder droptarget\" data-droptarget=\"folder_".$folder->getID()."\" rel=\"folder_".$folder->getID()."\" data-name=\"".htmlspecialchars($folder->getName(), ENT_QUOTES)."\" data-uploadformtoken=\"".createFormKey('')."\" formtoken=\"".createFormKey('')."\"><i class=\"fa fa-folder-o\"></i> ".htmlspecialchars($folder->getName())."</a></li>\n";
 		}
 		foreach($clipboard['docs'] as $docid) {
 			if($document = $this->params['dms']->getDocument($docid))
-				$content .= "    <li><a href=\"../out/out.ViewDocument.php?documentid=".$document->getID()."\" class=\"table-row-document droptarget\" data-droptarget=\"document_".$document->getID()."\" rel=\"document_".$document->getID()."\" data-name=\"".htmlspecialchars($document->getName(), ENT_QUOTES)."\" formtoken=\"".createFormKey('')."\"><i class=\"icon-file\"></i> ".htmlspecialchars($document->getName())."</a></li>\n";
+				$content .= "    <li><a href=\"../out/out.ViewDocument.php?documentid=".$document->getID()."\" class=\"table-row-document droptarget\" data-droptarget=\"document_".$document->getID()."\" rel=\"document_".$document->getID()."\" data-name=\"".htmlspecialchars($document->getName(), ENT_QUOTES)."\" formtoken=\"".createFormKey('')."\"><i class=\"fa fa-file\"></i> ".htmlspecialchars($document->getName())."</a></li>\n";
 		}
 		$content .= "    <li class=\"divider\"></li>\n";
 		if(isset($this->params['folder']) && $this->params['folder']->getAccessMode($this->params['user']) >= M_READWRITE) {
@@ -112,7 +112,7 @@ class SeedDMS_View_Clipboard extends SeedDMS_Bootstrap_Style {
 		}
 		$content .= "</td>\n";
 		$content .= "<td>\n";
-		$content .= "<div class=\"list-action\"><a class=\"removefromclipboard\" rel=\"F".$folder->getID()."\" msg=\"".getMLText('splash_removed_from_clipboard')."\" title=\"".getMLText('rm_from_clipboard')."\"><i class=\"icon-remove\"></i></a></div>";
+		$content .= "<div class=\"list-action\"><a class=\"removefromclipboard\" rel=\"F".$folder->getID()."\" msg=\"".getMLText('splash_removed_from_clipboard')."\" title=\"".getMLText('rm_from_clipboard')."\"><i class=\"fa fa-remove\"></i></a></div>";
 		$content .= "</td>\n";
 		$content .= "</tr>\n";
 
@@ -158,7 +158,7 @@ class SeedDMS_View_Clipboard extends SeedDMS_Bootstrap_Style {
 			}
 			$content .= "</td>\n";
 			$content .= "<td>\n";
-			$content .= "<div class=\"list-action\"><a class=\"removefromclipboard\" rel=\"D".$document->getID()."\" msg=\"".getMLText('splash_removed_from_clipboard')."\" _href=\"../op/op.RemoveFromClipboard.php?folderid=".(isset($this->params['folder']) ? $this->params['folder']->getID() : '')."&id=".$document->getID()."&type=document\" title=\"".getMLText('rm_from_clipboard')."\"><i class=\"icon-remove\"></i></a></div>";
+			$content .= "<div class=\"list-action\"><a class=\"removefromclipboard\" rel=\"D".$document->getID()."\" msg=\"".getMLText('splash_removed_from_clipboard')."\" _href=\"../op/op.RemoveFromClipboard.php?folderid=".(isset($this->params['folder']) ? $this->params['folder']->getID() : '')."&id=".$document->getID()."&type=document\" title=\"".getMLText('rm_from_clipboard')."\"><i class=\"fa fa-remove\"></i></a></div>";
 			$content .= "</td>\n";
 			$content .= "</tr>";
 		}

views/bootstrap/class.DefaultKeywords.php

@@ -128,7 +128,7 @@ $(document).ready( function() {
 						<?php echo createHiddenFieldWithKey('removecategory'); ?>
 						<input type="hidden" name="categoryid" value="<?php echo $selcategoryid?>">
 						<input type="hidden" name="action" value="removecategory">
-						<button class="btn" type="submit"><i class="icon-remove"></i> <?php echo getMLText("rm_default_keyword_category")?></button>
+						<button class="btn" type="submit"><i class="fa fa-remove"></i> <?php echo getMLText("rm_default_keyword_category")?></button>
 						</form>
 <?php
 		}
@@ -159,7 +159,7 @@ $(document).ready( function() {
 					'value'=>''
 				)
 			);
-			$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('new_default_keyword_category'));
+			$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('new_default_keyword_category'));
 ?>
 			</form>
 <?php
@@ -175,7 +175,7 @@ $(document).ready( function() {
 							<input type="hidden" name="action" value="editcategory">
 							<input type="hidden" name="categoryid" value="<?php echo $category->getID()?>">
 							<input name="name" class="name" type="text" value="<?php echo htmlspecialchars($category->getName()) ?>">
-							<button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save");?></button>
+							<button type="submit" class="btn"><i class="fa fa-save"></i> <?php printMLText("save");?></button>
 						</form>
 					</div>
 				</div>
@@ -196,7 +196,7 @@ $(document).ready( function() {
 									<input type="Hidden" name="keywordsid" value="<?php echo $list["id"]?>">
 									<input type="Hidden" name="action" value="editkeywords">
 									<input name="keywords" class="keywords" type="text" value="<?php echo htmlspecialchars($list["keywords"]) ?>">
-									<button class="btn" title="<?php echo getMLText("save")?>"><i class="icon-save"></i> <?php echo getMLText("save")?></button>
+									<button class="btn" title="<?php echo getMLText("save")?>"><i class="fa fa-save"></i> <?php echo getMLText("save")?></button>
 									<!--	 <input name="action" value="removekeywords" type="Image" src="images/del.gif" title="<?php echo getMLText("delete")?>" border="0"> &nbsp; -->
 									</form>
 									<form style="display: inline-block;" method="post" action="../op/op.DefaultKeywords.php" >
@@ -204,7 +204,7 @@ $(document).ready( function() {
 									<input type="hidden" name="categoryid" value="<?php echo $category->getID()?>">
 									<input type="hidden" name="keywordsid" value="<?php echo $list["id"]?>">
 									<input type="hidden" name="action" value="removekeywords">
-									<button class="btn" title="<?php echo getMLText("delete")?>"><i class="icon-remove"></i> <?php echo getMLText("delete")?></button>
+									<button class="btn" title="<?php echo getMLText("delete")?>"><i class="fa fa-remove"></i> <?php echo getMLText("delete")?></button>
 									</form>
 									<br>
 						<?php }  ?>

views/bootstrap/class.DocumentAccess.php

@@ -120,7 +120,7 @@ $(document).ready( function() {
 				'options'=>$options
 			)
 		);
-		$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('save'));
+		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
 ?>
 	</form>
 <?php
@@ -180,7 +180,7 @@ $(document).ready( function() {
 			getMLText("default_access"),
 			$this->getAccessModeSelection($document->getDefaultAccess())
 		);
-		$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('save'));
+		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
 ?>
 </form>
 
@@ -234,7 +234,7 @@ $(document).ready( function() {
 			getMLText("access_mode"),
 			$this->getAccessModeSelection(M_READ)
 		);
-		$this->formSubmit("<i class=\"icon-plus\"></i> ".getMLText('add'));
+		$this->formSubmit("<i class=\"fa fa-plus\"></i> ".getMLText('add'));
 ?>
 </form>
 <?php
@@ -255,7 +255,7 @@ $(document).ready( function() {
 				$userObj = $userAccess->getUser();
 				$memusers[] = $userObj->getID();
 				print "<tr>\n";
-				print "<td><i class=\"icon-user\"></i></td>\n";
+				print "<td><i class=\"fa fa-user\"></i></td>\n";
 				print "<td>". htmlspecialchars($userObj->getFullName()) . "</td>\n";
 				print "<form action=\"../op/op.DocumentAccess.php\">\n";
 				print "<td>\n";
@@ -266,7 +266,7 @@ $(document).ready( function() {
 				print "<input type=\"Hidden\" name=\"documentid\" value=\"".$document->getId()."\">\n";
 				print "<input type=\"hidden\" name=\"action\" value=\"editaccess\">\n";
 				print "<input type=\"hidden\" name=\"userid\" value=\"".$userObj->getID()."\">\n";
-				print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-save\"></i> ".getMLText("save")."</button>";
+				print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"fa fa-save\"></i> ".getMLText("save")."</button>";
 				print "</td>\n";
 				print "</form>\n";
 				print "<form action=\"../op/op.DocumentAccess.php\">\n";
@@ -275,7 +275,7 @@ $(document).ready( function() {
 				print "<input type=\"Hidden\" name=\"documentid\" value=\"".$document->getId()."\">\n";
 				print "<input type=\"hidden\" name=\"action\" value=\"delaccess\">\n";
 				print "<input type=\"hidden\" name=\"userid\" value=\"".$userObj->getID()."\">\n";
-				print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</button>";
+				print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</button>";
 				print "<span></td>\n";
 				print "</form>\n";
 				print "</tr>\n";
@@ -286,7 +286,7 @@ $(document).ready( function() {
 				$memgroups[] = $groupObj->getID();
 				$mode = $groupAccess->getMode();
 				print "<tr>";
-				print "<td><i class=\"icon-group\"></i></td>";
+				print "<td><i class=\"fa fa-group\"></i></td>";
 				print "<td>". htmlspecialchars($groupObj->getName()) . "</td>";
 				print "<form action=\"../op/op.DocumentAccess.php\">";
 				print "<td>";
@@ -297,7 +297,7 @@ $(document).ready( function() {
 				print "<input type=\"hidden\" name=\"documentid\" value=\"".$document->getId()."\">";
 				print "<input type=\"hidden\" name=\"action\" value=\"editaccess\">";
 				print "<input type=\"hidden\" name=\"groupid\" value=\"".$groupObj->getID()."\">";
-				print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-save\"></i> ".getMLText("save")."</button>";
+				print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"fa fa-save\"></i> ".getMLText("save")."</button>";
 				print "</span></td>\n";
 				print "</form>";
 				print "<form action=\"../op/op.DocumentAccess.php\">\n";
@@ -306,7 +306,7 @@ $(document).ready( function() {
 				print "<input type=\"hidden\" name=\"documentid\" value=\"".$document->getId()."\">\n";
 				print "<input type=\"hidden\" name=\"action\" value=\"delaccess\">\n";
 				print "<input type=\"hidden\" name=\"groupid\" value=\"".$groupObj->getID()."\">\n";
-				print "<button type=\"submit\" class=\"btn btn-mini\"\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</button>";
+				print "<button type=\"submit\" class=\"btn btn-mini\"\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</button>";
 				print "</form>";
 				print "</span></td>\n";
 				print "</tr>\n";

views/bootstrap/class.DocumentNotify.php

@@ -151,7 +151,7 @@ $(document).ready( function() {
 		else {
 			foreach ($notifyList["users"] as $userNotify) {
 				print "<tr>";
-				print "<td><i class=\"icon-user\"></i></td>";
+				print "<td><i class=\"fa fa-user\"></i></td>";
 				print "<td>" . htmlspecialchars($userNotify->getLogin() . " - " . $userNotify->getFullName()) . "</td>";
 				if ($user->isAdmin() || $user->getID() == $userNotify->getID()) {
 					print "<form action=\"../op/op.DocumentNotify.php\" method=\"post\">\n";
@@ -160,7 +160,7 @@ $(document).ready( function() {
 					print "<input type=\"hidden\" name=\"action\" value=\"delnotify\">\n";
 					print "<input type=\"hidden\" name=\"userid\" value=\"".$userNotify->getID()."\">\n";
 					print "<td>";
-					print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</button>";
+					print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</button>";
 					print "</td>";
 					print "</form>\n";
 				}else print "<td></td>";
@@ -168,7 +168,7 @@ $(document).ready( function() {
 			}
 			foreach ($notifyList["groups"] as $groupNotify) {
 				print "<tr>";
-				print "<td><i class=\"icon-group\"></i></td>";
+				print "<td><i class=\"fa fa-group\"></i></td>";
 				print "<td>" . htmlspecialchars($groupNotify->getName()) . "</td>";
 				if ($user->isAdmin() || $groupNotify->isMember($user,true)) {
 					print "<form action=\"../op/op.DocumentNotify.php\" method=\"post\">\n";
@@ -177,7 +177,7 @@ $(document).ready( function() {
 					print "<input type=\"hidden\" name=\"action\" value=\"delnotify\">\n";
 					print "<input type=\"hidden\" name=\"groupid\" value=\"".$groupNotify->getID()."\">\n";
 					print "<td>";
-					print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</button>";
+					print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</button>";
 					print "</td>";
 					print "</form>\n";
 				}else print "<td></td>";

views/bootstrap/class.DocumentVersionDetail.php

@@ -240,27 +240,27 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 		print "<ul class=\"actions unstyled\">";
 		if ($file_exists){
 			if($accessop->check_controller_access('Download', array('action'=>'run')))
-				print "<li><a href=\"../op/op.Download.php?documentid=".$document->getID()."&version=".$version->getVersion()."\" title=\"".htmlspecialchars($version->getMimeType())."\"><i class=\"icon-download\"></i> ".getMLText("download")."</a>";
+				print "<li><a href=\"../op/op.Download.php?documentid=".$document->getID()."&version=".$version->getVersion()."\" title=\"".htmlspecialchars($version->getMimeType())."\"><i class=\"fa fa-download\"></i> ".getMLText("download")."</a>";
 			if ($viewonlinefiletypes && (in_array(strtolower($version->getFileType()), $viewonlinefiletypes) || in_array(strtolower($version->getMimeType()), $viewonlinefiletypes)))
 				if($accessop->check_controller_access('ViewOnline', array('action'=>'run')))
-					print "<li><a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$document->getID()."&version=".$version->getVersion()."\"><i class=\"icon-star\"></i> " . getMLText("view_online") . "</a>";
+					print "<li><a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$document->getID()."&version=".$version->getVersion()."\"><i class=\"fa fa-star\"></i> " . getMLText("view_online") . "</a>";
 			print "</ul>";
 			print "<ul class=\"actions unstyled\">";
 		}
 
 		if (($enableversionmodification && ($document->getAccessMode($user) >= M_READWRITE)) || $user->isAdmin()) {
-			print "<li><a href=\"out.RemoveVersion.php?documentid=".$document->getID()."&version=".$version->getVersion()."\"><i class=\"icon-remove\"></i> ".getMLText("rm_version")."</a></li>";
+			print "<li><a href=\"out.RemoveVersion.php?documentid=".$document->getID()."&version=".$version->getVersion()."\"><i class=\"fa fa-remove\"></i> ".getMLText("rm_version")."</a></li>";
 		}
 		if (($enableversionmodification && ($document->getAccessMode($user) == M_ALL)) || $user->isAdmin()) {
 			if ( $status["status"]==S_RELEASED || $status["status"]==S_OBSOLETE ){
-				print "<li><a href='../out/out.OverrideContentStatus.php?documentid=".$document->getID()."&version=".$version->getVersion()."'><i class=\"icon-align-justify\"></i>".getMLText("change_status")."</a></li>";
+				print "<li><a href='../out/out.OverrideContentStatus.php?documentid=".$document->getID()."&version=".$version->getVersion()."'><i class=\"fa fa-align-justify\"></i>".getMLText("change_status")."</a></li>";
 			}
 		}
 		if (($enableversionmodification && ($document->getAccessMode($user) >= M_READWRITE)) || $user->isAdmin()) {
 			if($status["status"] != S_OBSOLETE)
-				print "<li><a href=\"out.EditComment.php?documentid=".$document->getID()."&version=".$version->getVersion()."\"><i class=\"icon-comment\"></i> ".getMLText("edit_comment")."</a></li>";
+				print "<li><a href=\"out.EditComment.php?documentid=".$document->getID()."&version=".$version->getVersion()."\"><i class=\"fa fa-comment\"></i> ".getMLText("edit_comment")."</a></li>";
 			if ( $status["status"] == S_DRAFT_REV){
-				print "<li><a href=\"out.EditAttributes.php?documentid=".$document->getID()."&version=".$version->getVersion()."\"><i class=\"icon-edit\"></i> ".getMLText("edit_attributes")."</a></li>";
+				print "<li><a href=\"out.EditAttributes.php?documentid=".$document->getID()."&version=".$version->getVersion()."\"><i class=\"fa fa-edit\"></i> ".getMLText("edit_attributes")."</a></li>";
 		}
 			print "</ul>";
 		}
@@ -442,15 +442,15 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 			
 				print "<td><ul class=\"unstyled actions\">";
 				if ($file_exists) {
-					print "<li><a href=\"../op/op.Download.php?documentid=".$documentid."&file=".$file->getID()."\"><i class=\"icon-download\"></i>".getMLText('download')."</a></li>";
+					print "<li><a href=\"../op/op.Download.php?documentid=".$documentid."&file=".$file->getID()."\"><i class=\"fa fa-download\"></i>".getMLText('download')."</a></li>";
 					if ($viewonlinefiletypes && (in_array(strtolower($file->getFileType()), $viewonlinefiletypes) || in_array(strtolower($file->getMimeType()), $viewonlinefiletypes))) {
-						print "<li><a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$documentid."&file=". $file->getID()."\"><i class=\"icon-star\"></i>" . getMLText("view_online") . "</a></li>";
+						print "<li><a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$documentid."&file=". $file->getID()."\"><i class=\"fa fa-star\"></i>" . getMLText("view_online") . "</a></li>";
 					}
 				} else print "<li><img class=\"mimeicon\" src=\"images/icons/".$this->getMimeIcon($file->getFileType())."\" title=\"".htmlspecialchars($file->getMimeType())."\">";
 				echo "</ul><ul class=\"unstyled actions\">";
 				if (($document->getAccessMode($user) == M_ALL)||($file->getUserID()==$user->getID())) {
-					print "<li><a href=\"out.RemoveDocumentFile.php?documentid=".$documentid."&fileid=".$file->getID()."\"><i class=\"icon-remove\"></i>".getMLText("delete")."</a></li>";
+					print "<li><a href=\"out.RemoveDocumentFile.php?documentid=".$documentid."&fileid=".$file->getID()."\"><i class=\"fa fa-remove\"></i>".getMLText("delete")."</a></li>";
-					print "<li><a href=\"out.EditDocumentFile.php?documentid=".$documentid."&fileid=".$file->getID()."\"><i class=\"icon-edit\"></i>".getMLText("edit")."</a></li>";
+					print "<li><a href=\"out.EditDocumentFile.php?documentid=".$documentid."&fileid=".$file->getID()."\"><i class=\"fa fa-edit\"></i>".getMLText("edit")."</a></li>";
 				}
 				print "</ul></td>";		
 				

views/bootstrap/class.DropFolderChooser.php

@@ -102,7 +102,7 @@ $('.folderselect').click(function(ev) {
 		if($c) {
 			$content .= "   <ul id=\"main-menu-dropfolderlist\" class=\"nav pull-right\">\n";
 			$content .= "    <li class=\"dropdown add-dropfolderlist-area\">\n";
-			$content .= "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\" class=\"add-dropfolderlist-area\">".getMLText('menu_dropfolder')." (".$c.") <i class=\"icon-caret-down\"></i></a>\n";
+			$content .= "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\" class=\"add-dropfolderlist-area\">".getMLText('menu_dropfolder')." (".$c.") <i class=\"fa fa-caret-down\"></i></a>\n";
 			$content .= "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
 			$content .= $filecontent;
 			$content .= "     </ul>\n";

views/bootstrap/class.EditAttributes.php

@@ -75,7 +75,7 @@ class SeedDMS_View_EditAttributes extends SeedDMS_Bootstrap_Style {
 		} elseif(is_string($arrs)) {
 			echo $arrs;
 		}
-		$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('save'));
+		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
 ?>
 </form>
 <?php

views/bootstrap/class.EditComment.php

@@ -99,7 +99,7 @@ $(document).ready(function() {
 				'value'=>htmlspecialchars($version->getComment())
 			)
 		);
-		$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('save'));
+		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
 ?>
 </form>
 <?php

views/bootstrap/class.EditDocument.php

@@ -74,7 +74,7 @@ $(document).ready( function() {
 		$nodocumentformfields = $this->params['nodocumentformfields'];
 		$orderby = $this->params['orderby'];
 
-		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/validate/jquery.validate.js"></script>'."\n", 'js');
+		$this->htmlAddHeader('<script type="text/javascript" src="../views/'.$this->theme.'/vendors/jquery-validation/jquery.validate.js"></script>'."\n", 'js');
 
 		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
 		$this->globalNavigation($folder);
@@ -231,7 +231,7 @@ $(document).ready( function() {
 		} elseif(is_string($arrs)) {
 			echo $arrs;
 		}
-		$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('save'));
+		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
 ?>
 </form>
 <?php

views/bootstrap/class.EditDocumentFile.php

@@ -96,7 +96,7 @@ class SeedDMS_View_EditDocumentFile extends SeedDMS_Bootstrap_Style {
 		);
 ?>
 <?php
-		$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('save'));
+		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
 ?>
 </form>
 <?php

views/bootstrap/class.EditEvent.php

@@ -95,7 +95,7 @@ $(document).ready(function() {
 				<?php //$this->printDateChooser($event["start"], "from");?>
 	    		<span class="input-append date span12" id="fromdate" data-date="<?php echo date('Y-m-d', $event["start"]); ?>" data-date-format="yyyy-mm-dd">
 	      		<input class="span6" size="16" name="from" type="text" value="<?php echo date('Y-m-d', $event["start"]); ?>">
-	      		<span class="add-on"><i class="icon-calendar"></i>
+	      		<span class="add-on"><i class="fa fa-calendar"></i>
 	    		</span>
 	    	</div>
 		</div>
@@ -105,7 +105,7 @@ $(document).ready(function() {
 				<?php //$this->printDateChooser($event["stop"], "to");?>
 	    		<span class="input-append date span12" id="todate" data-date="<?php echo date('Y-m-d', $event["stop"]); ?>" data-date-format="yyyy-mm-dd">
 	      		<input class="span6" size="16" name="to" type="text" value="<?php echo date('Y-m-d', $event["stop"]); ?>">
-	      		<span class="add-on"><i class="icon-calendar"></i></span>
+	      		<span class="add-on"><i class="fa fa-calendar"></i></span>
 	    		</span>
 			</div>
 		</div>
@@ -122,7 +122,7 @@ $(document).ready(function() {
 			</div>
 		</div>
 		<div class="controls">
-			<button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save")?></button>
+			<button type="submit" class="btn"><i class="fa fa-save"></i> <?php printMLText("save")?></button>
 		</div>
 </form>
 <?php

views/bootstrap/class.EditFolder.php

@@ -71,7 +71,7 @@ $(document).ready(function() {
 		$strictformcheck = $this->params['strictformcheck'];
 		$orderby = $this->params['orderby'];
 
-		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/validate/jquery.validate.js"></script>'."\n", 'js');
+		$this->htmlAddHeader('<script type="text/javascript" src="../views/'.$this->theme.'/vendors/jquery-validation/jquery.validate.js"></script>'."\n", 'js');
 
 		$this->htmlStartPage(getMLText("folder_title", array("foldername" => htmlspecialchars($folder->getName()))));
 		$this->globalNavigation($folder);
@@ -132,7 +132,7 @@ $(document).ready(function() {
 		} elseif(is_string($arrs)) {
 			echo $arrs;
 		}
-		$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('save'));
+		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
 ?>
 </form>
 <?php

views/bootstrap/class.EditOnline.php

@@ -128,7 +128,7 @@ $this->contentHeading(getMLText("content"));
 		if($accessobject->check_controller_access('EditOnline')) {
 			echo $this->warningMsg(getMLText('edit_online_warning'));
 ?>
-<button id="update" type="submit" class="btn btn-primary"><i class="icon-save"></i> <?php printMLText("save"); ?></button>
+<button id="update" type="submit" class="btn btn-primary"><i class="fa fa-save"></i> <?php printMLText("save"); ?></button>
 <?php
 		}
 ?>

views/bootstrap/class.EditUserData.php

@@ -92,7 +92,7 @@ $(document).ready( function() {
 		$passwordstrength = $this->params['passwordstrength'];
 		$httproot = $this->params['httproot'];
 
-		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/validate/jquery.validate.js"></script>'."\n", 'js');
+		$this->htmlAddHeader('<script type="text/javascript" src="../views/'.$this->theme.'/vendors/jquery-validation/jquery.validate.js"></script>'."\n", 'js');
 
 		$this->htmlStartPage(getMLText("edit_user_details"));
 		$this->globalNavigation();
@@ -205,7 +205,7 @@ $(document).ready( function() {
 				)
 			);
 		}
-		$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('save'));
+		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
 ?>
 </form>
 

views/bootstrap/class.ExtensionMgr.php

@@ -132,7 +132,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 			echo "<td nowrap>";
 			echo "<div class=\"list-action\">";
 			if(!$checkmsgs && $extmgr->isWritableExtDir())
-				echo "<form style=\"display: inline-block; margin: 0px;\" method=\"post\" action=\"../op/op.ExtensionMgr.php\" id=\"".$re['name']."-import\">".createHiddenFieldWithKey('extensionmgr')."<input type=\"hidden\" name=\"action\" value=\"import\" /><input type=\"hidden\" name=\"currenttab\" value=\"repository\" /><input type=\"hidden\" name=\"url\" value=\"".$re['filename']."\" /><a class=\"import\" data-extname=\"".$re['name']."\" title=\"".getMLText('import_extension')."\"><i class=\"icon-download\"></i></a></form>";
+				echo "<form style=\"display: inline-block; margin: 0px;\" method=\"post\" action=\"../op/op.ExtensionMgr.php\" id=\"".$re['name']."-import\">".createHiddenFieldWithKey('extensionmgr')."<input type=\"hidden\" name=\"action\" value=\"import\" /><input type=\"hidden\" name=\"currenttab\" value=\"repository\" /><input type=\"hidden\" name=\"url\" value=\"".$re['filename']."\" /><a class=\"import\" data-extname=\"".$re['name']."\" title=\"".getMLText('import_extension')."\"><i class=\"fa fa-download\"></i></a></form>";
 			echo "</div>";
 			echo "</td>";
 			echo "</tr>";
@@ -216,15 +216,15 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 			echo "<td nowrap>";
 			echo "<div class=\"list-action\">";
 			if(!empty($extconf['changelog']) && file_exists($extdir."/".$extname."/".$extconf['changelog'])) {
-				echo "<a data-target=\"#extensionChangelog\" href=\"../out/out.ExtensionMgr.php?action=changelog&extensionname=".$extname."\" data-toggle=\"modal\" title=\"".getMLText('show_extension_changelog')."\"><i class=\"icon-reorder\"></i></a>\n";
+				echo "<a data-target=\"#extensionChangelog\" href=\"../out/out.ExtensionMgr.php?action=changelog&extensionname=".$extname."\" data-toggle=\"modal\" title=\"".getMLText('show_extension_changelog')."\"><i class=\"fa fa-reorder\"></i></a>\n";
 			}
 			if($extconf['config'])
-				echo "<a href=\"../out/out.Settings.php?currenttab=extensions#".$extname."\" title=\"".getMLText('configure_extension')."\"><i class=\"icon-cogs\"></i></a>";
+				echo "<a href=\"../out/out.Settings.php?currenttab=extensions#".$extname."\" title=\"".getMLText('configure_extension')."\"><i class=\"fa fa-cogs\"></i></a>";
-			echo "<form style=\"display: inline-block; margin: 0px;\" method=\"post\" action=\"../op/op.ExtensionMgr.php\" id=\"".$extname."-download\">".createHiddenFieldWithKey('extensionmgr')."<input type=\"hidden\" name=\"action\" value=\"download\" /><input type=\"hidden\" name=\"extname\" value=\"".$extname."\" /><a class=\"download\" data-extname=\"".$extname."\" title=\"".getMLText('download_extension')."\"><i class=\"icon-download\"></i></a></form>";
+			echo "<form style=\"display: inline-block; margin: 0px;\" method=\"post\" action=\"../op/op.ExtensionMgr.php\" id=\"".$extname."-download\">".createHiddenFieldWithKey('extensionmgr')."<input type=\"hidden\" name=\"action\" value=\"download\" /><input type=\"hidden\" name=\"extname\" value=\"".$extname."\" /><a class=\"download\" data-extname=\"".$extname."\" title=\"".getMLText('download_extension')."\"><i class=\"fa fa-download\"></i></a></form>";
 			if(!$settings->extensionIsDisabled($extname)) {
-				echo ' <a href="#" class="toggle" data-extname="'.$extname.'"><i class="icon-check"</i></a>';
+				echo ' <a href="#" class="toggle" data-extname="'.$extname.'"><i class="fa fa-check"</i></a>';
 			} else {
-				echo ' <a href="#" class="toggle" data-extname="'.$extname.'"><i class="icon-check-minus"></i></a>';
+				echo ' <a href="#" class="toggle" data-extname="'.$extname.'"><i class="fa fa-check-minus"></i></a>';
 			}
 			echo "</div>";
 			echo "</td>";
@@ -263,7 +263,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 				getMLText("extension_archive"),
 				$this->getFileChooserHtml('userfile', false)
 			);
-			$this->formSubmit("<i class=\"icon-upload\"></i> ".getMLText('import_extension'));
+			$this->formSubmit("<i class=\"fa fa-upload\"></i> ".getMLText('import_extension'));
 ?>
 		</form>
 <?php
@@ -287,7 +287,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 <form action="../op/op.ExtensionMgr.php" name="form1" method="post">
   <?php echo createHiddenFieldWithKey('extensionmgr'); ?>
 	<input type="hidden" name="action" value="refresh" />
-	<p><button type="submit" class="btn"><i class="icon-refresh"></i> <?php printMLText("refresh");?></button></p>
+	<p><button type="submit" class="btn"><i class="fa fa-refresh"></i> <?php printMLText("refresh");?></button></p>
 </form>
 			</div>
 
@@ -327,10 +327,10 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 			echo "<td nowrap>".$re['author']['name']."<br /><small>".$re['author']['company']."</small></td>";
 			echo "<td nowrap>";
 			echo "<div class=\"list-action\">";
-			echo "<a data-target=\"#extensionInfo\" href=\"../out/out.ExtensionMgr.php?action=info_versions&extensionname=".$re['name']."\" data-toggle=\"modal\" title=\"".getMLText('show_extension_version_list')."\"><i class=\"icon-list-ol\"></i></a>\n";
+			echo "<a data-target=\"#extensionInfo\" href=\"../out/out.ExtensionMgr.php?action=info_versions&extensionname=".$re['name']."\" data-toggle=\"modal\" title=\"".getMLText('show_extension_version_list')."\"><i class=\"fa fa-list-ol\"></i></a>\n";
-			echo "<a data-target=\"#extensionChangelog\" href=\"../out/out.ExtensionMgr.php?action=info_changelog&extensionname=".$re['name']."\" data-toggle=\"modal\" title=\"".getMLText('show_extension_changelog')."\"><i class=\"icon-reorder\"></i></a>\n";
+			echo "<a data-target=\"#extensionChangelog\" href=\"../out/out.ExtensionMgr.php?action=info_changelog&extensionname=".$re['name']."\" data-toggle=\"modal\" title=\"".getMLText('show_extension_changelog')."\"><i class=\"fa fa-reorder\"></i></a>\n";
 			if(!$checkmsgs && $extmgr->isWritableExtDir())
-				echo "<form style=\"display: inline-block; margin: 0px;\" method=\"post\" action=\"../op/op.ExtensionMgr.php\" id=\"".$re['name']."-import\">".createHiddenFieldWithKey('extensionmgr')."<input type=\"hidden\" name=\"action\" value=\"import\" /><input type=\"hidden\" name=\"currenttab\" value=\"repository\" /><input type=\"hidden\" name=\"url\" value=\"".$re['filename']."\" /><a class=\"import\" data-extname=\"".$re['name']."\" title=\"".getMLText('import_extension')."\"><i class=\"icon-download\"></i></a></form>";
+				echo "<form style=\"display: inline-block; margin: 0px;\" method=\"post\" action=\"../op/op.ExtensionMgr.php\" id=\"".$re['name']."-import\">".createHiddenFieldWithKey('extensionmgr')."<input type=\"hidden\" name=\"action\" value=\"import\" /><input type=\"hidden\" name=\"currenttab\" value=\"repository\" /><input type=\"hidden\" name=\"url\" value=\"".$re['filename']."\" /><a class=\"import\" data-extname=\"".$re['name']."\" title=\"".getMLText('import_extension')."\"><i class=\"fa fa-download\"></i></a></form>";
 			echo "</div>";
 			echo "</td>";
 			echo "</tr>";
@@ -343,7 +343,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 					<input type="hidden" name="action" value="getlist" />
 					<input type="hidden" name="currenttab" value="repository" />
 					<input type="hidden" name="forceupdate" value="1" />
-          <button type="submit" class="btn btn-delete"><i class="icon-refresh"></i> <?= getMLText('force_update')?></button>
+          <button type="submit" class="btn btn-delete"><i class="fa fa-refresh"></i> <?= getMLText('force_update')?></button>
 					</form>
 				</div>
 <?php

views/bootstrap/class.FolderAccess.php

@@ -117,7 +117,7 @@ $(document).ready(function() {
 				'options'=>$options
 			)
 		);
-		$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('save'));
+		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
 ?>
 	</form>
 <?php
@@ -180,7 +180,7 @@ $(document).ready(function() {
 			getMLText("default_access"),
 			$this->getAccessModeSelection($folder->getDefaultAccess())
 		);
-		$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('save'));
+		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
 ?>
 </form>
 
@@ -225,7 +225,7 @@ $(document).ready(function() {
 			getMLText("access_mode"),
 			$this->getAccessModeSelection(M_READ)
 		);
-		$this->formSubmit("<i class=\"icon-plus\"></i> ".getMLText('add'));
+		$this->formSubmit("<i class=\"fa fa-plus\"></i> ".getMLText('add'));
 ?>
 </form>
 <?php
@@ -242,7 +242,7 @@ $(document).ready(function() {
 			foreach ($accessList["users"] as $userAccess) {
 				$userObj = $userAccess->getUser();
 				print "<tr>\n";
-				print "<td><i class=\"icon-user\"></i></td>\n";
+				print "<td><i class=\"fa fa-user\"></i></td>\n";
 				print "<td>". htmlspecialchars($userObj->getFullName()) . "</td>\n";
 				print "<form action=\"../op/op.FolderAccess.php\">\n";
 				echo createHiddenFieldWithKey('folderaccess')."\n";
@@ -253,7 +253,7 @@ $(document).ready(function() {
 				$this->printAccessModeSelection($userAccess->getMode());
 				print "</td>\n";
 				print "<td>\n";
-				print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-save\"></i> ".getMLText("save")."</button>";
+				print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"fa fa-save\"></i> ".getMLText("save")."</button>";
 				print "</td>\n";
 				print "</form>\n";
 				print "<form action=\"../op/op.FolderAccess.php\">\n";
@@ -262,7 +262,7 @@ $(document).ready(function() {
 				print "<input type=\"hidden\" name=\"action\" value=\"delaccess\">\n";
 				print "<input type=\"hidden\" name=\"userid\" value=\"".$userObj->getID()."\">\n";
 				print "<td>\n";
-				print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</button>";
+				print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</button>";
 				print "</td>\n";
 				print "</form>\n";
 				print "</tr>\n";
@@ -272,7 +272,7 @@ $(document).ready(function() {
 				$groupObj = $groupAccess->getGroup();
 				$mode = $groupAccess->getMode();
 				print "<tr>";
-				print "<td><i class=\"icon-group\"></i></td>";
+				print "<td><i class=\"fa fa-group\"></i></td>";
 				print "<td>". htmlspecialchars($groupObj->getName()) . "</td>";
 				print "<form action=\"../op/op.FolderAccess.php\">";
 				echo createHiddenFieldWithKey('folderaccess')."\n";
@@ -283,7 +283,7 @@ $(document).ready(function() {
 				$this->printAccessModeSelection($groupAccess->getMode());
 				print "</td>\n";
 				print "<td><span class=\"actions\">\n";
-				print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-save\"></i> ".getMLText("save")."</button>";
+				print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"fa fa-save\"></i> ".getMLText("save")."</button>";
 				print "</span></td>\n";
 				print "</form>";
 				print "<form action=\"../op/op.FolderAccess.php\">\n";
@@ -292,7 +292,7 @@ $(document).ready(function() {
 				print "<input type=\"hidden\" name=\"action\" value=\"delaccess\">\n";
 				print "<input type=\"hidden\" name=\"groupid\" value=\"".$groupObj->getID()."\">\n";
 				print "<td>";
-				print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</button>";
+				print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</button>";
 				print "</td>\n";
 				print "</form>";
 				print "</tr>\n";

views/bootstrap/class.FolderNotify.php

@@ -151,7 +151,7 @@ $(document).ready(function() {
 		else {
 			foreach ($notifyList["users"] as $userNotify) {
 				print "<tr>";
-				print "<td><i class=\"icon-user\"></i></td>";
+				print "<td><i class=\"fa fa-user\"></i></td>";
 				print "<td>" . htmlspecialchars($userNotify->getLogin() . " - " . $userNotify->getFullName()) . "</td>";
 				if ($user->isAdmin() || $user->getID() == $userNotify->getID()) {
 					print "<form action=\"../op/op.FolderNotify.php\" method=\"post\">\n";
@@ -160,7 +160,7 @@ $(document).ready(function() {
 					print "<input type=\"Hidden\" name=\"action\" value=\"delnotify\">\n";
 					print "<input type=\"Hidden\" name=\"userid\" value=\"".$userNotify->getID()."\">\n";
 					print "<td>";
-					print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</button>";
+					print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</button>";
 					print "</td>";
 					print "</form>\n";
 				}else print "<td></td>";
@@ -168,7 +168,7 @@ $(document).ready(function() {
 			}
 			foreach ($notifyList["groups"] as $groupNotify) {
 				print "<tr>";
-				print "<td><i class=\"icon-group\"></i></td>";
+				print "<td><i class=\"fa fa-group\"></i></td>";
 				print "<td>" . htmlspecialchars($groupNotify->getName()) . "</td>";
 				if ($user->isAdmin() || $groupNotify->isMember($user,true)) {
 					print "<form action=\"../op/op.FolderNotify.php\" method=\"post\">\n";
@@ -177,7 +177,7 @@ $(document).ready(function() {
 					print "<input type=\"Hidden\" name=\"action\" value=\"delnotify\">\n";
 					print "<input type=\"Hidden\" name=\"groupid\" value=\"".$groupNotify->getID()."\">\n";
 					print "<td>";
-					print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</button>";
+					print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</button>";
 					print "</td>";
 					print "</form>\n";
 				}else print "<td></td>";

views/bootstrap/class.GroupMgr.php

@@ -163,7 +163,7 @@ $(document).ready( function() {
   </a>
   <ul class="dropdown-menu">
 <?php
-			echo '<li><a href="../out/out.RemoveGroup.php?groupid='.$selgroup->getID().'"><i class="icon-remove"></i> '.getMLText("rm_group").'</a><li>';
+			echo '<li><a href="../out/out.RemoveGroup.php?groupid='.$selgroup->getID().'"><i class="fa fa-remove"></i> '.getMLText("rm_group").'</a><li>';
 ?>
 	</ul>
 </div>
@@ -211,7 +211,7 @@ $(document).ready( function() {
 				'value'=>($group ? htmlspecialchars($group->getComment()) : '')
 			)
 		);
-		$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('save'));
+		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
 ?>
 	</form>
 <?php
@@ -228,13 +228,13 @@ $(document).ready( function() {
 				foreach ($members as $member) {
 				
 					print "<tr>";
-					print "<td><i class=\"icon-user\"></i></td>";
+					print "<td><i class=\"fa fa-user\"></i></td>";
 					print "<td>" . htmlspecialchars($member->getFullName()) . "</td>";
 					print "<td>" . ($group->isMember($member,true)?getMLText("manager"):"&nbsp;") . "</td>";
 					print "<td>";
-					print "<form action=\"../op/op.GroupMgr.php\" method=\"post\" class=\"form-inline\" style=\"display: inline-block; margin-bottom: 0px;\"><input type=\"hidden\" name=\"action\" value=\"rmmember\" /><input type=\"hidden\" name=\"groupid\" value=\"".$group->getID()."\" /><input type=\"hidden\" name=\"userid\" value=\"".$member->getID()."\" />".createHiddenFieldWithKey('rmmember')."<button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</button></form>";
+					print "<form action=\"../op/op.GroupMgr.php\" method=\"post\" class=\"form-inline\" style=\"display: inline-block; margin-bottom: 0px;\"><input type=\"hidden\" name=\"action\" value=\"rmmember\" /><input type=\"hidden\" name=\"groupid\" value=\"".$group->getID()."\" /><input type=\"hidden\" name=\"userid\" value=\"".$member->getID()."\" />".createHiddenFieldWithKey('rmmember')."<button type=\"submit\" class=\"btn btn-mini\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</button></form>";
 					print "&nbsp;";
-					print "<form action=\"../op/op.GroupMgr.php\" method=\"post\" class=\"form-inline\" style=\"display: inline-block; margin-bottom: 0px;\"><input type=\"hidden\" name=\"groupid\" value=\"".$group->getID()."\" /><input type=\"hidden\" name=\"action\" value=\"tmanager\" /><input type=\"hidden\" name=\"userid\" value=\"".$member->getID()."\" />".createHiddenFieldWithKey('tmanager')."<button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-random\"></i> ".getMLText("toggle_manager")."</button></form>";
+					print "<form action=\"../op/op.GroupMgr.php\" method=\"post\" class=\"form-inline\" style=\"display: inline-block; margin-bottom: 0px;\"><input type=\"hidden\" name=\"groupid\" value=\"".$group->getID()."\" /><input type=\"hidden\" name=\"action\" value=\"tmanager\" /><input type=\"hidden\" name=\"userid\" value=\"".$member->getID()."\" />".createHiddenFieldWithKey('tmanager')."<button type=\"submit\" class=\"btn btn-mini\"><i class=\"fa fa-random\"></i> ".getMLText("toggle_manager")."</button></form>";
 					print "</td></tr>";
 				}
 			}

views/bootstrap/class.GroupView.php

@@ -86,7 +86,7 @@ $(document).ready( function() {
 					if($manager->getId() == $member->getId())
 						echo ", ".getMLText("manager");
 				if($ismanager) {
-					echo ' <a href="../op/op.GroupView.php?action=del&groupid='.$group->getId().'&userid='.$member->getId().'" class="btn btn-mini"><i class="icon-remove"></i> '.getMLText("rm_user").'</a>';
+					echo ' <a href="../op/op.GroupView.php?action=del&groupid='.$group->getId().'&userid='.$member->getId().'" class="btn btn-mini"><i class="fa fa-remove"></i> '.getMLText("rm_user").'</a>';
 				}
 				echo "</li>";
 			}

views/bootstrap/class.ImportFS.php

@@ -90,7 +90,7 @@ class SeedDMS_View_ImportFS extends SeedDMS_Bootstrap_Style {
 					'value'=>'1'
 				)
 			);
-			$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('import'));
+			$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('import'));
 			print "</form>\n";
 			$this->contentContainerEnd();
 		} else {

views/bootstrap/class.ImportUsers.php

@@ -77,7 +77,7 @@ class SeedDMS_View_ImportUsers extends SeedDMS_Bootstrap_Style {
 				'value'=>'1'
 			)
 		);
-		$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('import'));
+		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('import'));
 		print "</form>\n";
 		$this->contentContainerEnd();
 
@@ -102,12 +102,12 @@ class SeedDMS_View_ImportUsers extends SeedDMS_Bootstrap_Style {
 				if(isset($newuser['__logs__'])) {
 					foreach($newuser['__logs__'] as $item) {
 						$class = $item['type'] == 'success' ? 'success' : 'error';
-						echo "<i class=\"icon-circle ".$class."\"></i> ".htmlspecialchars($item['msg'])."<br />";
+						echo "<i class=\"fa fa-circle ".$class."\"></i> ".htmlspecialchars($item['msg'])."<br />";
 					}
 				}
 				foreach($log[$uhash] as $item) {
 					$class = $item['type'] == 'success' ? 'success' : 'error';
-					echo "<i class=\"icon-circle ".$class."\"></i> ".htmlspecialchars($item['msg'])."<br />";
+					echo "<i class=\"fa fa-circle ".$class."\"></i> ".htmlspecialchars($item['msg'])."<br />";
 				}
 				echo "</td>";
 				echo "</tr>\n";

views/bootstrap/class.LogManagement.php

@@ -58,27 +58,27 @@ class SeedDMS_View_LogManagement extends SeedDMS_Bootstrap_Style {
 			print "<td>";
 
 			if($accessop->check_view_access('RemoveLog')) {
-				print "<a href=\"out.RemoveLog.php?mode=".$mode."&logname=".$entry."\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("rm_file")."</a>";
+				print "<a href=\"out.RemoveLog.php?mode=".$mode."&logname=".$entry."\" class=\"btn btn-mini\"><i class=\"fa fa-remove\"></i> ".getMLText("rm_file")."</a>";
 			}
 			if($accessop->check_controller_access('Download', array('action'=>'log'))) {
 				print "&nbsp;";
-				print "<a href=\"../op/op.Download.php?logname=".$entry."\" class=\"btn btn-mini\"><i class=\"icon-download\"></i> ".getMLText("download")."</a>";
+				print "<a href=\"../op/op.Download.php?logname=".$entry."\" class=\"btn btn-mini\"><i class=\"fa fa-download\"></i> ".getMLText("download")."</a>";
 			}
 			print "&nbsp;";
-			print "<a data-target=\"#logViewer\" data-cache=\"false\" href=\"out.LogManagement.php?logname=".$entry."\" role=\"button\" class=\"btn btn-mini\" data-toggle=\"modal\"><i class=\"icon-eye-open\"></i> ".getMLText('view')." …</a>";
+			print "<a data-target=\"#logViewer\" data-cache=\"false\" href=\"out.LogManagement.php?logname=".$entry."\" role=\"button\" class=\"btn btn-mini\" data-toggle=\"modal\"><i class=\"fa fa-eye-open\"></i> ".getMLText('view')." …</a>";
 			print "</td>\n";
 			print "</tr>\n";
 		}
 
 		if ($print_header) printMLText("empty_list");
-		else print "<tr><td><i class=\"icon-arrow-up\"></i></td><td colspan=\"2\"><button type=\"submit\" class=\"btn\"><i class=\"icon-remove\"></i> ".getMLText('remove_marked_files')."</button></td></tr></table></form>\n";
+		else print "<tr><td><i class=\"fa fa-arrow-up\"></i></td><td colspan=\"2\"><button type=\"submit\" class=\"btn\"><i class=\"fa fa-remove\"></i> ".getMLText('remove_marked_files')."</button></td></tr></table></form>\n";
 	} /* }}} */
 
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript');
 ?>
 $(document).ready( function() {
-	$('i.icon-arrow-up').on('click', function(e) {
+	$('i.fa fa-arrow-up').on('click', function(e) {
 //var checkBoxes = $("input[type=checkbox]");
 //checkBoxes.prop("checked", !checkBoxes.prop("checked"));
 		$('input[type=checkbox]').prop('checked', true);

views/bootstrap/class.Login.php

@@ -111,7 +111,7 @@ $(document).ready( function() {
 		$enableThemeSelector = $this->params['enablethemeselector'];
 		$enable2factauth = $this->params['enable2factauth'];
 
-		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/validate/jquery.validate.js"></script>'."\n", 'js');
+		$this->htmlAddHeader('<script type="text/javascript" src="../views/'.$this->theme.'/vendors/jquery-validation/jquery.validate.js"></script>'."\n", 'js');
 
 		$this->htmlStartPage(getMLText("sign_in"), "login");
 		$this->globalBanner();

views/bootstrap/class.ManageNotify.php

@@ -82,7 +82,7 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Bootstrap_Style {
 						echo $this->folderListRow($fld, true);
 					}
 					print "<td>";
-					if ($deleteaction) print "<a href='../op/op.ManageNotify.php?id=".$fld->getID()."&type=folder&action=del' class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</a>";
+					if ($deleteaction) print "<a href='../op/op.ManageNotify.php?id=".$fld->getID()."&type=folder&action=del' class=\"btn btn-mini\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</a>";
 					else print "<a href='../out/out.FolderNotify.php?folderid=".$fld->getID()."' class=\"btn btn-mini\">".getMLText("edit")."</a>";
 					print "</td>";
 					echo $this->folderListRowEnd($fld);
@@ -121,7 +121,7 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Bootstrap_Style {
 						echo $this->documentListRow($doc, $previewer, true);
 					}
 					print "<td>";
-					if ($deleteaction) print "<a href='../op/op.ManageNotify.php?id=".$doc->getID()."&type=document&action=del' class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</a>";
+					if ($deleteaction) print "<a href='../op/op.ManageNotify.php?id=".$doc->getID()."&type=document&action=del' class=\"btn btn-mini\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</a>";
 					else print "<a href='../out/out.DocumentNotify.php?documentid=".$doc->getID()."' class=\"btn btn-mini\">".getMLText("edit")."</a>";
 					print "</td>\n";
 					echo $this->documentListRowEnd($doc);
@@ -180,7 +180,7 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Bootstrap_Style {
 				'value'=>1
 			)
 		);
-		$this->formSubmit("<i class=\"icon-plus\"></i> ".getMLText('add'));
+		$this->formSubmit("<i class=\"fa fa-plus\"></i> ".getMLText('add'));
 		print "</form>";
 		$this->contentContainerEnd();
 		echo "</div>";
@@ -192,7 +192,7 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Bootstrap_Style {
 		/* 'form1' must be passed to printDocumentChooser() because the typeahead
 		 * function is currently hardcoded on this value */
 		$this->formField(getMLText("choose_target_document"), $this->getDocumentChooserHtml("form2"));
-		$this->formSubmit("<i class=\"icon-plus\"></i> ".getMLText('add'));
+		$this->formSubmit("<i class=\"fa fa-plus\"></i> ".getMLText('add'));
 		print "</form>";
 
 		$this->contentContainerEnd();

views/bootstrap/class.OverrideContentStatus.php

@@ -114,7 +114,7 @@ $(document).ready(function() {
 				'options'=>$options,
 			)
 		);
-		$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('update'));
+		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('update'));
 ?>
 </form>
 <?php

views/bootstrap/class.RemoveArchive.php

@@ -48,7 +48,7 @@ class SeedDMS_View_RemoveArchive extends SeedDMS_Bootstrap_Style {
 	<input type="hidden" name="arkname" value="<?php echo htmlspecialchars($arkname); ?>">
   <?php echo createHiddenFieldWithKey('removearchive'); ?>
 	<p><?php printMLText("confirm_rm_backup", array ("arkname" => htmlspecialchars($arkname)));?></p>
-	<p><button type="submit" class="btn"><i class="icon-remove"></i> <?php printMLText("backup_remove");?></button></p>
+	<p><button type="submit" class="btn"><i class="fa fa-remove"></i> <?php printMLText("backup_remove");?></button></p>
 </form>
 <?php
 		$this->contentContainerEnd();

views/bootstrap/class.RemoveDocument.php

@@ -52,7 +52,7 @@ class SeedDMS_View_RemoveDocument extends SeedDMS_Bootstrap_Style {
 <p>
 <?php printMLText("confirm_rm_document", array ("documentname" => htmlspecialchars($document->getName())));?>
 </p>
-<p><button type="submit" class="btn"><i class="icon-remove"></i> <?php printMLText("rm_document");?></button></p>
+<p><button type="submit" class="btn"><i class="fa fa-remove"></i> <?php printMLText("rm_document");?></button></p>
 </form>
 <?php
 		$this->contentContainerEnd();

views/bootstrap/class.RemoveDocumentFile.php

@@ -51,7 +51,7 @@ class SeedDMS_View_RemoveDocumentFile extends SeedDMS_Bootstrap_Style {
 	<input type="Hidden" name="documentid" value="<?php echo $document->getID()?>">
 	<input type="Hidden" name="fileid" value="<?php echo $file->getID()?>">
 	<p><?php printMLText("confirm_rm_file", array ("documentname" => htmlspecialchars($document->getName()), "name" => htmlspecialchars($file->getName())));?></p>
-	<button type="submit" class="btn"><i class="icon-remove"></i> <?php printMLText("rm_file");?></button>
+	<button type="submit" class="btn"><i class="fa fa-remove"></i> <?php printMLText("rm_file");?></button>
 </form>
 <?php
 		$this->contentContainerEnd();

views/bootstrap/class.RemoveDump.php

@@ -47,7 +47,7 @@ class SeedDMS_View_RemoveDump extends SeedDMS_Bootstrap_Style {
 	<input type="Hidden" name="dumpname" value="<?php echo htmlspecialchars($dumpname); ?>">
   <?php echo createHiddenFieldWithKey('removedump'); ?>
 	<p><?php printMLText("confirm_rm_dump", array ("dumpname" => htmlspecialchars($dumpname)));?></p>
-	<p><button type="submit" class="btn"><i class="icon-remove"></i> <?php printMLText("dump_remove");?></button></p>
+	<p><button type="submit" class="btn"><i class="fa fa-remove"></i> <?php printMLText("dump_remove");?></button></p>
 </form>
 <?php
 		$this->contentContainerEnd();

views/bootstrap/class.RemoveEvent.php

@@ -49,7 +49,7 @@ class SeedDMS_View_RemoveEvent extends SeedDMS_Bootstrap_Style {
   <?php echo createHiddenFieldWithKey('removeevent'); ?>
 	<input type="hidden" name="eventid" value="<?php echo intval($event["id"]); ?>">
 	<p><?php printMLText("confirm_rm_event", array ("name" => htmlspecialchars($event["name"])));?></p>
-	<button class="btn" type="submit"><i class="icon-remove"></i> <?php printMLText("delete");?></button>
+	<button class="btn" type="submit"><i class="fa fa-remove"></i> <?php printMLText("delete");?></button>
 </form>
 <?php
 		$this->contentContainerEnd();

views/bootstrap/class.RemoveFolder.php

@@ -50,7 +50,7 @@ class SeedDMS_View_RemoveFolder extends SeedDMS_Bootstrap_Style {
 	<p>
 	<?php printMLText("confirm_rm_folder", array ("foldername" => htmlspecialchars($folder->getName())));?>
 	</p>
-	<p><button class="btn" type="submit"><i class="icon-remove"></i> <?php printMLText("rm_folder");?></button></p>
+	<p><button class="btn" type="submit"><i class="fa fa-remove"></i> <?php printMLText("rm_folder");?></button></p>
 </form>
 <?php
 		$this->contentContainerEnd();

views/bootstrap/class.RemoveGroup.php

@@ -51,7 +51,7 @@ class SeedDMS_View_RemoveGroup extends SeedDMS_Bootstrap_Style {
 <p>
 <?php printMLText("confirm_rm_group", array ("groupname" => htmlspecialchars($group->getName())));?>
 </p>
-<p><button type="submit" class="btn"><i class="icon-remove"></i> <?php printMLText("rm_group");?></button></p>
+<p><button type="submit" class="btn"><i class="fa fa-remove"></i> <?php printMLText("rm_group");?></button></p>
 </form>
 <?php
 		$this->contentContainerEnd();

views/bootstrap/class.RemoveLog.php

@@ -54,7 +54,7 @@ class SeedDMS_View_RemoveLog extends SeedDMS_Bootstrap_Style {
 		}
 ?>
 	<p><?php printMLText("confirm_rm_log", array ("logname" => implode(', ', $lognames)));?></p>
-	<p><button type="submit" class="btn"><i class="icon-remove"></i> <?php printMLText("rm_file");?></button></p>
+	<p><button type="submit" class="btn"><i class="fa fa-remove"></i> <?php printMLText("rm_file");?></button></p>
 </form>
 <?php
 		$this->contentContainerEnd();

views/bootstrap/class.RemoveUser.php

@@ -76,7 +76,7 @@ class SeedDMS_View_RemoveUser extends SeedDMS_Bootstrap_Style {
 
 <div class="control-group">
 	<div class="controls">
-		<button type="submit" class="btn"><i class="icon-remove"></i> <?php printMLText("rm_user");?></button>
+		<button type="submit" class="btn"><i class="fa fa-remove"></i> <?php printMLText("rm_user");?></button>
 	</div>
 </div>
 

views/bootstrap/class.RemoveUserFromProcesses.php

@@ -369,7 +369,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
 			)
 		);
 		 */
-		$this->formSubmit("<i class=\"icon-remove\"></i> ".getMLText('rm_user_from_processes'));
+		$this->formSubmit("<i class=\"fa fa-remove\"></i> ".getMLText('rm_user_from_processes'));
 ?>
 
 </form>

views/bootstrap/class.RemoveVersion.php

@@ -50,7 +50,7 @@ class SeedDMS_View_RemoveVersion extends SeedDMS_Bootstrap_Style {
 	<input type="hidden" name="documentid" value="<?php echo $document->getID()?>">
 	<input type="hidden" name="version" value="<?php echo $version->getVersion()?>">
 	<p><?php printMLText("confirm_rm_version", array ("documentname" => htmlspecialchars($document->getName()), "version" => $version->getVersion()));?></p>
-  <p><button type="submit" class="btn"><i class="icon-remove"></i> <?php printMLText("rm_version");?></button></p>
+  <p><button type="submit" class="btn"><i class="fa fa-remove"></i> <?php printMLText("rm_version");?></button></p>
 </form>
 <?php
 		$this->contentContainerEnd();

views/bootstrap/class.RemoveWorkflow.php

@@ -50,7 +50,7 @@ class SeedDMS_View_RemoveWorkflow extends SeedDMS_Bootstrap_Style {
 	<form method="post" action="../op/op.RemoveWorkflow.php" name="form1">
 	<?php echo createHiddenFieldWithKey('removeworkflow'); ?>
 	<input type='hidden' name='workflowid' value='<?php echo $workflow->getId(); ?>'/>
-	<button type='submit' class="btn"><i class="icon-remove"></i> <?php printMLText("rm_workflow"); ?></button>
+	<button type='submit' class="btn"><i class="fa fa-remove"></i> <?php printMLText("rm_workflow"); ?></button>
 	</form>
 	</div>
 	<div id="workflowgraph" class="span8">

views/bootstrap/class.RemoveWorkflowFromDocument.php

@@ -73,7 +73,7 @@ class SeedDMS_View_RemoveWorkflowFromDocument extends SeedDMS_Bootstrap_Style {
 	<?php echo createHiddenFieldWithKey('removeworkflowfromdocument'); ?>
 	<input type='hidden' name='documentid' value='<?php echo $document->getId(); ?>'/>
 	<input type='hidden' name='version' value='<?php echo $latestContent->getVersion(); ?>'/>
-	<button type='submit' class="btn"><i class="icon-remove"></i> <?php printMLText("rm_workflow"); ?></button>
+	<button type='submit' class="btn"><i class="fa fa-remove"></i> <?php printMLText("rm_workflow"); ?></button>
 	</form>
 	</div>
 	<div id="workflowgraph" class="span8">

views/bootstrap/class.Search.php

@@ -254,12 +254,12 @@ $(document).ready( function() {
         </label><br />
         <span class="input-append date" style="display: inline;" id="createstartdate" data-date="<?php echo date('Y-m-d'); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
           <input class="span4" size="16" name="createstart" type="text" value="<?php if($startdate) printf("%04d-%02d-%02d", $startdate['year'], $startdate['month'], $startdate['day']); else echo date('Y-m-d'); ?>">
-          <span class="add-on"><i class="icon-calendar"></i></span>
+          <span class="add-on"><i class="fa fa-calendar"></i></span>
         </span>&nbsp;
 				<?php printMLText("and"); ?>
         <span class="input-append date" style="display: inline;" id="createenddate" data-date="<?php echo date('Y-m-d'); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
           <input class="span4" size="16" name="createend" type="text" value="<?php if($stopdate) printf("%04d-%02d-%02d", $stopdate['year'], $stopdate['month'], $stopdate['day']); else echo date('Y-m-d'); ?>">
-          <span class="add-on"><i class="icon-calendar"></i></span>
+          <span class="add-on"><i class="fa fa-calendar"></i></span>
         </span>
 </td>
 </tr>
@@ -282,7 +282,7 @@ $(document).ready( function() {
 ?>
 
 <tr>
-<td></td><td><button type="submit" class="btn"><i class="icon-search"></i> <?php printMLText("search"); ?></button></td>
+<td></td><td><button type="submit" class="btn"><i class="fa fa-search"></i> <?php printMLText("search"); ?></button></td>
 </tr>
 
 </table>
@@ -400,12 +400,12 @@ $(document).ready( function() {
         </label><br />
         <span class="input-append date" style="display: inline;" id="expirationstartdate" data-date="<?php echo date('Y-m-d'); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
           <input class="span4" size="16" name="expirationstart" type="text" value="<?php if($expstartdate) printf("%04d-%02d-%02d", $expstartdate['year'], $expstartdate['month'], $expstartdate['day']); else echo date('Y-m-d'); ?>">
-          <span class="add-on"><i class="icon-calendar"></i></span>
+          <span class="add-on"><i class="fa fa-calendar"></i></span>
         </span>&nbsp;
 				<?php printMLText("and"); ?>
         <span class="input-append date" style="display: inline;" id="expirationenddate" data-date="<?php echo date('Y-m-d'); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
           <input class="span4" size="16" name="expirationend" type="text" value="<?php if($expstopdate) printf("%04d-%02d-%02d", $expstopdate['year'], $expstopdate['month'], $expstopdate['day']); else echo date('Y-m-d'); ?>">
-          <span class="add-on"><i class="icon-calendar"></i></span>
+          <span class="add-on"><i class="fa fa-calendar"></i></span>
         </span>
 </td>
 </tr>
@@ -541,7 +541,7 @@ $(document).ready( function() {
 </td>
 </tr>
 <tr>
-<td></td><td><button type="submit" class="btn"><i class="icon-search"></i> <?php printMLText("search"); ?></button></td>
+<td></td><td><button type="submit" class="btn"><i class="fa fa-search"></i> <?php printMLText("search"); ?></button></td>
 </tr>
 </table>
 

views/bootstrap/class.SearchForm.php

@@ -183,12 +183,12 @@ $(document).ready(function() {
         </label>
         <span class="input-append date" id="createstartdate" data-date="<?php echo date('Y-m-d'); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
           <input class="span3" size="16" name="createstart" type="text" value="<?php echo date('Y-m-d'); ?>">
-          <span class="add-on"><i class="icon-calendar"></i></span>
+          <span class="add-on"><i class="fa fa-calendar"></i></span>
         </span>&nbsp;
 				<?php printMLText("and"); ?>
         <span class="input-append date" id="createenddate" data-date="<?php echo date('Y-m-d'); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
           <input class="span3" size="16" name="createend" type="text" value="<?php echo date('Y-m-d'); ?>">
-          <span class="add-on"><i class="icon-calendar"></i></span>
+          <span class="add-on"><i class="fa fa-calendar"></i></span>
         </span>
 </td>
 </tr>
@@ -200,17 +200,17 @@ $(document).ready(function() {
         </label>
         <span class="input-append date" id="expirationstartdate" data-date="<?php echo date('Y-m-d'); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
           <input class="span3" size="16" name="expirationstart" type="text" value="<?php echo date('Y-m-d'); ?>">
-          <span class="add-on"><i class="icon-calendar"></i></span>
+          <span class="add-on"><i class="fa fa-calendar"></i></span>
         </span>&nbsp;
 				<?php printMLText("and"); ?>
         <span class="input-append date" id="expirationenddate" data-date="<?php echo date('Y-m-d'); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
           <input class="span3" size="16" name="expirationend" type="text" value="<?php echo date('Y-m-d'); ?>">
-          <span class="add-on"><i class="icon-calendar"></i></span>
+          <span class="add-on"><i class="fa fa-calendar"></i></span>
         </span>
 </td>
 </tr>
 <tr>
-<td></td><td><button type="submit" class="btn"><i class="icon-search"> <?php printMLText("search"); ?></button></td>
+<td></td><td><button type="submit" class="btn"><i class="fa fa-search"> <?php printMLText("search"); ?></button></td>
 </tr>
 
 </table>
@@ -272,7 +272,7 @@ $(document).ready(function() {
 </td>
 </tr>
 <tr>
-<td></td><td><button type="submit" class="btn"><i class="icon-search"> <?php printMLText("search"); ?></button></td>
+<td></td><td><button type="submit" class="btn"><i class="fa fa-search"> <?php printMLText("search"); ?></button></td>
 </tr>
 </table>
 

views/bootstrap/class.SendLoginData.php

@@ -54,7 +54,7 @@ class SeedDMS_View_SendLoginData extends SeedDMS_Bootstrap_Style {
 				'name'=>'comment',
 			)
 		);
-		$this->formSubmit("<i class=\"icon-envelope-alt\"></i> ".getMLText('send_email'));
+		$this->formSubmit("<i class=\"fa fa-envelope-o\"></i> ".getMLText('send_email'));
 ?>
 </form>
 <?php

views/bootstrap/class.Session.php

@@ -64,14 +64,14 @@ class SeedDMS_View_Session extends SeedDMS_Bootstrap_Style {
 				if(!$sesuser->isHidden()) {
 					$c++;
 					$hasuser = true;
-					$ucontent .= "    <li><a _href=\"\"><i class=\"icon-user\"></i> ".htmlspecialchars($sesuser->getFullName()).($user->isAdmin() ? " (".getReadableDuration(time()-$session->getLastAccess()).")" : "")."</a></li>\n";
+					$ucontent .= "    <li><a _href=\"\"><i class=\"fa fa-user\"></i> ".htmlspecialchars($sesuser->getFullName()).($user->isAdmin() ? " (".getReadableDuration(time()-$session->getLastAccess()).")" : "")."</a></li>\n";
 				}
 		}
 		if($c) {
 			$content = '';
 			$content .= "   <ul id=\"main-menu-session\" class=\"nav pull-right\">\n";
 			$content .= "    <li class=\"dropdown add-session-area\">\n";
-			$content .= "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\" class=\"add-session-area\">".getMLText('sessions')." (".$c.") <i class=\"icon-caret-down\"></i></a>\n";
+			$content .= "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\" class=\"add-session-area\">".getMLText('sessions')." (".$c.") <i class=\"fa fa-caret-down\"></i></a>\n";
 			$content .= "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
 			$content .= $ucontent;
 			$content .= "     </ul>\n";

views/bootstrap/class.SetExpires.php

@@ -87,7 +87,7 @@ $(document).ready( function() {
 			getMLText("expires"),
 			$this->getDateChooser($expdate, "expdate", $this->params['session']->getLanguage())
 		);
-		$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('save'));
+		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
 ?>
 </form>
 <?php