Merge branch 'seeddms-5.0.x' into develop

out/out.UsrMgr.php

@@ -49,6 +49,12 @@ if(isset($_GET['userid']) && $_GET['userid']) {
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'seluser'=>$seluser, 'allusers'=>$users, 'allgroups'=>$groups, 'passwordstrength'=>$settings->_passwordStrength, 'passwordexpiration'=>$settings->_passwordExpiration, 'httproot'=>$settings->_httpRoot, 'enableuserimage'=>$settings->_enableUserImage, 'undeluserids'=>explode(',', $settings->_undelUserIds), 'workflowmode'=>$settings->_workflowMode, 'quota'=>$settings->_quota));
 if($view) {
+	if(isset($_GET['action']) && $_GET['action']) {
+		if(method_exists($view, $_GET['action'])) {
+			$view->{$_GET['action']}();
+			exit;
+		}
+	}
 	$view->show();
 	exit;
 }

styles/bootstrap/application.js

@@ -401,9 +401,6 @@ $(document).ready( function() {
 		});
 	});
 	
-});
-
-$(document).ready( function() {
 	$(document).on('change', '.btn-file :file', function() {
 		var input = $(this),
 		numFiles = input.get(0).files ? input.get(0).files.length : 1,
@@ -421,6 +418,47 @@ $(document).ready( function() {
 			if( log ) alert(log);
 		}
 	});
+
+	$('div.ajax').each(function(index) {
+		var element = $(this);
+		var url = element.data('href');
+		console.log('Calling '+url);
+		$.get(url, function(data) {
+			element.html(data);
+		});
+	});
+	$('div.ajax').on('update', function(event, param1) {
+		var element = $(this);
+		var url = element.data('href');
+		if(typeof param1 === 'object') {
+			for(var key in param1) {
+				url += "&"+key+"="+param1[key];
+			}
+		} else {
+			url += "&"+param1;
+		}
+		console.log("Calling: "+url);
+		element.prepend('<div style="position: absolute; overflow: hidden; background: #f7f7f7; z-index: 1000; height: '+element.height()+'px; width: '+element.width()+'px; opacity: 0.7; display: table;"><div style="display: table-cell;text-align: center; vertical-align: middle; "><img src="../views/bootstrap/images/ajax-loader.gif"></div>');
+//		element.html('<div class="ajaxloader" style="min-height: '+element.height()+'px;"><img src="typo3conf/ext/mmk_gocoachtmpl/template/Public/img/ajax-loader.gif"></div>');
+		$.get(url, function(data) {
+			element.html(data);
+		});
+	});
+	$("body").on("click", ".ajax-click", function() {
+		var element = $(this);
+		var url = element.data('href')+"?"+element.data('param1');
+		$.ajax({
+			type: 'GET',
+			url: url,
+			dataType: 'json',
+			success: function(data){
+				for (var i = 0; i < data.length; i++) {
+					noty({text: data[i].text, type: data[i].type});
+				}
+			}
+		});
+	});
+
 });		
 
 function allowDrop(ev) {

views/bootstrap/class.Bootstrap.php

@@ -1387,6 +1387,7 @@ function clearFilename<?php print $formName ?>() {
 var data = <?php echo json_encode($tree); ?>;
 $(function() {
 	$('#jqtree<?php echo $formid ?>').tree({
+		saveState: true,
 		data: data,
 		saveState: 'jqtree<?= $formid; ?>',
 		openedIcon: '<i class="icon-minus-sign"></i>',

views/bootstrap/class.UsrMgr.php

@@ -31,10 +31,15 @@ require_once("class.Bootstrap.php");
  */
 class SeedDMS_View_UsrMgr extends SeedDMS_Bootstrap_Style {
 
+	function form() { /* {{{ */
+		$seluser = $this->params['seluser'];
+
+		$this->showUserForm($seluser);
+	} /* }}} */
+
 	function showUserForm($currUser) { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
-		$seluser = $this->params['seluser'];
 		$users = $this->params['allusers'];
 		$groups = $this->params['allgroups'];
 		$passwordstrength = $this->params['passwordstrength'];
@@ -401,7 +406,12 @@ function checkForm(num)
 		return true;
 }
 
+function showUser(selectObj) {
+	id = selectObj.options[selectObj.selectedIndex].value;
+	$('div.ajax').trigger('update', {userid: id});
+}
 
+<?php if(0): ?>
 obj = -1;
 function showUser(selectObj) {
 	if (obj != -1)
@@ -414,6 +424,7 @@ function showUser(selectObj) {
 	obj = document.getElementById("keywords" + id);
 	obj.style.display = "";
 }
+<?php endif; ?>
 </script>
 <?php
 		$this->contentHeading(getMLText("user_management"));
@@ -441,6 +452,8 @@ function showUser(selectObj) {
 
 <div class="span8">
 	<div class="well">
+		<div class="ajax" data-href="../out/out.UsrMgr.php?action=form<?php if($seluser) echo "&userid=".$seluser->getID();?>"></div>
+<?php if(0): ?>
 		<div id="keywords0" style="display : none;">
 		<?php $this->showUserForm(false); ?>
 		</div>
@@ -451,6 +464,7 @@ function showUser(selectObj) {
 			$this->showUserForm($currUser);
 			print "</div>\n";
 		}
+		endif;
 ?>
 	</div>
 	</div>