[eGroupWare-svn] r55823 - in /trunk/sambaadmin: inc/ lang/ setup/ templates/default/

Author: ralfbecker
Date: Mon Apr 25 10:45:26 2016
New Revision: 55823

URL: http://svn.stylite.de/viewvc/egroupware?rev=55823&view=rev
Log:
use new et2 site configuration

Added:
    trunk/sambaadmin/templates/default/config.xet   (with props)
Removed:
    trunk/sambaadmin/templates/default/config.tpl
Modified:
    trunk/sambaadmin/inc/class.bosambaadmin.inc.php
    trunk/sambaadmin/lang/   (props changed)
    trunk/sambaadmin/setup/setup.inc.php

Modified: trunk/sambaadmin/inc/class.bosambaadmin.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/sambaadmin/inc/class.bosambaadmin.inc.php?rev=55823&r1=55822&r2=55823&view=diff
==============================================================================
--- trunk/sambaadmin/inc/class.bosambaadmin.inc.php (original)
+++ trunk/sambaadmin/inc/class.bosambaadmin.inc.php Mon Apr 25 10:45:26 2016
@@ -141,11 +141,11 @@
 			return true;
 		}
 
-		function admin()
+		public static function admin()
 		{
 			$appname = 'sambaadmin';
 			$file = array(
-				'Site Configuration'	=> egw::link('/index.php','menuaction=admin.uiconfig.index&appname='.$appname),
+				'Site Configuration'	=> egw::link('/index.php','menuaction=admin.admin_config.index&appname='.$appname.'&ajax=true'),
 				//'check ldap setup (experimental!!!)'	=> egw::link('/index.php','menuaction=sambaadmin.uisambaadmin.checkLDAPSetup'),
 			);
 			if ($GLOBALS['egw_info']['server']['ldap_host']) display_section($appname,$appname,$file);

Propchange: trunk/sambaadmin/lang/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Apr 25 10:45:26 2016
@@ -1,0 +1,36 @@
+egw_bg.lang.old
+egw_ca.lang.old
+egw_cs.lang.old
+egw_da.lang.old
+egw_de.lang.old
+egw_el.lang.old
+egw_es-es.lang.old
+egw_et.lang.old
+egw_eu.lang.old
+egw_fa.lang.old
+egw_fi.lang.old
+egw_fr.lang.old
+egw_hr.lang.old
+egw_hu.lang.old
+egw_id.lang.old
+egw_it.lang.old
+egw_iw.lang.old
+egw_ja.lang.old
+egw_ko.lang.old
+egw_lo.lang.old
+egw_lt.lang.old
+egw_lv.lang.old
+egw_nl.lang.old
+egw_no.lang.old
+egw_pl.lang.old
+egw_pt-br.lang.old
+egw_pt.lang.old
+egw_ru.lang.old
+egw_sk.lang.old
+egw_sl.lang.old
+egw_sv.lang.old
+egw_tr.lang.old
+egw_uk.lang.old
+egw_vi.lang.old
+egw_zh-tw.lang.old
+egw_zh.lang.old

Modified: trunk/sambaadmin/setup/setup.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/sambaadmin/setup/setup.inc.php?rev=55823&r1=55822&r2=55823&view=diff
==============================================================================
--- trunk/sambaadmin/setup/setup.inc.php (original)
+++ trunk/sambaadmin/setup/setup.inc.php Mon Apr 25 10:45:26 2016
@@ -34,7 +34,7 @@
 $setup_info['sambaadmin']['hooks']['editaccount']	= 'sambaadmin.bosambaadmin.updateAccount';
 $setup_info['sambaadmin']['hooks']['addgroup']		= 'sambaadmin.bosambaadmin.updateGroup';
 $setup_info['sambaadmin']['hooks']['editgroup']		= 'sambaadmin.bosambaadmin.updateGroup';
-$setup_info['sambaadmin']['hooks']['admin']		    = 'sambaadmin.bosambaadmin.admin';
+$setup_info['sambaadmin']['hooks']['admin']		    = 'bosambaadmin::admin';
 $setup_info['sambaadmin']['hooks']['edit_user']		= 'sambaadmin.bosambaadmin.edit_user';
 
 /* Dependacies for this app to work */

Added: trunk/sambaadmin/templates/default/config.xet
URL: http://svn.stylite.de/viewvc/egroupware/trunk/sambaadmin/templates/default/config.xet?rev=55823&view=auto
==============================================================================
--- trunk/sambaadmin/templates/default/config.xet (added)
+++ trunk/sambaadmin/templates/default/config.xet Mon Apr 25 10:45:26 2016
@@ -1,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE overlay PUBLIC "-//Stylite AG//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
+<!-- $Id$ -->
+<overlay>
+	<template id="sambaadmin.config" template="" lang="" group="0" version="16.1">
+		<grid width="100%" class="admin-config egwGridView_grid">
+			<columns>
+				<column width="60%"/>
+				<column/>
+			</columns>
+			<rows>
+				<row>
+					<description value="Samba SID" label="%s:"/>
+					<textbox id="newsettings[sambasid]" size="60"/>
+				</row>
+				<row>
+					<description value="computer ou" label="%s:"/>
+					<textbox id="newsettings[samba_computerou]" size="60"/>
+				</row>
+				<row>
+					<description value="computer group" label="%s:"/>
+					<textbox id="newsettings[samba_computergroup]" size="60"/>
+				</row>
+				<row>
+					<description value="Generate old Lanmanager password hash?"/>
+					<select id="newsettings[samba_lmpassword]">
+						<option value="">{No} - {more secure}</option>
+						<option value="yes">Yes</option>
+					</select>
+				</row>
+				<row>
+					<description value="new account defaults" span="all" class="subHeader"/>
+				</row>
+				<row>
+					<description value="smb homepath" label="%s:"/>
+					<textbox id="newsettings[samba_homepath]" size="60"/>
+				</row>
+				<row>
+					<description value="homedrive" label="%s:"/>
+					<textbox id="newsettings[samba_homedrive]" size="60"/>
+				</row>
+				<row>
+					<description value="logonscript" label="%s:"/>
+					<textbox id="newsettings[samba_logonscript]" size="60"/>
+				</row>
+				<row>
+					<description value="profilepath" label="%s:"/>
+					<textbox id="newsettings[samba_profilepath]" size="60"/>
+				</row>
+			</rows>
+		</grid>
+	</template>
+</overlay>

Propchange: trunk/sambaadmin/templates/default/config.xet
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: trunk/sambaadmin/templates/default/config.xet
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Rev URL

Propchange: trunk/sambaadmin/templates/default/config.xet
------------------------------------------------------------------------------
    svn:mime-type = text/xml


------------------------------------------------------------------------------
Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z