';
-$editCat .= i18n("Template:") . "
';
+$editCat .= i18n("Template:") . "
";
+$editCat .= '
';
+$editCat .= $oTpl->generate($cfg['path']['templates'] . $cfg['templates']['generic_select'], true);
+$editCat .= '
';
+$editCat .= '
';
// Category
-$editCat .= '
';
-$oTpl->set('s', 'CAT_HREF', $sess->url("main.php?area=con_tplcfg&action=tplcfg_edit&frame=4&mode=art").'&idcat=');
+$editCat .= '
';
+$oTpl->set('s', 'CAT_HREF', $sess->url("main.php?area=con_tplcfg&action=tplcfg_edit&frame=4&mode=art") . '&idcat=');
$oTpl->set('s', 'IDCAT', $idcat);
-$editCat .= '
';
+$editCat .= '
';
// Online / Offline
-$editCat .= '
';
+$editCat .= '
';
// Lock / Unlock
-$editCat .= '
';
-$editCat .= '
';
+$editCat .= '
';
+$editCat .= '
';
$editCat .= '
';
$editCat .= '
';
@@ -418,95 +408,90 @@ $editCategory->setContentData($editCat);
$oTpl->set('s', 'EDIT', $editCategory->render());
$oTpl->set('s', 'CATEGORYLINK', $categoryLink);
-
#####################################
# Collapse / Expand / Config Category
#####################################
$selflink = "main.php";
$expandlink = $sess->url($selflink . "?area=$area&frame=2&expand=all");
$collapselink = $sess->url($selflink . "?area=$area&frame=2&collapse=all");
-$collapseimg = '
'.i18n("close all").'';
-$expandimg = '
'.i18n("open all").'';
+$collapseimg = '
' . i18n("close all") . '';
+$expandimg = '
' . i18n("open all") . '';
$oTpl->set('s', 'MINUS', $collapseimg);
$oTpl->set('s', 'PLUS', $expandimg);
-/**************/
+/* * *********** */
/* SYNCSTUFF */
-/**************/
+/* * *********** */
$languages = getLanguageNamesByClient($client);
+$sListId = '';
if (count($languages) > 1 && $perm->have_perm_area_action($area, "con_synccat")) {
- $sListId = 'sync';
- $oListOptionRow = new cFoldingRow("4808dbba-ed4a-4618-8e49-3a3635396e22", i18n("Synchronize from"), $sListId);
-
- if (($syncoptions > 0) && ($syncoptions != $lang)) {
- $oListOptionRow->setExpanded (true);
- }
-
+ $sListId = 'sync';
+ $oListOptionRow = new cFoldingRow("4808dbba-ed4a-4618-8e49-3a3635396e22", i18n("Synchronize from"), $sListId);
+
+ if (($syncoptions > 0) && ($syncoptions != $lang)) {
+ $oListOptionRow->setExpanded(true);
+ }
+
#'dir="' . langGetTextDirection($lang) . '"');
$selectbox = new cHTMLSelectElement("syncoptions");
-
- $option = new cHTMLOptionElement("--- ".i18n("None")." ---", -1);
+
+ $option = new cHTMLOptionElement("--- " . i18n("None") . " ---", -1);
$selectbox->addOptionElement(-1, $option);
-
- foreach ($languages as $languageid => $languagename)
- {
- if ($lang != $languageid && $perm->have_perm_client_lang($client, $languageid))
- {
- $option = new cHTMLOptionElement($languagename . " (".$languageid.")",$languageid);
- $selectbox->addOptionElement($languageid, $option);
- }
+
+ foreach ($languages as $languageid => $languagename) {
+ if ($lang != $languageid && $perm->have_perm_client_lang($client, $languageid)) {
+ $option = new cHTMLOptionElement($languagename . " (" . $languageid . ")", $languageid);
+ $selectbox->addOptionElement($languageid, $option);
+ }
}
-
+
$selectbox->setDefault($syncoptions);
$form = new UI_Form("syncfrom");
- $form->setVar("area",$area);
+ $form->setVar("area", $area);
$form->setVar("frame", $frame);
$form->add("sel", $selectbox->render());
- $link = $sess->url("main.php?area=".$area."&frame=2").'&syncoptions=';
- $sJsLink = 'conMultiLink(\'left_bottom\', \''.$link.'\'+document.getElementsByName(\'syncoptions\')[0].value+\'&refresh_syncoptions=true\');';
- $oTpl->set('s', 'UPDATE_SYNC_REFRESH_FRAMES', $sJsLink);
-
- $form->add("submit", '
');
+ $link = $sess->url("main.php?area=" . $area . "&frame=2") . '&syncoptions=';
+ $sJsLink = 'conMultiLink(\'left_bottom\', \'' . $link . '\'+document.getElementsByName(\'syncoptions\')[0].value+\'&refresh_syncoptions=true\');';
+ $oTpl->set('s', 'UPDATE_SYNC_REFRESH_FRAMES', $sJsLink);
- $sSyncButton = '
';
- $sSyncButtonMultiple = '
';
-
- $content = '
+ $form->add("submit", '
');
+
+ $sSyncButton = '';
+ $sSyncButtonMultiple = '';
+
+ $content = '
- | '.$form->render().' |
+ ' . $form->render() . ' |
- | '.$sSyncButton.$sSyncButtonMultiple.' |
+ ' . $sSyncButton . $sSyncButtonMultiple . ' |
-
';
+
';
$oListOptionRow->setContentData($content);
- $oTpl->set('s', 'SYNCRONIZATION',$oListOptionRow->render());
+ $oTpl->set('s', 'SYNCRONIZATION', $oListOptionRow->render());
$oTpl->set('s', 'SYNCLINK', $sListId);
- $sSyncLink = $sess->url($selflink . "?area=$area&frame=2&action=con_synccat");
- $oTpl->set('s', 'SYNC_HREF', $sSyncLink);
-
+ $sSyncLink = $sess->url($selflink . "?area=$area&frame=2&action=con_synccat");
+ $oTpl->set('s', 'SYNC_HREF', $sSyncLink);
} else {
- $oTpl->set('s', 'SYNCRONIZATION','');
- $oTpl->set('s', 'SYNCLINK',$sListId);
- $oTpl->set('s', 'SYNC_HREF', '');
+ $oTpl->set('s', 'SYNCRONIZATION', '');
+ $oTpl->set('s', 'SYNCLINK', $sListId);
+ $oTpl->set('s', 'SYNC_HREF', '');
}
/*
* necessary for expanding/collapsing of navigation tree per javascript/AJAX (I. van Peeren)
- */
+ */
$oTpl->set('s', 'AREA', $area);
$oTpl->set('s', 'SESSION', $contenido);
-$oTpl->set('s', 'AJAXURL', $cfg['path']['contenido_fullhtml'].'ajaxmain.php');
+$oTpl->set('s', 'AJAXURL', $cfg['path']['contenido_fullhtml'] . 'ajaxmain.php');
##########################################
# Help
##########################################
$oTpl->set('s', 'HELPSCRIPT', setHelpContext("con"));
-$oTpl->generate($cfg['path']['templates'] . $cfg['templates']['con_left_top']);
-
-?>
\ No newline at end of file
+$oTpl->generate($cfg['path']['templates'] . $cfg['templates']['con_left_top']);
\ No newline at end of file
diff --git a/conlite/includes/include.tplcfg_edit_form.php b/conlite/includes/include.tplcfg_edit_form.php
index 8b09a28..68578b6 100644
--- a/conlite/includes/include.tplcfg_edit_form.php
+++ b/conlite/includes/include.tplcfg_edit_form.php
@@ -278,7 +278,7 @@ $tpl->set('s', 'TEMPLATECAPTION', i18n("Template"));
$tpl2 = new Template;
$tpl2->set('s', 'NAME', 'idtpl');
$tpl2->set('s', 'CLASS', 'text_medium');
-
+$disabled2 = '';
if (!$perm->have_perm_area_action_item("con", "con_changetemplate", $idcat)) {
$disabled2 = 'disabled="disabled"';
}
diff --git a/conlite/includes/main.login.php b/conlite/includes/main.login.php
index ef73da7..8e5171a 100644
--- a/conlite/includes/main.login.php
+++ b/conlite/includes/main.login.php
@@ -1,4 +1,5 @@
reset();
if ($saveLoginTime == true) {
- $sess->register("saveLoginTime");
- $saveLoginTime= 0;
+ $sess->register("saveLoginTime");
+ $saveLoginTime = 0;
- $vuser= new User();
+ $vuser = new User();
- $vuser->loadUserByUserID($auth->auth["uid"]);
-
- $lastTime= $vuser->getUserProperty("system", "currentlogintime");
- $timestamp= date("Y-m-d H:i:s");
- $vuser->setUserProperty("system", "currentlogintime", $timestamp);
- $vuser->setUserProperty("system", "lastlogintime", $lastTime);
+ $vuser->loadUserByUserID($auth->auth["uid"]);
+ $lastTime = $vuser->getUserProperty("system", "currentlogintime");
+ $timestamp = date("Y-m-d H:i:s");
+ $vuser->setUserProperty("system", "currentlogintime", $timestamp);
+ $vuser->setUserProperty("system", "lastlogintime", $lastTime);
}
-$vuser= new User();
+$vuser = new User();
$vuser->loadUserByUserID($auth->auth["uid"]);
-$lastlogin= $vuser->getUserProperty("system", "lastlogintime");
+$lastlogin = $vuser->getUserProperty("system", "lastlogintime");
if ($lastlogin == "") {
- $lastlogin= i18n("No Login Information available.");
+ $lastlogin = i18n("No Login Information available.");
}
$aNotifications = array();
// notification for requested password
-if($vuser->getField('using_pw_request') == 1) {
+if ($vuser->getField('using_pw_request') == 1) {
//$sPwNoti = $notification->returnNotification("warning", i18n("You're logged in with a temporary password. Please change your password."));
$aNotifications[] = i18n("You're logged in with a temporary password. Please change your password.");
}
// Check, if setup folder is still available
-if (file_exists(dirname(dirname(dirname(__FILE__)))."/setup")) {
- $aNotifications[] = i18n("The setup directory still exists. Please remove the setup directory before you continue.");
+if (file_exists(dirname(dirname(dirname(__FILE__))) . "/setup")) {
+ $aNotifications[] = i18n("The setup directory still exists. Please remove the setup directory before you continue.");
}
// Check, if sysadmin and/or admin accounts are still using well-known default passwords
$sDate = date('Y-m-d');
-$sSQL = "SELECT * FROM ".$cfg["tab"]["phplib_auth_user_md5"]."
+$sSQL = "SELECT * FROM " . $cfg["tab"]["phplib_auth_user_md5"] . "
WHERE (username = 'sysadmin' AND password = '48a365b4ce1e322a55ae9017f3daf0c0'
- AND (valid_from <= '".Contenido_Security::escapeDB($sDate, $db)."' OR valid_from = '0000-00-00' OR valid_from = '1000-01-01' OR valid_from is NULL) AND
- (valid_to >= '".Contenido_Security::escapeDB($sDate, $db)."' OR valid_to = '0000-00-00' OR valid_to is NULL))
+ AND (valid_from <= '" . Contenido_Security::escapeDB($sDate, $db) . "' OR valid_from = '0000-00-00' OR valid_from = '1000-01-01' OR valid_from is NULL) AND
+ (valid_to >= '" . Contenido_Security::escapeDB($sDate, $db) . "' OR valid_to = '0000-00-00' OR valid_to is NULL))
OR (username = 'admin' AND password = '21232f297a57a5a743894a0e4a801fc3'
- AND (valid_from <= '".Contenido_Security::escapeDB($sDate, $db)."' OR valid_from = '0000-00-00' OR valid_from = '1000-01-01' OR valid_from is NULL) AND
- (valid_to >= '".Contenido_Security::escapeDB($sDate, $db)."' OR valid_to = '0000-00-00' OR valid_to = '1000-01-01' OR valid_to is NULL))
+ AND (valid_from <= '" . Contenido_Security::escapeDB($sDate, $db) . "' OR valid_from = '0000-00-00' OR valid_from = '1000-01-01' OR valid_from is NULL) AND
+ (valid_to >= '" . Contenido_Security::escapeDB($sDate, $db) . "' OR valid_to = '0000-00-00' OR valid_to = '1000-01-01' OR valid_to is NULL))
";
$db->query($sSQL);
@@ -97,7 +96,7 @@ if ($db->num_rows() > 0) {
if (count($aNotifications) > 0) {
$oNotification = new Contenido_Notification();
- $sNotification = $oNotification->messageBox("warning", implode("
", $aNotifications), 1). "
";
+ $sNotification = $oNotification->messageBox("warning", implode("
", $aNotifications), 1) . "
";
} else {
$sNotification = "";
}
@@ -109,128 +108,126 @@ $userid = $auth->auth["uid"];
$oTpl->set('s', 'WELCOME', "
" . i18n("Welcome") . " " . $vuser->getRealname($userid, true) . ".");
$oTpl->set('s', 'LASTLOGIN', i18n("Last login") . ": " . $lastlogin);
-$clients= $classclient->getAccessibleClients();
+$clients = $classclient->getAccessibleClients();
-$cApiClient= new cApiClient;
-$warnings= array ();
+$cApiClient = new cApiClient;
+$warnings = array();
if (count($clients) > 1) {
- $clientform= '
");
- $oTpl->set('s', 'CLIENTSDROPDOWN', $clientselect);
-
- if ($perm->have_perm() && count($warnings) > 0) {
- $oTpl->set('s', 'WARNINGS', "
" . $notification->messageBox("warning", implode("
", $warnings), 0));
- } else {
- $oTpl->set('s', 'WARNINGS', '');
- }
- $oTpl->set('s', 'OKBUTTON', '
');
-} else {
- $oTpl->set('s', 'OKBUTTON', '');
- $sClientForm = '';
- if ( count($clients) == 0 ) {
- $sClientForm = i18n('No clients available!');
- }
- $oTpl->set('s', 'CLIENTFORM', $sClientForm);
- $oTpl->set('s', 'CLIENTFORMCLOSE', '');
-
-
- foreach ($clients as $key => $v_client) {
- if ($perm->hasClientPermission($key)) {
- $cApiClient->loadByPrimaryKey($key);
- if ($cApiClient->hasLanguages()) {
- $name= $v_client['name'] . " (" . $key . ')';
- } else {
- $warnings[]= sprintf(i18n("Client %s (%s) has no languages"), $v_client['name'], $key);
- }
+ $cApiClient->loadByPrimaryKey($key);
+ if ($cApiClient->hasLanguages()) {
+ $choices[$key] = $v_client['name'] . " (" . $key . ')';
+ } else {
+ $warnings[] = sprintf(i18n("Client %s (%s) has no languages"), $v_client['name'], $key);
}
- }
-
+ }
+ }
+
+ $select->autoFill($choices);
+ $select->setDefault($client);
+
+ $clientselect = $select->render();
+
+ $oTpl->set('s', 'CLIENTFORM', $clientform);
+ $oTpl->set('s', 'CLIENTFORMCLOSE', "");
+ $oTpl->set('s', 'CLIENTSDROPDOWN', $clientselect);
+
if ($perm->have_perm() && count($warnings) > 0) {
- $oTpl->set('s', 'WARNINGS', "
" . $notification->messageBox("warning", implode("
", $warnings), 0));
- } else {
- $oTpl->set('s', 'WARNINGS', '');
- }
-
- $oTpl->set('s', 'CLIENTSDROPDOWN', $name);
+ $oTpl->set('s', 'WARNINGS', "
" . $notification->messageBox("warning", implode("
", $warnings), 0));
+ } else {
+ $oTpl->set('s', 'WARNINGS', '');
+ }
+ $oTpl->set('s', 'OKBUTTON', '
');
+} else {
+ $oTpl->set('s', 'OKBUTTON', '');
+ $sClientForm = '';
+ if (count($clients) == 0) {
+ $sClientForm = i18n('No clients available!');
+ }
+ $oTpl->set('s', 'CLIENTFORM', $sClientForm);
+ $oTpl->set('s', 'CLIENTFORMCLOSE', '');
+
+ foreach ($clients as $key => $v_client) {
+ if ($perm->hasClientPermission($key)) {
+ $cApiClient->loadByPrimaryKey($key);
+ if ($cApiClient->hasLanguages()) {
+ $name = $v_client['name'] . " (" . $key . ')';
+ } else {
+ $warnings[] = sprintf(i18n("Client %s (%s) has no languages"), $v_client['name'], $key);
+ }
+ }
+ }
+
+ if ($perm->have_perm() && count($warnings) > 0) {
+ $oTpl->set('s', 'WARNINGS', "
" . $notification->messageBox("warning", implode("
", $warnings), 0));
+ } else {
+ $oTpl->set('s', 'WARNINGS', '');
+ }
+
+ $oTpl->set('s', 'CLIENTSDROPDOWN', $name);
}
-$props= new PropertyCollection;
+$props = new PropertyCollection;
$props->select("itemtype = 'idcommunication' AND idclient='$client' AND type = 'todo' AND name = 'status' AND value != 'done'");
-$todoitems= array ();
+$aItemsTodo = [];
-while ($prop= $props->next()) {
- $todoitems[]= $prop->get("itemid");
+while ($prop = $props->next()) {
+ $aItemsTodo[] = $prop->get("itemid");
}
-if (count($todoitems) > 0) {
- $in= "idcommunication IN (" . implode(",", $todoitems) . ")";
+if (count($aItemsTodo) > 0) {
+ $in = "idcommunication IN (" . implode(",", $aItemsTodo) . ")";
} else {
- $in= 1;
+ $in = 1;
}
-$todoitems= new TODOCollection;
-$recipient= $auth->auth["uid"];
+$todoitems = new TODOCollection();
+$recipient = $auth->auth["uid"];
$todoitems->select("recipient = '$recipient' AND idclient='$client' AND $in");
-while ($todo= $todoitems->next()) {
- if ($todo->getProperty("todo", "status") != "done") {
- $todoitems++;
- }
+$iItemsTodoOpen = 0;
+while ($todo = $todoitems->next()) {
+ if ($todo->getProperty("todo", "status") != "done") {
+ $iItemsTodoOpen++;
+ }
}
$sTaskTranslation = '';
-if ($todoitems->count() == 1) {
- $sTaskTranslation = i18n("Reminder list: %d Task open");
+if ($iItemsTodoOpen == 1) {
+ $sTaskTranslation = i18n("Reminder list: %d Task open");
} else {
- $sTaskTranslation = i18n("Reminder list: %d Tasks open");
+ $sTaskTranslation = i18n("Reminder list: %d Tasks open");
}
-$mycontenido_overview= '
' . i18n("Overview") . '';
-$mycontenido_lastarticles= '
' . i18n("Recently edited articles") . '';
-$mycontenido_tasks= '
' . sprintf($sTaskTranslation, $todoitems->count()) . '';
-$mycontenido_settings= '
' . i18n("Settings") . '';
+$mycontenido_overview = '
' . i18n("Overview") . '';
+$mycontenido_lastarticles = '
' . i18n("Recently edited articles") . '';
+$mycontenido_tasks = '
' . sprintf($sTaskTranslation, $iItemsTodoOpen) . '';
+$mycontenido_settings = '
' . i18n("Settings") . '';
$oTpl->set('s', 'MYCONTENIDO_OVERVIEW', $mycontenido_overview);
$oTpl->set('s', 'MYCONTENIDO_LASTARTICLES', $mycontenido_lastarticles);
$oTpl->set('s', 'MYCONTENIDO_TASKS', $mycontenido_tasks);
$oTpl->set('s', 'MYCONTENIDO_SETTINGS', $mycontenido_settings);
-$admins= $classuser->getSystemAdmins(true);
+$admins = $classuser->getSystemAdmins(true);
$sAdminTemplate = '
%s, %s';
-$sAdminName= "";
+$sAdminName = "";
$sAdminEmail = "";
$sOutputAdmin = "";
-
foreach ($admins as $key => $value) {
- if ($value["email"] != "") {
- $sAdminEmail= '
' . $value["email"] . '';
- $sAdminName= $value['realname'];
- $sOutputAdmin .= sprintf($sAdminTemplate, $sAdminName, $sAdminEmail);
- }
+ if ($value["email"] != "") {
+ $sAdminEmail = '
' . $value["email"] . '';
+ $sAdminName = $value['realname'];
+ $sOutputAdmin .= sprintf($sAdminTemplate, $sAdminName, $sAdminEmail);
+ }
}
$oTpl->set('s', 'ADMIN_EMAIL', $sOutputAdmin);
@@ -238,14 +235,14 @@ $oTpl->set('s', 'ADMIN_EMAIL', $sOutputAdmin);
$oTpl->set('s', 'SYMBOLHELP', '
' . i18n("Symbol help") . '');
if (isset($cfg["contenido"]["handbook_path"]) && file_exists($cfg["contenido"]["handbook_path"])) {
- $oTpl->set('s', 'CONTENIDOMANUAL', '
' . i18n("Contenido Manual") . '');
+ $oTpl->set('s', 'CONTENIDOMANUAL', '
' . i18n("Contenido Manual") . '');
} else {
- $oTpl->set('s', 'CONTENIDOMANUAL', '');
+ $oTpl->set('s', 'CONTENIDOMANUAL', '');
}
// For display current online user in Contenido-Backend
-$aMemberList= array ();
-$oActiveUsers= new ActiveUsers($db, $cfg, $auth);
+$aMemberList = array();
+$oActiveUsers = new ActiveUsers($db, $cfg, $auth);
$iNumberOfUsers = 0;
// Start()
@@ -255,17 +252,17 @@ $oActiveUsers->startUsersTracking();
$iNumberOfUsers = $oActiveUsers->getNumberOfUsers();
// Find all User who is online
-$aMemberList= $oActiveUsers->findAllUser();
+$aMemberList = $oActiveUsers->findAllUser();
// Template for display current user
$sTemplate = "";
-$sOutput = "";
-$sTemplate= '
%s, %s';
+$sOutput = "";
+$sTemplate = '
%s, %s';
foreach ($aMemberList as $key) {
- $sRealName= $key['realname'];
- $aPerms['0']= $key['perms'];
- $sOutput .= sprintf($sTemplate, $sRealName, $aPerms['0']);
+ $sRealName = $key['realname'];
+ $aPerms['0'] = $key['perms'];
+ $sOutput .= sprintf($sTemplate, $sRealName, $aPerms['0']);
}
// set template welcome
@@ -273,12 +270,11 @@ $oTpl->set('s', 'USER_ONLINE', $sOutput);
$oTpl->set('s', 'Anzahl', $iNumberOfUsers);
// rss feed
-if($perm->isSysadmin($vuser) && isset($cfg["backend"]["newsfeed"]) && $cfg["backend"]["newsfeed"] == true){
- $newsfeed = 'some news';
- $oTpl->set('s', 'CONTENIDO_NEWS', $newsfeed);
-}
-else{
- $oTpl->set('s', 'CONTENIDO_NEWS', '');
+if ($perm->isSysadmin($vuser) && isset($cfg["backend"]["newsfeed"]) && $cfg["backend"]["newsfeed"] == true) {
+ $newsfeed = 'some news';
+ $oTpl->set('s', 'CONTENIDO_NEWS', $newsfeed);
+} else {
+ $oTpl->set('s', 'CONTENIDO_NEWS', '');
}
// check for new updates
@@ -287,5 +283,4 @@ $sUpdateNotifierOutput = $oUpdateNotifier->displayOutput();
$oTpl->set('s', 'UPDATENOTIFICATION', $sUpdateNotifierOutput);
$oTpl->generate($cfg["path"]["templates"] . $cfg["templates"]["welcome"]);
-
?>
\ No newline at end of file
diff --git a/conlite/scripts/contextMenu.remove.js b/conlite/scripts/contextMenu.remove.js
deleted file mode 100644
index 10e1cd5..0000000
--- a/conlite/scripts/contextMenu.remove.js
+++ /dev/null
@@ -1,106 +0,0 @@
-var display_url;
- function createMenu (menuname, items, links)
- {
- document.writeln('');
- document.getElementById(menuname).style.display = '';
- }
-
-var ie5 = document.all && document.getElementById
- var ns6 = document.getElementById && !document.all
- if (ie5 || ns6)
-//var menuobj=document.getElementById("ie5menu")
-
- function showmenuie5(e){
-
- if (ie5)
- {
- menuobj = document.getElementById(window.event.srcElement.getAttribute("helpid"));
- } else
- {
- menuobj = document.getElementById(e.target.getAttribute("helpid"));
- }
-
-
-//Find out how close the mouse is to the corner of the window
- var rightedge = ie5? document.body.clientWidth - event.clientX : window.innerWidth - e.clientX
- var bottomedge = ie5? document.body.clientHeight - event.clientY : window.innerHeight - e.clientY
-
-//if the horizontal distance isn't enough to accomodate the width of the context menu
- if (rightedge < menuobj.offsetWidth)
-//move the horizontal position of the menu to the left by it's width
- menuobj.style.left = ie5? document.body.scrollLeft + event.clientX - menuobj.offsetWidth : window.pageXOffset + e.clientX - menuobj.offsetWidth
- else
-//position the horizontal position of the menu where the mouse was clicked
- menuobj.style.left = ie5? document.body.scrollLeft + event.clientX : window.pageXOffset + e.clientX
-
-//same concept with the vertical position
- if (bottomedge < menuobj.offsetHeight)
- menuobj.style.top = ie5? document.body.scrollTop + event.clientY - menuobj.offsetHeight : window.pageYOffset + e.clientY - menuobj.offsetHeight
- else
- menuobj.style.top = ie5? document.body.scrollTop + event.clientY : window.pageYOffset + e.clientY
-
- menuobj.style.visibility = "visible"
-
-
- return false;
-
- }
-
-function hidemenuie5(e){
-if (typeof menuobj == "object")
-{
-menuobj.style.visibility = "hidden"
-}
-}
-
-function highlightie5(e){
-var firingobj = ie5? event.srcElement : e.target
- if (firingobj.className == "menuitems" || ns6 && firingobj.parentNode.className == "menuitems"){
-if (ns6 && firingobj.parentNode.className == "menuitems") firingobj = firingobj.parentNode //up one node
- firingobj.style.backgroundColor = "#F4F8BD"
- firingobj.style.color = "black"
- firingobj.style.cursor = "pointer"
- if (display_url == 1)
- window.status = event.srcElement.url
-}
-}
-
-function lowlightie5(e){
-var firingobj = ie5? event.srcElement : e.target
- if (firingobj.className == "menuitems" || ns6 && firingobj.parentNode.className == "menuitems"){
-if (ns6 && firingobj.parentNode.className == "menuitems") firingobj = firingobj.parentNode //up one node
- firingobj.style.backgroundColor = ""
- firingobj.style.color = "black"
- window.status = ''
-}
-}
-
-function jumptoie5(e){
-var firingobj = ie5? event.srcElement : e.target
- if (firingobj.className == "menuitems" || ns6 && firingobj.parentNode.className == "menuitems"){
-if (ns6 && firingobj.parentNode.className == "menuitems") firingobj = firingobj.parentNode
- if (firingobj.getAttribute("target"))
- window.open(firingobj.getAttribute("url"), firingobj.getAttribute("target"))
- else
- window.location = firingobj.getAttribute("url")
-}
-}
-
-var menuobj;
- if (ie5 || ns6){
-//menuobj.style.display=''
-document.oncontextmenu = showmenuie5
- document.onclick = hidemenuie5
-}
\ No newline at end of file
diff --git a/conlite/templates/standard/template.con_edit_form.html b/conlite/templates/standard/template.con_edit_form.html
index 6659d98..0076951 100644
--- a/conlite/templates/standard/template.con_edit_form.html
+++ b/conlite/templates/standard/template.con_edit_form.html
@@ -1,227 +1,229 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+ }
+
+
+
-
{CATEGORY}
+
{CATEGORY}
-
+
+
+