diff --git a/ktwebservice/KTUploadManager.inc.php b/ktwebservice/KTUploadManager.inc.php index 46daf59..54dde77 100644 --- a/ktwebservice/KTUploadManager.inc.php +++ b/ktwebservice/KTUploadManager.inc.php @@ -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) { diff --git a/setup/firstlogin/steps/firstloginTemplates.php b/setup/firstlogin/steps/firstloginTemplates.php index 0207ca3..5141120 100644 --- a/setup/firstlogin/steps/firstloginTemplates.php +++ b/setup/firstlogin/steps/firstloginTemplates.php @@ -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(); } } diff --git a/setup/firstlogin/templates/templates.tpl b/setup/firstlogin/templates/templates.tpl index f35293b..08f9e22 100644 --- a/setup/firstlogin/templates/templates.tpl +++ b/setup/firstlogin/templates/templates.tpl @@ -16,39 +16,56 @@ ?> - - Folder Template Layout :

-
- - - - - - - - - - - -
-
+
+ + + + + + + + + +
+
+
+
+ + + + + +
+ + + + + + + + + + + + +
+ + 		+
+
+
+
diff --git a/setup/firstlogin/templates/wizard.tpl b/setup/firstlogin/templates/wizard.tpl index 826faef..fca5bae 100644 --- a/setup/firstlogin/templates/wizard.tpl +++ b/setup/firstlogin/templates/wizard.tpl @@ -12,6 +12,7 @@ css('ie6.css'); ?> css('ie7.css'); ?> css('ie8.css'); ?> + css('ff2.css'); ?> css('community.css'); ?> diff --git a/setup/wizard/path.php b/setup/wizard/path.php index c228480..d7e2e24 100644 --- a/setup/wizard/path.php +++ b/setup/wizard/path.php @@ -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'); } diff --git a/setup/wizard/resources/css/ff2.css b/setup/wizard/resources/css/ff2.css new file mode 100644 index 0000000..e46653b --- /dev/null +++ b/setup/wizard/resources/css/ff2.css @@ -0,0 +1,3 @@ +.tree_table { /* Override */ + width:700px; +} diff --git a/setup/wizard/resources/css/firstlogin.css b/setup/wizard/resources/css/firstlogin.css index 9c33050..2a25795 100644 --- a/setup/wizard/resources/css/firstlogin.css +++ b/setup/wizard/resources/css/firstlogin.css @@ -1,7 +1,3 @@ -#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 diff --git a/setup/wizard/resources/css/ie7.css b/setup/wizard/resources/css/ie7.css index d58c963..fd60ea5 100644 --- a/setup/wizard/resources/css/ie7.css +++ b/setup/wizard/resources/css/ie7.css @@ -1,3 +1,4 @@ #logo { right:70%; } + diff --git a/setup/wizard/resources/js/firstlogin.js b/setup/wizard/resources/js/firstlogin.js index ba5dec6..ca58120 100644 --- a/setup/wizard/resources/js/firstlogin.js +++ b/setup/wizard/resources/js/firstlogin.js @@ -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; }