Merge branch 'edge' of github.com:ktgit/knowledgetree into edge

Paul Barrett
2 parents 24752237 2b01a285
Showing 9 changed files with 80 additions and 70 deletions
ktwebservice/KTUploadManager.inc.php
setup/firstlogin/steps/firstloginTemplates.php
setup/firstlogin/templates/templates.tpl
setup/firstlogin/templates/wizard.tpl
setup/wizard/path.php
setup/wizard/resources/css/ff2.css
setup/wizard/resources/css/firstlogin.css
setup/wizard/resources/css/ie7.css
setup/wizard/resources/js/firstlogin.js
@@ -201,7 +201,7 @@ class KTUploadManager
 	{
 		$filename=basename($filename);
 		$now=date('Y-m-d H:i:s');
-		$now_str=date('YmdHis');
+		$now_str=date('YmdHis') + rand(0, 32768);
 		// Ensure the temp directory exists otherwise an error is thrown.
         if (realpath($this->temp_dir) == FALSE) {
@@ -91,19 +91,24 @@ class firstloginTemplates extends Step {
 			$ft_dir = FolderTemplatesPlugin_RDIR . DIRECTORY_SEPARATOR . "KTFolderTemplates.php";
 		}
 		$this->temp_variables['aFolderTemplates'] = $this->getTemplates();
+		$ftr = new FolderTemplateRenders(1);
+		$this->temp_variables['aTemplates'] = $ftr->renderTemplates();
 		$this->temp_variables['ft_dir'] = $ft_dir;
         return 'landing';
     }
     function applyTemplates() {
     	$templateId = KTUtil::arrayGet($_POST['data'], "templateId", 0);
+    	$folderId = KTUtil::arrayGet($_POST['data'], "folderId", 1);
     	if($templateId < 1) {
 			$templateId = KTUtil::arrayGet($_GET, "templateId", 0);// Could be ajax call
     	}
     	if($templateId > 0) {
 			if (KTPluginUtil::pluginIsActive('folder.templates.plugin')) { // Check if folder templates plugin is active
+				
 				require_once(FolderTemplatesPlugin_DIR . DIRECTORY_SEPARATOR . "FolderTemplate.inc.php");
-				return FolderTemplates::firstLoginAction(1, $templateId);
+				
+				return FolderTemplates::firstLoginAction($folderId, $templateId);
 			}
     	}
     	return false;
@@ -112,6 +117,7 @@ class firstloginTemplates extends Step {
     function getTemplates() {
 		if (KTPluginUtil::pluginIsActive('folder.templates.plugin')) { // Check if folder templates plugin is active
 			require_once(FolderTemplatesPlugin_DIR . DIRECTORY_SEPARATOR . "FolderTemplate.inc.php");
+
             return FolderTemplates::getList();
 		}
     }
@@ -16,39 +16,56 @@
 				?>
 	    	</select>
 		</div>
-<!--		<br>-->
-<!--		<br>-->
 		Folder Template Layout : 
 		<br>
 		<br>
-		<div class="tree_navigation">
-			<table cellspacing="0" class="tree_table">
-			<?php 
-				foreach ($aFolderTemplates as $oFolderTemplate) {
-					?>
-					<tr class="templates" style="display:none;" id="template_<?php echo $oFolderTemplate->getId(); ?>">
-						<td>
-							<div id="tconnector_template_<?php echo $oFolderTemplate->getId(); ?>" class="tree_icon connector-open-first open-first">&nbsp;</div>
-						</td>
-						<td>
-							<div class="tree_icon tree_folder closed">&nbsp;</div> 
-						</td>
-						<td>
-							<label>
-								<?php 
-									echo $oFolderTemplate->getName(); 
-								?>
-							</label>
-						</td>
-					</tr>
-					<tr>
-						<td id="templates_<?php echo $oFolderTemplate->getId(); ?>" class="templates"></td>
-					</tr>
-					<?php
-				}
-			?>
-			</table>
-		</div>
+	<div class="tree_navigation">
+		<table class="tree_table main" cellspacing="0" cellpadding="0">
+			<tbody>
+				<tr>
+					<td>
+						<div id="tree_edit"></div>
+					</td>
+				</tr>
+				<tr>
+					<td>
+						<div id="templatesNode">
+							<table class="tree_table aContainer" cellspacing="0" cellpadding="0">
+								<tbody>
+									<tr>
+										<td>
+										<?php 
+											foreach ($aFolderTemplates as $oFolderTemplate) {
+												?>
+												<table class="templates" cellspacing="0" cellpadding="0" id="template_<?php echo $oFolderTemplate->getId(); ?>" style="display:none;">
+													<tr>
+														<td><div id="tconnector_template_<?php echo $oFolderTemplate->getId(); ?>" class="tree_icon connector-open-first open-first">&nbsp;</div></td>
+													<td>
+														<div class="tree_icon tree_folder closed">&nbsp;</div> 
+													</td>
+													<td>
+														<label> <?php echo $oFolderTemplate->getName(); ?> </label>
+													</td>
+													</tr>
+												</table>
+												<table class="tree_table" cellspacing="0" cellpadding="0">
+													<tr>
+														<td id="templates_<?php echo $oFolderTemplate->getId(); ?>" class="template_nodes"></td>
+													</tr>
+												</table>
+											<?php
+											}
+										?>
+										<td>
+									</tr>
+								</tbody>
+							</table>
+						</div>
+					</td>
+				</tr>
+			</tbody>
+		</table>
+	</div>
 	</div>
 	<input id="skip" type="submit" name="Skip" value="Skip" class="button_skip"/>
 	<input id="next" type="submit" name="Next" value="Next" class="button_next"/>
@@ -12,6 +12,7 @@
 		<?php if(AGENT == "IE6") echo $html->css('ie6.css'); ?>
         <?php if(AGENT == "IE7") echo $html->css('ie7.css'); ?>
         <?php if(AGENT == "IE8") echo $html->css('ie8.css'); ?>
+        <?php if(AGENT == "ff2") echo $html->css('ff2.css'); ?>
         <?php if(INSTALL_TYPE == "community") echo $html->css('community.css'); ?>
         <meta http-equiv=Content-Type content="text/html; charset=utf-8">
 	</head>
@@ -51,6 +51,8 @@
 		define('AGENT', 'IE7');
 	} else if(preg_match("/MSIE 8\.\d/", $browser)) {
 		define('AGENT', 'IE8');
+	} else if(preg_match("/Firefox\/2\.\d/", $browser)) {
+		define('AGENT', 'FF2');
 	} else {
 		define('AGENT', 'OTHER');
 	}
+.tree_table { /* Override */
+	width:700px;
+}
-#outer-wrapper {
-	width:900px;
-}
-
 #logo {
 	right:70%;
 }
@@ -19,11 +15,9 @@
 	margin-top:10px;
 }
-.tree_icon {
-	float:left;
-	height:16px;
-	width:16px;
-	cursor: pointer;
+
+#template_options {
+	width : 20px;
 }
 .tree_folder {
@@ -59,32 +53,6 @@
 	background-image:url(../../../../thirdpartyjs/extjs/resources/images/default/tree/elbow-end-minus.gif);
 }
-#tree_editable {
-	float : right;
-	width: 700px;
-}
-
-.tree_navigation {
-	align : left;
-	width:600px;
-	min-height: 200px;
-	float:left;
-}
-
-.tree_table {
-	width:100%;
-}
-
-.tree_table td {
-	float:left;
-	line-height:1.8em;
-	padding: 0px 0px;
-}
-
-.outer {
-	align : left;
-}
-
 .tree_node_edit {
 	background-image:url(../../../../thirdparty/icon-theme/16x16/actions/document-properties.png);
 }
@@ -101,10 +69,23 @@
 	background-image:url(graphics/question.gif);
 }
-#template_options {
-	width : 20px;
+#tree_editable {
+	float : right;
+	width: 700px;
+}
+
+.tree_table td {
+	float:left;
+	padding: 1px 1px;
 }
 .action_form {
 	margin-left:35px;
+}
+
+.tree_icon {
+	float:left;
+	height:16px;
+	width:16px;
+	cursor: pointer;
 }
 \ No newline at end of file
 #logo {
 	right:70%;
 }
+
@@ -10,7 +10,6 @@ jQuery(function() { // Document is ready
 function firstlogin(rootUrl, pluginHandle) {
 	this.rootUrl = rootUrl + "/";
 	this.ktfolderAccess = rootUrl + "/" + pluginHandle + "?action=";
-	this.ktmanageFolderAccess = rootUrl + "/" + "admin.php?kt_path_info=misc/adminfoldertemplatesmanagement&action=";
 	this.ajaxOn = false;
 }