In-portal Administration

Index: trunk/core/admin_templates/regional/languages_export_step2.tpl =================================================================== diff -u -N --- trunk/core/admin_templates/regional/languages_export_step2.tpl (revision 0) +++ trunk/core/admin_templates/regional/languages_export_step2.tpl (revision 6703) @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + "> + + + + + "> + + + + +

+ +	+ "> +
+ +

+ + + \ No newline at end of file Index: trunk/core/admin_templates/img/toolbar/tool_edit_f2.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/toolbar/tool_edit_f3.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/regional/languages_list.tpl =================================================================== diff -u -N --- trunk/core/admin_templates/regional/languages_list.tpl (revision 0) +++ trunk/core/admin_templates/regional/languages_list.tpl (revision 6703) @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Index: trunk/core/admin_templates/img/itemicons/icon16_custom_disabled.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/tab_back.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/toolbar/arrow16_f2.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/toolbar/tool_import_language_f2.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/toolbar/tool_view_f2.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/toolbar/tool_import_language_f3.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/toolbar/tool_modify.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/toolbar/tool_view_f3.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/regional/languages_edit_phrases.tpl =================================================================== diff -u -N --- trunk/core/admin_templates/regional/languages_edit_phrases.tpl (revision 0) +++ trunk/core/admin_templates/regional/languages_edit_phrases.tpl (revision 6703) @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Index: trunk/core/admin_templates/img/itemicons/icon16_language.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/toolbar/tool_approve_f2.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/toolbar/tool_approve_f3.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/tab_right.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/icons/icon24_conf.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/config/config_universal.tpl =================================================================== diff -u -N --- trunk/core/admin_templates/config/config_universal.tpl (revision 0) +++ trunk/core/admin_templates/config/config_universal.tpl (revision 6703) @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + + + + + + + + +

+ + \ No newline at end of file Index: trunk/core/admin_templates/img/toolbar/tool_move_up_f2.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/toolbar/tool_move_up_f3.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/units/languages/languages_config.php =================================================================== diff -u -N -r6669 -r6703 --- trunk/core/units/languages/languages_config.php (.../languages_config.php) (revision 6669) +++ trunk/core/units/languages/languages_config.php (.../languages_config.php) (revision 6703) @@ -93,7 +93,7 @@ 'Sections' => Array( 'in-portal:configure_lang' => Array( 'parent' => 'in-portal:system', - 'icon' => 'in-portal:conf_regional', + 'icon' => 'conf_regional', 'label' => 'la_tab_Regional', 'url' => Array('t' => 'regional/languages_list', 'pass' => 'm'), 'permissions' => Array('view', 'add', 'edit', 'delete', 'advanced:set_primary', 'advanced:import', 'advanced:export'), Index: trunk/core/admin_templates/img/toolbar/tool_cancel_f2.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/icons/icon46_list_conf_general.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/toolbar/tool_cancel_f3.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/regional/languages_edit_tabs.tpl =================================================================== diff -u -N --- trunk/core/admin_templates/regional/languages_edit_tabs.tpl (revision 0) +++ trunk/core/admin_templates/regional/languages_edit_tabs.tpl (revision 6703) @@ -0,0 +1,13 @@ + + + + +

+ + + + + + +

+

\ No newline at end of file Index: trunk/core/admin_templates/incs/fw_menu.js =================================================================== diff -u -N --- trunk/core/admin_templates/incs/fw_menu.js (revision 0) +++ trunk/core/admin_templates/incs/fw_menu.js (revision 6703) @@ -0,0 +1,745 @@ +/** + * fw_menu 24OCT2000 Version 4.0 + * John Ahlquist, October 2000 + * Copyright (c) 2000 Macromedia, Inc. + * + * based on menu.js + * by gary smith, July 1997 + * Copyright (c) 1997-1999 Netscape Communications Corp. + * + * Netscape grants you a royalty free license to use or modify this + * software provided that this copyright notice appears on all copies. + * This software is provided "AS IS," without a warranty of any kind. + * + * Modified By Intechnic Corporation for use in In-Portal + * 6/28/02 + * + */ +function Menu(label) { + this.version = "990702 [xMenu; fw_menu.js]"; + this.type = "Menu"; + this.menuWidth = 0; + this.menuItemHeight = 0; + this.fontSize = 11; + this.fontWeight = "normal"; + this.fontFamily = "helvetica, arial, verdana, helvetica"; + this.fontColor = "#000000"; + this.fontColorHilite = "#000000"; + this.bgColor = "#555555"; + this.menuBorder = 1; + this.menuItemBorder = 0; + this.menuItemBgColor = "#f0f1eb"; + this.menuLiteBgColor = "#ffffff"; + this.menuBorderBgColor = "#777777"; + this.menuHiliteBgColor = "#e0e0da"; + this.menuContainerBgColor = "#cccccc"; + this.imagePath = img_path.replace('#MODULE#', 'core'); + this.childMenuIcon = "menu_arrow.gif"; + this.items = new Array(); + this.actions = new Array(); + this.types = new Array(); //for check/radio type to show pics + this.childMenus = new Array(); + + this.hideOnMouseOut = true; + + this.addMenuItem = addMenuItem; + this.addMenuSeparator = addMenuSeparator; + this.writeMenus = writeMenus; + this.FW_showMenu = FW_showMenu; + this.onMenuItemOver = onMenuItemOver; + this.onMenuItemAction = onMenuItemAction; + this.hideMenu = hideMenu; + this.hideChildMenu = hideChildMenu; + + label = RemoveTranslationLink(label); + if (!window.menus) window.menus = new Array(); + this.label = label || "menuLabel" + window.menus.length; + window.menus[this.label] = this; + window.menus[window.menus.length] = this; + if (!window.activeMenus) window.activeMenus = new Array(); +} + +function addMenuItem(label, action, type) +{ + if( typeof(label) == 'string' ) label = RemoveTranslationLink(label); + if( isset(type) ) type = parseInt(type); + this.items[this.items.length] = label; + this.actions[this.actions.length] = action; + switch(type) + { + case 1: + this.types[this.types.length] = this.imagePath+'check_on.gif'; + break; + case 2: + this.types[this.types.length] = this.imagePath+'menu_dot.gif'; + break; + default: + this.types[this.types.length] = ''; + } +} + +function addMenuSeparator() { + this.items[this.items.length] = "separator"; + this.actions[this.actions.length] = ""; + this.types[this.types.length] = ""; + this.menuItemBorder = 0; +} + +// For NS6. +function FIND(item,called_from) +{ + if (document.all) return(document.all[item]); + if (document.getElementById) return(document.getElementById(item)); + return(false); +} + +function writeMenus(container_id) { + + if (window.triedToWriteMenus) return; + var container = null; + + if (!container_id && document.layers) { + window.delayWriteMenus = this.writeMenus; + var timer = setTimeout('delayWriteMenus()', 100); + container = new Layer(100); + clearTimeout(timer); + } else if (document.all || document.hasChildNodes) { + if( !isset(container_id) ) container_id = 'menuContainer'; + container = FIND(container_id); + if (!container) + { + container = document.createElement('SPAN'); + container.id = container_id; + document.body.appendChild(container); + container = FIND(container_id); + } + else + { + container.innerHTML = ''; + } + } + + window.fwHideMenuTimer = null; + if (!container) return; window.triedToWriteMenus = true; + container.isContainer = true; + container.menus = new Array(); + + for (var i=0; i\n'+ + '

\n'+ + '

\n'+ + ''; + } + var x=i; + for (var i=0; i'; + var dClose = '

' + if (menu.bgImageUp) { + menu.menuBorder = 0; + menu.menuItemBorder = 0; + dTag = '

'; + if (document.layers) { + dTag = ''; + dClose = ''; + } + } + var textProps = 'position:absolute;left:' + menu.menuItemIndent + ';top:1;'; + if (lrs) { + textProps +=itemProps; + dTag = ""; + dClose = ""; + } + + var dText = ''; + + if (type != '' && childMenu == false) + { + dText = '

'; + } + + + dText += '

' + item +'

\n

'+ item +'

'; + if (item == "separator") { + content += ( dTag + '

\n

\n' + dClose); + } else if (childMenu) { + content += ( dTag + dText + '

\n' + dClose); + } else { + content += ( dTag + dText + dClose); + } + if (lrs) { + l.document.open("text/html"); + l.document.writeln(content); + l.document.close(); + content = ''; + theStat += "-"; + tsc++; + if (tsc > 50) { + tsc = 0; + theStat = ""; + } + status = theStat; + } + countItems++; + } + if (lrs) { + // focus layer + var focusItem = new Layer(100, body); + focusItem.visiblity="hidden"; + focusItem.document.open("text/html"); + focusItem.document.writeln(" "); + focusItem.document.close(); + } else { + content += '

\n'; + content += '

\n

\n\n'; + } + i=x; + } + if (document.layers) { + container.clip.width = window.innerWidth; + container.clip.height = window.innerHeight; + container.onmouseout = mouseoutMenu; + container.menuContainerBgColor = this.menuContainerBgColor; + for (var i=0; i0) l.top = body.document.layers[n-1].top + body.document.layers[n-1].clip.height + proto.menuItemBorder; + l.hilite = l.document.layers[1]; + if (proto.bgImageUp) l.background.src = proto.bgImageUp; + l.document.layers[1].isHilite = true; + if (l.document.layers[0].id.indexOf("menuSeparator") != -1) { + l.hilite = null; + l.clip.height -= l.clip.height / 2; + l.document.layers[0].document.bgColor = proto.bgColor; + l.document.layers[0].clip.width = l.clip.width -2; + l.document.layers[0].clip.height = 1; + l.document.layers[1].document.bgColor = proto.menuLiteBgColor; + l.document.layers[1].clip.width = l.clip.width -2; + l.document.layers[1].clip.height = 1; + l.document.layers[1].top = l.document.layers[0].top + 1; + } else if (l.document.layers.length > 2) { + l.childMenu = container.menus[i].items[n].menuLayer; + l.document.layers[2].left = l.clip.width -13; + l.document.layers[2].top = (l.clip.height / 2) -4; + l.document.layers[2].clip.left += 3; + l.Menu.childMenus[l.Menu.childMenus.length] = l.childMenu; + } + } + body.document.bgColor = proto.bgColor; + body.clip.width = l.clip.width +proto.menuBorder; + body.clip.height = l.top + l.clip.height +proto.menuBorder; + var focusItem = body.document.layers[n]; + focusItem.clip.width = body.clip.width; + focusItem.Menu = l.Menu; + focusItem.top = -30; + focusItem.captureEvents(Event.MOUSEDOWN); + focusItem.onmousedown = onMenuItemDown; + menu.document.bgColor = proto.menuBorderBgColor; + var lite = menu.document.layers[0]; + lite.document.bgColor = proto.menuLiteBgColor; + lite.clip.width = body.clip.width +1; + lite.clip.height = body.clip.height +1; + menu.clip.width = body.clip.width + (proto.menuBorder * 3) ; + menu.clip.height = body.clip.height + (proto.menuBorder * 3); + } + } else { + if ((document.all) || (container.hasChildNodes)) { + container.innerHTML=content; + } else { + container.document.open("text/html"); + container.document.writeln(content); + container.document.close(); + } + if (!FIND("menuLayer0")) return; + var menuCount = 0; + for (var x=0; x window.innerWidth || + NS4sIH > window.innerHeight || + NS4sIH < window.innerHeight ) + { + window.location.reload(); + } +} + +function onMenuItemOver(e, l) { + FW_clearTimeout(); + l = l || this; + a = window.ActiveMenuItem; + if (document.layers) { + if (a) { + a.document.bgColor = a.saveColor; + if (a.hilite) a.hilite.visibility = "hidden"; + if (a.Menu.bgImageOver) { + a.background.src = a.Menu.bgImageUp; + } + a.focusItem.top = -100; + a.clicked = false; + } + if (l.hilite) { + l.document.bgColor = l.menuHiliteBgColor; + l.zIndex = 100; + l.hilite.visibility = "inherit"; + l.hilite.zIndex = 101; + l.document.layers[1].zIndex = 100; + l.focusItem.zIndex = this.zIndex +2; + } + if (l.Menu.bgImageOver) { + l.background.src = l.Menu.bgImageOver; + } + l.focusItem.top = this.top; + l.Menu.hideChildMenu(l); + } else if (l.style && l.Menu) { + if (a) { + a.style.backgroundColor = a.saveColor; + if (a.hilite) a.hilite.style.visibility = "hidden"; + if (a.Menu.bgImageUp) { + a.style.background = "url(" + a.Menu.bgImageUp +")";; + } + } + if (l.isSeparator) return; + l.style.backgroundColor = l.menuHiliteBgColor; + l.zIndex = 100; // magic IE 4.5 mac happy doohicky. jba + if (l.Menu.bgImageOver) { + l.style.background = "url(" + l.Menu.bgImageOver +")"; + } + if (l.hilite) { + l.style.backgroundColor = l.menuHiliteBgColor; + l.hilite.style.visibility = "inherit"; + } + l.focusItem.style.top = l.focusItem.style.pixelTop = l.style.pixelTop; + l.focusItem.style.zIndex = l.zIndex +1; +// alert(l.Menu.childMenus); + + + l.Menu.hideChildMenu(l); + } else { + return; // not a menu - magic IE 4.5 mac happy doohicky. jba + } + window.ActiveMenuItem = l; +} + +function onMenuItemAction(e, l) { + l = window.ActiveMenuItem; + if (!l) return; + hideActiveMenus(); + if (l.action) { + eval("" + l.action); + } + window.ActiveMenuItem = 0; +} + +function FW_clearTimeout() +{ + if (fwHideMenuTimer) clearTimeout(fwHideMenuTimer); + fwHideMenuTimer = null; + fwDHFlag = false; +} +function FW_startTimeout() +{ + fwStart = new Date(); + fwDHFlag = true; + fwHideMenuTimer = setTimeout("fwDoHide()", 1000); +} + +function fwDoHide() +{ + if (!fwDHFlag) return; + var elapsed = new Date() - fwStart; + if (elapsed < 1000) { + fwHideMenuTimer = setTimeout("fwDoHide()", 1100-elapsed); + return; + } + fwDHFlag = false; + hideActiveMenus(); + window.ActiveMenuItem = 0; +} + +function FW_showMenu(menu, x, y, child) { + if (!window.fwWroteMenu) + { + alert('No Menu Written'); + return; + } + FW_clearTimeout(); + if (document.layers) { + if (menu) { + var l = menu.menuLayer || menu; + l.left = 1; + l.top = 1; + hideActiveMenus(); + if (this.visibility) l = this; + window.ActiveMenu = l; + } else { + var l = child; + } + if (!l) return; + for (var i=0; i 0) + FW_showMenu(null, "relative", "relative", l.layers[i]); + } + if (l.parentLayer) { + if (x != "relative") + l.parentLayer.left = x || window.pageX || 0; + if (l.parentLayer.left + l.clip.width > window.innerWidth) + l.parentLayer.left -= (l.parentLayer.left + l.clip.width - window.innerWidth); + if (y != "relative") + l.parentLayer.top = y || window.pageY || 0; + if (l.parentLayer.isContainer) { + l.Menu.xOffset = window.pageXOffset; + l.Menu.yOffset = window.pageYOffset; + l.parentLayer.clip.width = window.ActiveMenu.clip.width +2; + l.parentLayer.clip.height = window.ActiveMenu.clip.height +2; + if (l.parentLayer.menuContainerBgColor) l.parentLayer.document.bgColor = l.parentLayer.menuContainerBgColor; + } + } + l.visibility = "inherit"; + if (l.Menu) l.Menu.container.visibility = "inherit"; + } else if (FIND("menuItem0")) { + var l = menu.menuLayer || menu; + hideActiveMenus(); +// alert('L: '+l); + if (typeof(l) == "string") { + l = FIND(l,'line 550'); + } + window.ActiveMenu = l; + var s = l.style; + s.visibility = "inherit"; + if (x != "relative") + s.left = s.pixelLeft = x || (window.pageX + document.body.scrollLeft) || 0; + if (y != "relative") + s.top = s.pixelTop = y || (window.pageY + document.body.scrollTop) || 0; + l.Menu.xOffset = document.body.scrollLeft; + l.Menu.yOffset = document.body.scrollTop; + } + if (menu) { + window.activeMenus[window.activeMenus.length] = l; + } +} + +function onMenuItemDown(e, l) { + var a = window.ActiveMenuItem; + if (document.layers) { + if (a) { + a.eX = e.pageX; + a.eY = e.pageY; + a.clicked = true; + } + } +} + +function mouseupMenu(e) +{ + hideMenu(true, e); + hideActiveMenus(); + return true; +} + +function mouseoutMenu() +{ + hideMenu(false, false); + return true; +} + + +function hideMenu(mouseup, e) { + var a = window.ActiveMenuItem; + if (a && document.layers) { + a.document.bgColor = a.saveColor; + a.focusItem.top = -30; + if (a.hilite) a.hilite.visibility = "hidden"; + if (mouseup && a.action && a.clicked && window.ActiveMenu) { + if (a.eX <= e.pageX+15 && a.eX >= e.pageX-15 && a.eY <= e.pageY+10 && a.eY >= e.pageY-10) { + setTimeout('window.ActiveMenu.Menu.onMenuItemAction();', 2); + } + } + a.clicked = false; + if (a.Menu.bgImageOver) { + a.background.src = a.Menu.bgImageUp; + } + } else if (window.ActiveMenu && FIND("menuItem0")) { + if (a) { + a.style.backgroundColor = a.saveColor; + if (a.hilite) a.hilite.style.visibility = "hidden"; + if (a.Menu.bgImageUp) { + a.style.background = "url(" + a.Menu.bgImageUp +")";; + } + } + } + if (!mouseup && window.ActiveMenu) { + if (window.ActiveMenu.Menu) { + if (window.ActiveMenu.Menu.hideOnMouseOut) { + FW_startTimeout(); + } + return(true); + } + } + return(true); +} + +function PxToNum(pxStr) +{ // pxStr == 27px, we want 27. + if (pxStr.length > 2) { + n = Number(pxStr.substr(0, pxStr.length-2)); + return(n); + } + return(0); +} + +function hideChildMenu(hcmLayer) +{ + FW_clearTimeout(); + var l = hcmLayer; + for (var i = 0; i < l.Menu.childMenus.length; i++) + { + var theLayer = l.Menu.childMenus[i]; + if (document.layers) + { + theLayer.visibility = "hidden"; + } + else + { + theLayer = FIND(theLayer,'method "hideChildMenu" (1st for cycle)'); + theLayer.style.visibility = "hidden"; + } + theLayer.Menu.hideChildMenu(theLayer); + } + + if (l.childMenu) { + var childMenu = l.childMenu; + if (document.layers) { + l.Menu.FW_showMenu(null,null,null,childMenu.layers[0]); + childMenu.zIndex = l.parentLayer.zIndex +1; + childMenu.top = l.top + l.parentLayer.top + l.Menu.menuLayer.top + l.Menu.menuItemHeight/3; + if (childMenu.left + childMenu.clip.width > window.innerWidth) { + childMenu.left = l.parentLayer.left - childMenu.clip.width + l.Menu.menuLayer.left + 15; + l.Menu.container.clip.left -= childMenu.clip.width; + } else { + childMenu.left = l.parentLayer.left + l.parentLayer.clip.width + l.Menu.menuLayer.left -5; + } + var w = childMenu.clip.width+childMenu.left-l.Menu.container.clip.left; + if (w > l.Menu.container.clip.width) + l.Menu.container.clip.width = w; + var h = childMenu.clip.height+childMenu.top-l.Menu.container.clip.top; + if (h > l.Menu.container.clip.height) l.Menu.container.clip.height = h; + l.document.layers[1].zIndex = 0; + childMenu.visibility = "inherit"; + } else if (FIND("menuItem0")) { + childMenu = FIND(l.childMenu,'method "hideChildMenu" (menuItem0 childmenu finding)'); + var menuLayer = FIND(l.Menu.menuLayer,'method "hideChildMenu" (menuItem0 layer finding)'); + var s = childMenu.style; + s.zIndex = menuLayer.style.zIndex+1; + if (document.all) { // ie case. + s.pixelTop = l.style.pixelTop + menuLayer.style.pixelTop + l.Menu.menuItemHeight/3; + left = s.pixelLeft = (menuLayer.style.pixelWidth) + menuLayer.style.pixelLeft -5; +// alert(left + parseInt(s.width) - document.body.scrollLeft) + if (left + parseInt(s.width) > document.body.scrollLeft + document.body.offsetWidth) + left -= parseInt(s.width) + l.offsetWidth - 5; + s.left = left; + + + } else { // zilla case + var top = PxToNum(l.style.top) + PxToNum(menuLayer.style.top) + l.Menu.menuItemHeight/3; + var left = (PxToNum(menuLayer.style.width)) + PxToNum(menuLayer.style.left) -5; + s.top = top; +// alert() + if (left + parseInt(s.width) > document.body.offsetWidth) + left -= parseInt(s.width) + l.offsetWidth - 5; + s.left = left; + } + childMenu.style.visibility = "inherit"; + } else { + return; + } + window.activeMenus[window.activeMenus.length] = childMenu; + } +} + +function hideActiveMenus() { + if (!window.activeMenus) return; + for (var i=0; i < window.activeMenus.length; i++) { + if (!activeMenus[i]) continue; + if (activeMenus[i].visibility && activeMenus[i].Menu) { + activeMenus[i].visibility = "hidden"; + activeMenus[i].Menu.container.visibility = "hidden"; + activeMenus[i].Menu.container.clip.left = 0; + } else if (activeMenus[i].style) { + var s = activeMenus[i].style; + s.visibility = "hidden"; + s.left = -200; + s.top = -200; + } + } + if (window.ActiveMenuItem) { + hideMenu(false, false); + } + window.activeMenus.length = 0; +} + + Index: trunk/core/admin_templates/img/toolbar/tool_export_language_f2.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/toolbar/tool_export_language_f3.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/kernel/utility/debugger.php =================================================================== diff -u -N -r6650 -r6703 --- trunk/core/kernel/utility/debugger.php (.../debugger.php) (revision 6650) +++ trunk/core/kernel/utility/debugger.php (.../debugger.php) (revision 6703) @@ -48,7 +48,7 @@ * * @var string */ - var $dummyImage = 'http://www.adamauto.lv/chevrolet/images/spacer.gif'; + var $dummyImage = ''; /** * Temporary files created by debugger will be stored here Index: trunk/core/admin_templates/img/toolbar/tool_decline.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/menu_dot.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/menu_arrow.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/icons/icon46_conf_regional.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/toolbar/tool_new_item.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/kernel/db/db_tag_processor.php =================================================================== diff -u -N -r6583 -r6703 --- trunk/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 6583) +++ trunk/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 6703) @@ -1506,12 +1506,18 @@ if ($force_module) { if ($force_module == '#session#') { $force_module = $this->Application->RecallVar('module'); + if (!$force_module) $force_module = 'core'; } else { $force_module = strtolower($force_module); } - $module_folder = trim( $this->Application->findModule('Name', $force_module, 'Path'), '/'); + if ($force_module == 'core') { + $module_folder = 'core'; + } + else { + $module_folder = trim( $this->Application->findModule('Name', $force_module, 'Path'), '/'); + } } else { $module_folder = $this->Application->getUnitOption($this->Prefix, 'ModuleFolder'); Index: trunk/core/admin_templates/img/icons/icon46_list_conf_regional.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/toolbar/tool_export_language.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/itemicons/icon16_custom.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/tab_left.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/toolbar/tool_move_down_f2.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/units/admin/admin_config.php =================================================================== diff -u -N -r6700 -r6703 --- trunk/core/units/admin/admin_config.php (.../admin_config.php) (revision 6700) +++ trunk/core/units/admin/admin_config.php (.../admin_config.php) (revision 6703) @@ -21,7 +21,15 @@ ), 'Sections' => Array( - + 'in-portal:root' => Array( + 'parent' => null, + 'icon' => 'site', + 'label' => $this->Application->ConfigValue('Site_Name'), + 'url' => Array('t' => 'sections_list', 'pass' => 'm', 'pass_section' => true, 'no_amp' => 1), + 'permissions' => Array('advanced:admin_login', 'advanced:front_login'), + 'priority' => 0, + 'type' => stTREE, + ), ), ); Index: trunk/core/admin_templates/img/toolbar/tool_move_down_f3.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/toolbar/icon16_search_f2.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/check_on.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/toolbar/icon16_search.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/icons/icon24_site.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/regional/languages_edit_email_events.tpl =================================================================== diff -u -N --- trunk/core/admin_templates/regional/languages_edit_email_events.tpl (revision 0) +++ trunk/core/admin_templates/regional/languages_edit_email_events.tpl (revision 6703) @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Index: trunk/core/admin_templates/regional/languages_import_step2.tpl =================================================================== diff -u -N --- trunk/core/admin_templates/regional/languages_import_step2.tpl (revision 0) +++ trunk/core/admin_templates/regional/languages_import_step2.tpl (revision 6703) @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + +

+
+ + + + + +

%" class="progress_bar">

%">

+
+ " name="events[lang][OnImportCancel]" /> +

+ + + \ No newline at end of file Index: trunk/core/admin_templates/js/toolbar.js =================================================================== diff -u -N -r6656 -r6703 --- trunk/core/admin_templates/js/toolbar.js (.../toolbar.js) (revision 6656) +++ trunk/core/admin_templates/js/toolbar.js (.../toolbar.js) (revision 6703) @@ -31,7 +31,7 @@ } else { // use default module - this.Module = 'kernel'; + this.Module = 'core'; } } @@ -163,7 +163,7 @@ function ToolBar(icon_prefix, $module) { - this.Module = $module ? $module : 'kernel'; + this.Module = $module ? $module : 'core'; this.IconPrefix = icon_prefix ? icon_prefix : 'tool_'; this.Buttons = new Array(); } Index: trunk/core/admin_templates/img/logo_bg.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/toolbar/arrow16.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/icons/icon24_conf_general.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/toolbar/tool_primary_language_f2.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/toolbar/tool_primary_language_f3.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/toolbar/tool_prev_f2.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/toolbar/tool_divider.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/toolbar/tool_new_item_f2.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/toolbar/tool_prev_f3.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/toolbar/tool_new_item_f3.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/incs/form_blocks.tpl =================================================================== diff -u -N -r6656 -r6703 --- trunk/core/admin_templates/incs/form_blocks.tpl (.../form_blocks.tpl) (revision 6656) +++ trunk/core/admin_templates/incs/form_blocks.tpl (.../form_blocks.tpl) (revision 6703) @@ -29,14 +29,16 @@ - - -

- + + + +

+ + Index: trunk/core/admin_templates/incs/tab_blocks.tpl =================================================================== diff -u -N -r6656 -r6703 --- trunk/core/admin_templates/incs/tab_blocks.tpl (.../tab_blocks.tpl) (revision 6656) +++ trunk/core/admin_templates/incs/tab_blocks.tpl (.../tab_blocks.tpl) (revision 6703) @@ -15,7 +15,7 @@ - url(img/tab_back3.jpg) no-repeat top left;" cellpadding="0" cellspacing="0" border="0"> +

url(img/tab_back.jpg) no-repeat top left;" cellpadding="0" cellspacing="0" border="0">

left.gif" width="15" height="23">

@@ -30,7 +30,7 @@

- url(img/tab_back3.jpg) no-repeat top left;" cellpadding="0" cellspacing="0" border="0"> +

url(img/tab_back.jpg) no-repeat top left;" cellpadding="0" cellspacing="0" border="0">

left.gif" width="15" height="23">

@@ -45,7 +45,7 @@

- url(img/tab_back3.jpg) no-repeat top left;" cellpadding="0" cellspacing="0" border="0"> +

url(img/tab_back.jpg) no-repeat top left;" cellpadding="0" cellspacing="0" border="0"> + + + + + " id="_" header_label=""> + + + + + + + + + + + + + + + + + " id="_" header_label=""> + + + + + + Index: trunk/core/admin_templates/img/toolbar/tool_next.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/toolbar/tool_delete_f2.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/tab_active_right.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/toolbar/tool_decline_f2.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/toolbar/tool_primary_language.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/toolbar/tool_delete_f3.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/toolbar/tool_decline_f3.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/toolbar/tool_cancel.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/units/themes/themes_config.php =================================================================== diff -u -N -r6700 -r6703 --- trunk/core/units/themes/themes_config.php (.../themes_config.php) (revision 6700) +++ trunk/core/units/themes/themes_config.php (.../themes_config.php) (revision 6703) @@ -23,7 +23,7 @@ 'TableName' => TABLE_PREFIX.'Theme', 'SubItems' => Array('themefiles'), - +/* 'Sections' => Array( 'in-portal:configure_themes' => Array( 'parent' => 'in-portal:system', @@ -35,7 +35,7 @@ 'type' => stTREE, ), - ), + ),*/ 'FilterMenu' => Array( 'Groups' => Array( Index: trunk/core/admin_templates/img/toolbar/tool_select.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/regional/languages_import.tpl =================================================================== diff -u -N --- trunk/core/admin_templates/regional/languages_import.tpl (revision 0) +++ trunk/core/admin_templates/regional/languages_import.tpl (revision 6703) @@ -0,0 +1,44 @@ + + + + + + + + + +

left.gif" width="15" height="23">	style="border-top: black 1px solid;" background="img/tab_back.gif"> Index: trunk/core/admin_templates/incs/sections_list.css =================================================================== diff -u -N --- trunk/core/admin_templates/incs/sections_list.css (revision 0) +++ trunk/core/admin_templates/incs/sections_list.css (revision 6703) @@ -0,0 +1,120 @@ +/.text { + font-weight: normal; + font-size: 12px; + font-family: Verdana, Arial; + text-decoration: none; +}/ + +/* overview box styles / +.info { + font-size: 11px; + color: #707070; + font-family: Arial, Verdana, Sans-serif; + font-weight: normal; +} + +.overviewbox_header { + height: 21px; + font-family: Verdana; + font-weight: bold; + font-size: 12px; + color: #ffffff; + background: url(../img/summary/overviewbox_header.gif) top left no-repeat; +} + +.overviewbox_body { + border: 1px solid #666767; + background-color: #DCEBF6; +} + +.overview, .overviewDate { + font-family: Verdana; + font-weight: bold; + font-size: 12px; +} +.overview { color: #ffffff; } +.overviewDate { color: #C6EAFC; } + +.oInfo td, .oValue td { + font-family: Arial; + font-size: 10px; +} +.oInfo td { + color: #000000; + padding-left: 5px; +} +.oValue td { + color: #333333; + padding-right: 5px; +} + +/ user search box styles / + +.searchbox_header { + height: 21px; + font-family: Verdana; + font-weight: bold; + font-size: 12px; + color: #000000; + background: url(../img/summary/searchbox_header.gif) top left no-repeat; +} + +.searchbox_body { + border: 1px solid #666767; + height: 65px; + background: url(../img/summary/searchbox_bg.gif) top left; +} + +.search { + border-width: 1px; + border-style: solid; + border-color: #7F9DB9; + width: 107px; + height: 18px; + font-family: Verdana; + font-size:11px; +} + +/ quick links box styles / + +.userslink, .userslink:hover { + font-size: 12px; + font-family: Arial, Helvetica, Sans-serif; + font-weight: bold; +} +.userslink { color: #2C73CB; } +.userslink:hover { color: #009ff0; } + +/ pending items box styles */ + +.usersbox_header { + height: 21px; + font-family: verdana; + font-weight: bold; + font-size: 12px; + color: #000000; + background: url(../img/summary/usersbox_header.gif) top left no-repeat; +} + +.usersbox_body { + border: 1px solid #666767; + background: url(../img/summary/usersbox_bg.gif) top left; +} + +.lTDi { + border-right: 1px solid #CCCCCC; + border-top: 1px solid #CCCCCC; +} + +.rTDi { + border-top: 1px solid #CCCCCC; +} + +.lTD { + border-right: 1px solid #CCCCCC; +} + + +.rTD { + +} \ No newline at end of file Index: trunk/core/admin_templates/incs/config_blocks.tpl =================================================================== diff -u -N --- trunk/core/admin_templates/incs/config_blocks.tpl (revision 0) +++ trunk/core/admin_templates/incs/config_blocks.tpl (revision 6703) @@ -0,0 +1,95 @@ + + " name="" value="" /> + + + + " primarytype="password" name="" id="" value="" /> + " id="verify_" value="" /> + "> + + + + + + + + + + + + " name="" value=""> + " type="checkbox" id="_cb_" name="_cb_" class="" onclick="update_checkbox(this, document.getElementById(''))"> + + + + " name="<inp2:InputName field="$field"/>" <inp2:m_param name="field_params" />><inp2:Field field="$field" /> + + + + name="" id="_" value="">_"> + + + + + + + + + +
+ +		+ ');" id="toggle_mark[]" title="Collapse/Expand Section">[-] +
+ + + [] + +	+ +
+ +		+ ');" id="toggle_mark[]" title="Collapse/Expand Section">[-] +
+ + + [] + +	+ + + + + +

+ + + + + + + + + + + + + + + + +

+ + + \ No newline at end of file Index: trunk/core/admin_templates/img/toolbar/tool_new_language_var.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/tab_active_back.jpg =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/icons/icon46_conf.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/itemicons/icon16_language_primary.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/toolbar/tool_select_f2.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/tab_active_left.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/toolbar/tool_select_f3.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/regional/phrases_edit.tpl =================================================================== diff -u -N --- trunk/core/admin_templates/regional/phrases_edit.tpl (revision 0) +++ trunk/core/admin_templates/regional/phrases_edit.tpl (revision 6703) @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + "> + + + + + + + + + + + + + + + + + + + +

+ + Index: trunk/core/admin_templates/img/toolbar/tool_modify_f2.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/toolbar/tool_modify_f3.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/toolbar/tool_import_language.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/toolbar/tool_new_language_f2.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/toolbar/tool_new_language_f3.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/toolbar/tool_edit.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/icons/icon24_link_editor.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/toolbar/icon16_search_reset_f2.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/regional/languages_export.tpl =================================================================== diff -u -N --- trunk/core/admin_templates/regional/languages_export.tpl (revision 0) +++ trunk/core/admin_templates/regional/languages_export.tpl (revision 6703) @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + "> + + + + + + + + +

+ " id="" value="" /> +

+ + Index: trunk/core/kernel/utility/unit_config_reader.php =================================================================== diff -u -N -r6685 -r6703 --- trunk/core/kernel/utility/unit_config_reader.php (.../unit_config_reader.php) (revision 6685) +++ trunk/core/kernel/utility/unit_config_reader.php (.../unit_config_reader.php) (revision 6703) @@ -628,8 +628,10 @@ return true; } - if (preg_match('#/plugins/|/core/#', $config_path)) return true; - + if (preg_match('#/plugins/|/core|/proj-#', $config_path)) { + return true; + } + $module_found = false; if (!$this->Application->ModuleInfo) return false; Index: trunk/core/admin_templates/incs/style.css =================================================================== diff -u -N -r6656 -r6703 --- trunk/core/admin_templates/incs/style.css (.../style.css) (revision 6656) +++ trunk/core/admin_templates/incs/style.css (.../style.css) (revision 6703) @@ -11,9 +11,9 @@ } body { - font-family: Verdana, Arial, Helvetica, Sans-serif; + font-family: Verdana, Arial, Helvetica, Sans-serif; font-size: 12px; - color: #000000; + color: #000000; scrollbar-3dlight-color: #333333; scrollbar-arrow-color: #ffffff; scrollbar-track-color: #88d2f8; @@ -338,9 +338,9 @@ font-weight: bold; background-color: #999999; text-decoration: none; - + color: #FFFFFF; - + } .subsectiontitle:hover { @@ -349,7 +349,7 @@ font-weight: bold; background-color: #999999; text-decoration: none; - + color: #FFCC00; } Index: trunk/core/admin_templates/regional/email_messages_edit.tpl =================================================================== diff -u -N --- trunk/core/admin_templates/regional/email_messages_edit.tpl (revision 0) +++ trunk/core/admin_templates/regional/email_messages_edit.tpl (revision 6703) @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ + + \ No newline at end of file Index: trunk/core/admin_templates/img/icons/icon24_conf_regional.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/index.tpl =================================================================== diff -u -N -r6656 -r6703 --- trunk/core/admin_templates/index.tpl (.../index.tpl) (revision 6656) +++ trunk/core/admin_templates/index.tpl (.../index.tpl) (revision 6703) @@ -4,7 +4,7 @@ - In-portal Administration + <inp2:m_GetConfig var="Site_Name"/> - <inp2:m_Phrase label="la_AdministrativeConsole"/> @@ -41,7 +41,10 @@ " name="head" scrolling="no" noresize> " name="menu" target="main" noresize scrolling="auto" marginwidth="0" marginheight="0"> - " name="main" marginwidth="0" marginheight="0" frameborder="no" noresize scrolling="auto"> + + " name="main" marginwidth="0" marginheight="0" frameborder="no" noresize scrolling="auto"> + + Index: trunk/core/admin_templates/img/toolbar/tool_new_language.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/menu_bar.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/icons/icon46_list_conf.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/toolbar/tool_move_up.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/tab_active_back2.jpg =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/toolbar/tool_new_language_var_f2.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/toolbar/tool_approve.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/tab_active_back3.jpg =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/toolbar/tool_new_language_var_f3.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/kernel/parser/template.php =================================================================== diff -u -N -r6669 -r6703 --- trunk/core/kernel/parser/template.php (.../template.php) (revision 6669) +++ trunk/core/kernel/parser/template.php (.../template.php) (revision 6703) @@ -193,7 +193,7 @@ { $real_name = $this->GetRealFilename($template); $fname = $real_name.'.php'; - $fname = str_replace(FULL_PATH, FULL_PATH.'/kernel/cache', $fname); + $fname = str_replace(FULL_PATH, defined('WRITEABLE') ? WRITEABLE.'/cache' : FULL_PATH.'/kernel/cache', $fname); $tname = $real_name.'.tpl'; if (defined('SAFE_MODE') && SAFE_MODE) { @@ -209,7 +209,7 @@ } if (!file_exists($fname)) { // make sure to create directory if pre-parsed file does not exist - $this->CheckDir(dirname($fname), FULL_PATH.'/kernel/cache'); + $this->CheckDir(dirname($fname), defined('WRITEABLE') ? WRITEABLE.'/cache' : FULL_PATH.'/kernel/cache'); } } return array('active' => 0, 'fname' => $fname, 'tname' => $tname); Index: trunk/core/admin_templates/img/tab.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/icons/icon46_site.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/regional/languages_edit.tpl =================================================================== diff -u -N --- trunk/core/admin_templates/regional/languages_edit.tpl (revision 0) +++ trunk/core/admin_templates/regional/languages_edit.tpl (revision 6703) @@ -0,0 +1,101 @@ +<inp2:m_RequireLogin permissions="in-portal:configure_lang.view" system="1"/> +<inp2:m_include t="incs/header" nobody="yes"/> + +<body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF"> +<inp2:m_ParseBlock name="section_header" icon="icon46_conf_regional" title="!la_title_LanguagePacks!"/> + +<inp2:m_include t="regional/languages_edit_tabs"/> + +<inp2:m_ParseBlock name="blue_bar" prefix="lang" title_preset="languages_edit_general" module="in-portal" icon="icon46_conf_regional"/> + + +<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0"> +<tbody> + <tr> + <td> + <script type="text/javascript"> + a_toolbar = new ToolBar(); + a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() { + submit_event('lang','<inp2:lang_SaveEvent/>'); + } + ) ); + a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() { + submit_event('lang','OnCancelEdit'); + } + ) ); + + a_toolbar.AddButton( new ToolBarSeparator('sep1') ); + + a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() { + go_to_id('lang', '<inp2:lang_PrevId/>'); + } + ) ); + a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() { + go_to_id('lang', '<inp2:lang_NextId/>'); + } + ) ); + + + + a_toolbar.Render(); + + <inp2:m_if prefix="lang" function="IsSingle"/> + a_toolbar.HideButton('prev'); + a_toolbar.HideButton('next'); + a_toolbar.HideButton('sep1'); + <inp2:m_else/> + <inp2:m_if prefix="lang" function="IsLast"/> + a_toolbar.DisableButton('next'); + <inp2:m_endif/> + <inp2:m_if prefix="lang" function="IsFirst"/> + a_toolbar.DisableButton('prev'); + <inp2:m_endif/> + <inp2:m_endif/> + </script> + </td> + </tr> +</tbody> +</table> + +<inp2:lang_SaveWarning name="grid_save_warning"/> +<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder"> + <inp2:m_ParseBlock name="subsection" title="!la_section_General!"/> + <inp2:m_ParseBlock name="inp_id_label" prefix="lang" field="LanguageId" title="!la_fld_LanguageId!"/> + <inp2:m_ParseBlock name="inp_edit_box" prefix="lang" field="PackName" title="!la_fld_PackName!"/> + <inp2:m_ParseBlock name="inp_edit_box" prefix="lang" field="LocalName" title="!la_fld_LocalName!"/> + <inp2:m_ParseBlock name="inp_edit_box" prefix="lang" field="Charset" title="!la_fld_Charset!"/> + <inp2:m_ParseBlock name="inp_edit_box" prefix="lang" field="IconURL" title="!la_fld_IconURL!"/> + <inp2:m_ParseBlock name="inp_edit_box" prefix="lang" field="DateFormat" title="!la_fld_DateFormat!"/> + <inp2:m_ParseBlock name="inp_edit_box" prefix="lang" field="TimeFormat" title="!la_fld_TimeFormat!"/> + + <inp2:m_ParseBlock name="inp_edit_options" prefix="lang" field="InputDateFormat" title="!la_fld_InputDateFormat!"/> + <inp2:m_ParseBlock name="inp_edit_options" prefix="lang" field="InputTimeFormat" title="!la_fld_InputTimeFormat!"/> + + <inp2:m_ParseBlock name="inp_edit_box" prefix="lang" field="DecimalPoint" title="!la_fld_DecimalPoint!"/> + <inp2:m_ParseBlock name="inp_edit_box" prefix="lang" field="ThousandSep" title="!la_fld_ThousandSep!"/> + <inp2:m_ParseBlock name="inp_edit_checkbox" prefix="lang" field="PrimaryLang" title="!la_fld_PrimaryLang!"/> + <inp2:m_ParseBlock name="inp_edit_checkbox" prefix="lang" field="Enabled" title="!la_fld_Enabled!"/> + <inp2:m_ParseBlock name="inp_edit_options" prefix="lang" field="UnitSystem" title="!la_fld_UnitSystem!" use_phrases="1"/> + <inp2:m_if check="lang_IsNewMode"> + <tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>"> + <inp2:m_inc param="tab_index" by="1"/> + <td class="text"> + <inp2:m_phrase name="la_fld_CopyLabels"/>: + </td> + <td> + <input type="hidden" id="<inp2:lang_InputName field="CopyLabels"/>" name="<inp2:lang_InputName field="CopyLabels"/>" value="<inp2:lang_Field field="CopyLabels" db="db"/>"> + <input tabindex="<inp2:m_get param="tab_index"/>" type="checkbox" id="_cb_CopyLabels" name="_cb_CopyLabels" <inp2:lang_Field field="CopyLabels" checked="checked" db="db"/> class="<inp2:m_param name="field_class"/>" onclick="update_checkbox(this, document.getElementById('<inp2:lang_InputName field="CopyLabels"/>'))"> + + <inp2:m_inc param="tab_index" by="1"/> + <select tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:lang_InputName field="CopyFromLanguage"/>" id="<inp2:lang_InputName field="CopyFromLanguage"/>"> + <option value="0">--<inp2:m_phrase name="la_prompt_Select_Source"/></option> + <inp2:lang_PredefinedOptions field="CopyFromLanguage" block="inp_option_item" selected="selected"/> + </select> + </td> + <td class="error"> </td> + </tr> + </inp2:m_if> +</table> + +<inp2:m_include t="incs/footer"/> + \ No newline at end of file Index: trunk/core/admin_templates/img/toolbar/tool_move_down.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/toolbar/tool_view.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/itemicons/icon16_language_var.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/head.tpl =================================================================== diff -u -N -r6656 -r6703 --- trunk/core/admin_templates/head.tpl (.../head.tpl) (revision 6656) +++ trunk/core/admin_templates/head.tpl (.../head.tpl) (revision 6703) @@ -21,7 +21,7 @@ <img src="img/blocks.gif" width="400" height="73" title="" alt="" /><br /> </td> </tr> - + <tr> <td align="right" style="background: url(img/version_bg.gif) top right repeat-y;" class="head_version" valign="absmiddle" height="18"> <img title="" src="img/spacer.gif" width="1" height="10" align="absmiddle"> @@ -39,5 +39,5 @@ </td> </tr> </table> - + <inp2:m_include t="incs/footer"/> Index: trunk/core/admin_templates/img/icons/icon46_settings_general.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/icons/icon46_conf_general.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/toolbar/tool_delete.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/toolbar/tool_next_f2.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/toolbar/tool_next_f3.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/itemicons/icon16_language_disabled.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/toolbar/icon16_search_reset.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/admin_templates/img/toolbar/tool_prev.gif =================================================================== diff -u -N Binary files differ