FreeNAS

Email Archive: freenas-commit (read-only)

2007:	_Jan	_Feb	_Mar	_Apr	_May	_Jun	_Jul (191)	_Aug (305)	_Sep (160)	_Oct (210)	_Nov (146)	_Dec (188)
2008:	_Jan (258)	_Feb (146)	_Mar (217)	_Apr (123)	_May (198)	_Jun (153)	_Jul (41)	_Aug (145)	_Sep (107)	_Oct (93)	_Nov (128)	_Dec (110)
2009:	_Jan (107)	_Feb (103)	_Mar (98)	_Apr (84)	_May (89)	_Jun (111)	_Jul (70)	_Aug (29)	_Sep (17)	_Oct (11)	_Nov (14)	_Dec (29)
2010:	_Jan (55)	_Feb (31)	_Mar (52)	_Apr (68)	_May (60)	_Jun (32)	_Jul (14)	_Aug (13)	_Sep (131)	_Oct (118)	_Nov (113)	_Dec (73)
2011:	_Jan (48)	_Feb (38)	_Mar (43)	_Apr (341)	_May (355)	_Jun (318)	_Jul (161)	_Aug (493)	_Sep (572)	_Oct (444)	_Nov (377)	_Dec (462)
2012:	_Jan (580)	_Feb (419)	_Mar (552)	_Apr (432)	_May (282)	_Jun (191)	_Jul (189)	_Aug (260)	_Sep (245)	_Oct (207)	_Nov (69)	_Dec (164)
2013:	_Jan (240)	_Feb (169)	_Mar (96)	_Apr	_May	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec

[Freenas-commit] SF.net SVN: freenas:[10663] branches/8.2-nup

From: <yaberauneya@us...> - 2012-03-14 14:05

Revision: 10663
          http://freenas.svn.sourceforge.net/freenas/?rev=10663&view=rev
Author:   yaberauneya
Date:     2012-03-14 14:04:56 +0000 (Wed, 14 Mar 2012)
Log Message:
-----------
Checkpoint changes merged from the iX 8.0.4 development branch so I can do another merge

Modified Paths:
--------------
    branches/8.2-nup/build/create_iso.sh
    branches/8.2-nup/build/files/install.sh
    branches/8.2-nup/gui/middleware/notifier.py
    branches/8.2-nup/gui/system/forms.py
    branches/8.2-nup/nanobsd/common
    branches/8.2-nup/nanobsd/os-base

Added Paths:
-----------
    branches/8.2-nup/nanobsd/Installer/
    branches/8.2-nup/nanobsd/Installer/bin/
    branches/8.2-nup/nanobsd/Installer/bin/install_worker.sh
    branches/8.2-nup/nanobsd/Installer/lib/
    branches/8.2-nup/nanobsd/Installer/lib/functions.sh
    branches/8.2-nup/nanobsd/Installer/pre-install/
    branches/8.2-nup/nanobsd/Installer/pre-install/0001.prevent_downgrade.sh
    branches/8.2-nup/nanobsd/Installer/pre-install/0002.arch.sh
    branches/8.2-nup/nanobsd/Installer/pre-install/0003.project_switch.sh
    branches/8.2-nup/nanobsd/Installer/pre-install/0004.hardware_requirements.sh

Modified: branches/8.2-nup/build/create_iso.sh
===================================================================
--- branches/8.2-nup/build/create_iso.sh	2012-03-14 12:31:14 UTC (rev 10662)
+++ branches/8.2-nup/build/create_iso.sh	2012-03-14 14:04:56 UTC (rev 10663)
@@ -61,13 +61,14 @@
 	ln -s ../rescue ${INSTALLUFSDIR}/sbin
 	tar -cf - -C${ETC_FILES} --exclude .svn . | tar -xf - -C ${INSTALLUFSDIR}/etc
 
-	cat > $INSTALLUFSDIR/etc/version-info <<EOF
-SW_ARCH=$NANO_ARCH_HUMANIZED
-SW_NAME="$NANO_LABEL"
-SW_FULL_VERSION="$NANO_NAME"
-SW_VERSION="$VERSION"
-EOF
+	cp "$AVATAR_CONF" ${INSTALLUFSDIR}/etc/.
+	mkdir -p ${INSTALLUFSDIR}/usr/local/
+	tar -cf - -C${INSTALLER_FILES} --exclude .svn . | tar -xpf - -C ${INSTALLUFSDIR}/usr/local/.
 
+	# XXX: tied too much to the host system to be of value in the
+	# installer code.
+	rm -f "$INSTALLUFSDIR/etc/rc.conf.local"
+
 	# Compress what's left of the image after mangling it
 	makefs -b 10%  ${TEMP_IMGFILE} ${INSTALLUFSDIR}
 	mkuzip -o ${ISODIR}/data/base.ufs.uzip ${TEMP_IMGFILE}

Modified: branches/8.2-nup/build/files/install.sh
===================================================================
--- branches/8.2-nup/build/files/install.sh	2012-03-14 12:31:14 UTC (rev 10662)
+++ branches/8.2-nup/build/files/install.sh	2012-03-14 14:04:56 UTC (rev 10663)
@@ -8,7 +8,7 @@
 TERM=${TERM:-cons25}
 export TERM
 
-. /etc/version-info
+. /etc/avatar.conf
 
 get_product_path()
 {
@@ -17,7 +17,7 @@
 
 get_image_name()
 {
-    find "$(get_product_path)" -name "$SW_NAME-$SW_ARCH.img.xz" -type f
+    find "$(get_product_path)" -name "$AVATAR_PROJECT-$AVATAR_ARCH.img.xz" -type f
 }
 
 build_config()
@@ -127,7 +127,7 @@
 EOD
     _msg=`cat "${_tmpfile}"`
     rm -f "${_tmpfile}"
-    dialog --title "$SW_NAME ${_type}" --yesno "${_msg}" 13 74
+    dialog --title "$AVATAR_PROJECT ${_type}" --yesno "${_msg}" 13 74
     [ $? -eq 0 ] || exit 1
 }
 
@@ -136,7 +136,7 @@
     local _disk="$1"
     local _tmpfile="/tmp/msg"
     cat << EOD > "${_tmpfile}"
-The $SW_NAME installer can preserve your existing parameters, or
+The $AVATAR_PROJECT installer can preserve your existing parameters, or
 it can do a fresh install overwriting the current settings,
 configuration, etc.
 
@@ -144,7 +144,7 @@
 EOD
     _msg=`cat "${_tmpfile}"`
     rm -f "${_tmpfile}"
-    dialog --title "Upgrade this $SW_NAME installation" --yesno "${_msg}" 8 74
+    dialog --title "Upgrade this $AVATAR_PROJECT installation" --yesno "${_msg}" 8 74
     return $?
 }
 
@@ -232,7 +232,7 @@
         _menuheight=$((${_menuheight} + ${_items}))
     fi
     eval "dialog --title 'Choose destination media' \
-          --menu 'Select the drive where $SW_NAME should be installed.' \
+          --menu 'Select the drive where $AVATAR_PROJECT should be installed.' \
           ${_menuheight} 60 ${_items} ${_list}" 2>${_tmpfile}
     [ $? -eq 0 ] || exit 1
     _disk=`cat "${_tmpfile}"`
@@ -256,13 +256,23 @@
     _config_file="/tmp/pc-sysinstall.cfg"
 
     # Start critical section.
-    trap "dialog --msgbox \"The $SW_NAME $_action on $_disk has failed\" 6 74" EXIT
+    trap "dialog --msgbox \"The $AVATAR_PROJECT $_action on $_disk has failed\" 6 74" EXIT
     set -e
 
     #  _disk, _image, _config_file
     # we can now build a config file for pc-sysinstall
     build_config  ${_disk} "$(get_image_name)" ${_config_file}
 
+    if [ ${_do_upgrade} -eq 1 ]
+    then
+        /etc/rc.d/dmesg start
+        mkdir /tmp/data
+        mount /dev/${_disk}s1a /tmp/data
+        install_worker.sh -D / -m /tmp/data pre-install
+        umount /tmp/data
+        rmdir /tmp/data
+    fi
+
     # Run pc-sysinstall against the config generated
 
     # Hack #1
@@ -298,14 +308,14 @@
         umount /tmp/data
         rmdir /tmp/data
 	dialog --msgbox "The installer has preserved your database file.
-$SW_NAME will migrate this file, if necessary, to the current format." 6 74
+$AVATAR_PROJECT will migrate this file, if necessary, to the current format." 6 74
     fi
 
     # End critical section.
     set +e
 
     trap - EXIT
-    dialog --msgbox "The $SW_NAME $_action on ${_disk} succeeded!
+    dialog --msgbox "The $AVATAR_PROJECT $_action on ${_disk} succeeded!
 Please remove the CDROM and reboot." 6 74
 
     return 0
@@ -335,7 +345,7 @@
 
     while :; do
 
-        dialog --clear --title "$SW_NAME $SW_VERSION Console Setup" --menu "" 12 73 6 \
+        dialog --clear --title "$AVATAR_PROJECT $AVATAR_VERSION Console Setup" --menu "" 12 73 6 \
             "1" "Install/Upgrade" \
             "2" "Shell" \
             "3" "Reboot System" \

Modified: branches/8.2-nup/gui/middleware/notifier.py
===================================================================
--- branches/8.2-nup/gui/middleware/notifier.py	2012-03-14 12:31:14 UTC (rev 10662)
+++ branches/8.2-nup/gui/middleware/notifier.py	2012-03-14 14:04:56 UTC (rev 10663)
@@ -1788,14 +1788,31 @@
         self.__system("/bin/ln -s %s/.freenas %s" % (path, vardir))
 
     def validate_xz(self, path):
-        ret = self.__system_nolog("/usr/bin/xz -t %s" % (path))
-        if ret == 0:
-            return True
-        return False
 
+        os.chdir(os.path.dirname(path))
+
+        try:
+            ret = self.__system_nolog('/usr/bin/tar -xJpf %s' % (path, ))
+            if ret != 0:
+                return False
+
+            p = subprocess.Popen(
+                                 ['bin/install_worker.sh', 'pre-install'],
+                                 stdout=subprocess.PIPE,
+                                 stderr=subprocess.STDOUT,
+                                 )
+            output = p.communicate()[0]
+            if p.returncode != 0:
+                log.log(syslog.LOG_NOTICE,
+                        'install_worker pre-install failed; see the following '
+                        'output for more details:\n%s', output)
+            return p.returncode == 0
+        finally:
+            os.chdir('/')
+
     def update_firmware(self, path):
         try:
-            cmd1 = '/usr/bin/xzcat %s' % (path, )
+            cmd1 = 'cat %s/firmware.img' % (os.path.dirname(path), )
             cmd2 = 'sh -x /root/update'
             log.log(syslog.LOG_NOTICE, 'Executing: %s | %s', cmd1, cmd2)
             p1 = subprocess.Popen(shlex.split(cmd1), stdout=subprocess.PIPE)

Modified: branches/8.2-nup/gui/system/forms.py
===================================================================
--- branches/8.2-nup/gui/system/forms.py	2012-03-14 12:31:14 UTC (rev 10662)
+++ branches/8.2-nup/gui/system/forms.py	2012-03-14 14:04:56 UTC (rev 10663)
@@ -451,7 +451,7 @@
     sha256 = forms.CharField(label=_("SHA256 sum for the image"), required=True)
     def clean(self):
         cleaned_data = self.cleaned_data
-        filename = '/var/tmp/firmware/firmware.xz'
+        filename = '/var/tmp/firmware/firmware.txz'
         if cleaned_data.get('firmware'):
             if hasattr(cleaned_data['firmware'], 'temporary_file_path'):
                 shutil.move(cleaned_data['firmware'].temporary_file_path(), filename)
@@ -474,7 +474,7 @@
             self._errors["firmware"] = self.error_class([_("This field is required.")])
         return cleaned_data
     def done(self, request, *args, **kwargs):
-        notifier().update_firmware('/var/tmp/firmware/firmware.xz')
+        notifier().update_firmware('/var/tmp/firmware/firmware.txz')
         request.session['allow_reboot'] = True
 
 class ServicePackUploadForm(Form):

Added: branches/8.2-nup/nanobsd/Installer/bin/install_worker.sh
===================================================================
--- branches/8.2-nup/nanobsd/Installer/bin/install_worker.sh	                        (rev 0)
+++ branches/8.2-nup/nanobsd/Installer/bin/install_worker.sh	2012-03-14 14:04:56 UTC (rev 10663)
@@ -0,0 +1,250 @@
+#!/bin/sh
+#
+# An generalized wrapper to be invoked at various stages of an installation or
+# upgrade process.
+#
+# Written in shell for simplicity and to be runnable across multiple versions
+# of software with minimal dependencies outside of the base system.
+#
+# Garrett Cooper, March 2012
+
+# The base directory where all of the scripts and the payload are.
+SCRIPTDIR=$(realpath "$(dirname "$0")/..")
+. "$SCRIPTDIR/lib/functions.sh"
+
+usage()
+{
+	cat <<EOF
+usage: ${0##*/} [-D dir] [-f expr] [-m dir] stage
+===============================================================================
+-D dir		: destdir to compare against. Defaults to "/".
+
+-f expr		: a find(1) compatible regular expression used for
+		  blacklisting scripts that would be normally executed in the
+		  current stage.
+
+		  Good for 1. avoiding potentially problematic scripts, or
+		  2. Explicitly skipping over a stage script, e.g. say you
+		  specified in an upgrade that you wanted to avoid executing
+		  an automatic zpool upgrade script -- and you understood the
+		  consequences of doing so.
+
+		  This option can be specified multiple times.
+
+-m dir		: srcdir to compare against. Defaults to "$SCRIPTDIR".
+
+"stage" can be:
+		- pre-install
+		- install
+		- post-install
+
+EOF
+	exit 1
+}
+
+# The directory with all of the files to compare against.
+BLACKLIST_EXPR=
+INSTALL_DESTDIR="/"
+INSTALL_SRCDIR=$SCRIPTDIR
+VERBOSE=0
+
+while getopts 'D:f:m:v' opt
+do
+	case "$opt" in
+	D)
+		if [ ! -d "$OPTARG" ]
+		then
+			error "Destdir specified -- $OPTARG -- does not exist"
+		fi
+		INSTALL_DESTDIR=$(realpath "$OPTARG")
+		;;
+	f)
+		BLACKLIST_EXPR="$BLACKLIST_EXPR \! -and -regexp '$OPTARG'"
+		;;
+	m)
+		if [ ! -d "$OPTARG" ]
+		then
+			error "Srcdir specified -- $OPTARG -- does not exist"
+		fi
+		INSTALL_SRCDIR=$OPTARG
+		;;
+	v)
+		: $(( VERBOSE += 1 ))
+		;;
+	*)
+		usage
+		;;
+	esac
+done
+shift $(( $OPTIND - 1 ))
+
+INSTALL_DESTDIR=$(realpath "$INSTALL_DESTDIR")
+INSTALL_SRCDIR=$(realpath "$INSTALL_SRCDIR")
+
+stage=$1
+cd "$SCRIPTDIR"
+if [ -z "$stage" -o ! -d "$stage" -o $# -ne 1 ]
+then
+	usage
+fi
+
+if ! source_conf "$INSTALL_SRCDIR/etc/avatar.conf" OLD
+then
+	error "Could not load the avatar.conf file from the source directory ($INSTALL_SRCDIR/etc)"
+fi
+if ! source_conf "$INSTALL_DESTDIR/etc/avatar.conf" NEW
+then
+	error "Could not load the avatar.conf file from the destination directory ($INSTALL_DESTDIR/etc)"
+fi
+
+if ! stage_log=$(mktemp install_worker.XXXXXX)
+then
+	exit 1
+fi
+
+ec=0
+for script in $(find "$stage" -name '*.sh' $BLACKLIST_EXPR | sort)
+do
+	vecho "${0##*/}: INFO: sourcing $script"
+	(. $script)
+	saved_ec=$?
+	if [ $saved_ec -eq 0 ]
+	then
+		ec=$saved_ec
+	fi
+done > $stage_log
+
+# Gather all data possible and spit it out at the end.
+if [ -s $stage_log ]
+then
+	echo "${0##*/}: $stage summary"
+	cat $stage_log
+fi
+rm -f $stage_log
+
+exit $ec
+#!/bin/sh
+#
+# An generalized wrapper to be invoked at various stages of an installation or
+# upgrade process.
+#
+# Written in shell for simplicity and to be runnable across multiple versions
+# of software with minimal dependencies outside of the base system.
+#
+# Garrett Cooper, March 2012
+
+# The base directory where all of the scripts and the payload are.
+SCRIPTDIR=$(realpath "$(dirname "$0")/..")
+. "$SCRIPTDIR/lib/functions.sh"
+
+usage()
+{
+	cat <<EOF
+usage: ${0##*/} [-D dir] [-f expr] [-m dir] stage
+===============================================================================
+-D dir		: destdir to compare against. Defaults to "/".
+
+-f expr		: a find(1) compatible regular expression used for
+		  blacklisting scripts that would be normally executed in the
+		  current stage.
+
+		  Good for 1. avoiding potentially problematic scripts, or
+		  2. Explicitly skipping over a stage script, e.g. say you
+		  specified in an upgrade that you wanted to avoid executing
+		  an automatic zpool upgrade script -- and you understood the
+		  consequences of doing so.
+
+		  This option can be specified multiple times.
+
+-m dir		: srcdir to compare against. Defaults to "$SCRIPTDIR".
+
+"stage" can be:
+		- pre-install
+		- install
+		- post-install
+
+EOF
+	exit 1
+}
+
+# The directory with all of the files to compare against.
+BLACKLIST_EXPR=
+INSTALL_DESTDIR="/"
+INSTALL_SRCDIR=$SCRIPTDIR
+VERBOSE=0
+
+while getopts 'D:f:m:v' opt
+do
+	case "$opt" in
+	D)
+		if [ ! -d "$OPTARG" ]
+		then
+			error "Destdir specified -- $OPTARG -- does not exist"
+		fi
+		INSTALL_DESTDIR=$(realpath "$OPTARG")
+		;;
+	f)
+		BLACKLIST_EXPR="$BLACKLIST_EXPR \! -and -regexp '$OPTARG'"
+		;;
+	m)
+		if [ ! -d "$OPTARG" ]
+		then
+			error "Srcdir specified -- $OPTARG -- does not exist"
+		fi
+		INSTALL_SRCDIR=$OPTARG
+		;;
+	v)
+		: $(( VERBOSE += 1 ))
+		;;
+	*)
+		usage
+		;;
+	esac
+done
+shift $(( $OPTIND - 1 ))
+
+INSTALL_DESTDIR=$(realpath "$INSTALL_DESTDIR")
+INSTALL_SRCDIR=$(realpath "$INSTALL_SRCDIR")
+
+stage=$1
+cd "$SCRIPTDIR"
+if [ -z "$stage" -o ! -d "$stage" -o $# -ne 1 ]
+then
+	usage
+fi
+
+if ! source_conf "$INSTALL_SRCDIR/etc/avatar.conf" OLD
+then
+	error "Could not load the avatar.conf file from the source directory ($INSTALL_SRCDIR/etc)"
+fi
+if ! source_conf "$INSTALL_DESTDIR/etc/avatar.conf" NEW
+then
+	error "Could not load the avatar.conf file from the destination directory ($INSTALL_DESTDIR/etc)"
+fi
+
+if ! stage_log=$(mktemp install_worker.XXXXXX)
+then
+	exit 1
+fi
+
+ec=0
+for script in $(find "$stage" -name '*.sh' $BLACKLIST_EXPR | sort)
+do
+	vecho "${0##*/}: INFO: sourcing $script"
+	(. $script)
+	saved_ec=$?
+	if [ $saved_ec -eq 0 ]
+	then
+		ec=$saved_ec
+	fi
+done > $stage_log
+
+# Gather all data possible and spit it out at the end.
+if [ -s $stage_log ]
+then
+	echo "${0##*/}: $stage summary"
+	cat $stage_log
+fi
+rm -f $stage_log
+
+exit $ec


Property changes on: branches/8.2-nup/nanobsd/Installer/bin/install_worker.sh
___________________________________________________________________
Added: svn:executable
   + *

Added: branches/8.2-nup/nanobsd/Installer/lib/functions.sh
===================================================================
--- branches/8.2-nup/nanobsd/Installer/lib/functions.sh	                        (rev 0)
+++ branches/8.2-nup/nanobsd/Installer/lib/functions.sh	2012-03-14 14:04:56 UTC (rev 10663)
@@ -0,0 +1,264 @@
+#!/bin/sh
+#
+# Basic installer scripting infrastructure.
+#
+# Garrett Cooper, March 2012
+
+error()
+{
+	echo >&2 "${0##*/}: ERROR: $@"
+	exit 1
+}
+
+vecho()
+{
+	if [ $VERBOSE -gt 0 ]
+	then
+		echo "${0##*/}: INFO: $@"
+	fi
+}
+
+warn()
+{
+	echo >&2 "${0##*/}: WARNING: $@"
+}
+
+sysctl_n()
+{
+	sysctl -n $*
+}
+
+# Compare two projects to see whether or not they're the same.
+#
+# Parameters:
+# 1 - project1
+# 2 - project2
+#
+# Returns:
+# 0 - project1 == project2
+# 1 - project1 != project2
+compare_project()
+{
+	project1=$1
+	project2=$2
+
+	if [ "$project1" = "$project2" ]
+	then
+		return 0
+	fi
+	return 1
+}
+
+# Compare two arbitrary versions to return whether or not one is newer than
+# the other.
+#
+# Parameters:
+# 1 - version1
+# 2 - version2
+#
+# Returns:
+# 0 - version1 == version2
+# 1 - version1 < version2
+# 2 - version1 > version2
+compare_version()
+{
+	version1=$1
+	version2=$2
+
+	if [ -z "$version2" ]
+	then
+		error "malformed upgrade version specified (is NIL)"
+	fi
+
+	if [ "$version1" = "$version2" ]
+	then
+		return 0
+	fi
+
+	unsorted="$version1 $version2"
+	# Magic sort fu required for 9.0.0 vs 10.0.0, etc.
+	sorted=$(echo -n $unsorted | tr ' ' '\n' | sort -k 1 -f '-' -n | tr '\n' ' ')
+
+	# NOTE: sort adds on a '\n' at EOL.
+	if [ "$sorted" = "$unsorted " ]
+	then
+		return 1
+	fi
+	return 2
+}
+
+# Source an avatar configuration file
+#
+# Parameters:
+# 1 - .conf file to source.
+# 2 - prefix for variables (e.g. NEW, OLD, etc).
+#
+# Returns:
+# 0 if successful; 1 otherwise
+source_conf()
+{
+	local IFS conffile prefix tmp
+
+	conffile=$1
+	prefix=$2
+
+	if [ ! -f "$conffile" -o -z "$prefix" ]
+	then
+		return 1
+	fi
+
+	if ! tmpconf=$(mktemp conf.XXXXXX)
+	then
+		return 1
+	fi
+
+	# 1. Skip over comments and empty/whitespace lines.
+	# 2. Skip over export lines.
+	# 3. Prefix lines with "$prefix".
+	sed -E \
+	    -e 's/#.*//g' \
+	    -e '/^[[:space:]]*$/d' \
+	    -e '/^export /d' \
+	    -e "s/^/${prefix}_/g" "$conffile" \
+	    > $tmpconf
+
+	# Taint the environment.
+	. $tmpconf
+	rc=$?
+
+	rm -f $tmpconf
+
+	return $rc
+}
+#!/bin/sh
+#
+# Basic installer scripting infrastructure.
+#
+# Garrett Cooper, March 2012
+
+error()
+{
+	echo >&2 "${0##*/}: ERROR: $@"
+	exit 1
+}
+
+vecho()
+{
+	if [ $VERBOSE -gt 0 ]
+	then
+		echo "${0##*/}: INFO: $@"
+	fi
+}
+
+warn()
+{
+	echo >&2 "${0##*/}: WARNING: $@"
+}
+
+sysctl_n()
+{
+	sysctl -n $*
+}
+
+# Compare two projects to see whether or not they're the same.
+#
+# Parameters:
+# 1 - project1
+# 2 - project2
+#
+# Returns:
+# 0 - project1 == project2
+# 1 - project1 != project2
+compare_project()
+{
+	project1=$1
+	project2=$2
+
+	if [ "$project1" = "$project2" ]
+	then
+		return 0
+	fi
+	return 1
+}
+
+# Compare two arbitrary versions to return whether or not one is newer than
+# the other.
+#
+# Parameters:
+# 1 - version1
+# 2 - version2
+#
+# Returns:
+# 0 - version1 == version2
+# 1 - version1 < version2
+# 2 - version1 > version2
+compare_version()
+{
+	version1=$1
+	version2=$2
+
+	if [ -z "$version2" ]
+	then
+		error "malformed upgrade version specified (is NIL)"
+	fi
+
+	if [ "$version1" = "$version2" ]
+	then
+		return 0
+	fi
+
+	unsorted="$version1 $version2"
+	# Magic sort fu required for 9.0.0 vs 10.0.0, etc.
+	sorted=$(echo -n $unsorted | tr ' ' '\n' | sort -k 1 -f '-' -n | tr '\n' ' ')
+
+	# NOTE: sort adds on a '\n' at EOL.
+	if [ "$sorted" = "$unsorted " ]
+	then
+		return 1
+	fi
+	return 2
+}
+
+# Source an avatar configuration file
+#
+# Parameters:
+# 1 - .conf file to source.
+# 2 - prefix for variables (e.g. NEW, OLD, etc).
+#
+# Returns:
+# 0 if successful; 1 otherwise
+source_conf()
+{
+	local IFS conffile prefix tmp
+
+	conffile=$1
+	prefix=$2
+
+	if [ ! -f "$conffile" -o -z "$prefix" ]
+	then
+		return 1
+	fi
+
+	if ! tmpconf=$(mktemp conf.XXXXXX)
+	then
+		return 1
+	fi
+
+	# 1. Skip over comments and empty/whitespace lines.
+	# 2. Skip over export lines.
+	# 3. Prefix lines with "$prefix".
+	sed -E \
+	    -e 's/#.*//g' \
+	    -e '/^[[:space:]]*$/d' \
+	    -e '/^export /d' \
+	    -e "s/^/${prefix}_/g" "$conffile" \
+	    > $tmpconf
+
+	# Taint the environment.
+	. $tmpconf
+	rc=$?
+
+	rm -f $tmpconf
+
+	return $rc
+}

Added: branches/8.2-nup/nanobsd/Installer/pre-install/0001.prevent_downgrade.sh
===================================================================
--- branches/8.2-nup/nanobsd/Installer/pre-install/0001.prevent_downgrade.sh	                        (rev 0)
+++ branches/8.2-nup/nanobsd/Installer/pre-install/0001.prevent_downgrade.sh	2012-03-14 14:04:56 UTC (rev 10663)
@@ -0,0 +1,68 @@
+#!/bin/sh
+#
+# Ensure the user can't downgrade their software.
+#
+# southdb proportedly supports downgrades, but that functionality doesn't
+# work as expected [today], and causes support headaches because then database
+# schema isn't migrated properly.
+#
+# The final result is that the newer schema sticks, whereas the old one
+# doesn't.
+#
+# XXX: this is probably a bug with how we're handling southdb :).
+#
+# Garrett Cooper, March 2012
+
+# 0 - NEW == OLD
+# 1 - OLD < NEW
+# 2 - OLD > NEW
+compare_version $OLD_AVATAR_VERSION $NEW_AVATAR_VERSION
+ec=$?
+case $ec in
+0)
+	# Versions are the same.
+	;;
+1)
+	# Upgrade!
+	;;
+2)
+	error "cannot downgrade software"
+	;;
+*)
+	error "an unknown error occurred (exit code = $ec)"
+	;;
+esac
+#!/bin/sh
+#
+# Ensure the user can't downgrade their software.
+#
+# southdb proportedly supports downgrades, but that functionality doesn't
+# work as expected [today], and causes support headaches because then database
+# schema isn't migrated properly.
+#
+# The final result is that the newer schema sticks, whereas the old one
+# doesn't.
+#
+# XXX: this is probably a bug with how we're handling southdb :).
+#
+# Garrett Cooper, March 2012
+
+# 0 - NEW == OLD
+# 1 - OLD < NEW
+# 2 - OLD > NEW
+compare_version $OLD_AVATAR_VERSION $NEW_AVATAR_VERSION
+ec=$?
+case $ec in
+0)
+	# Versions are the same.
+	;;
+1)
+	# Upgrade!
+	;;
+2)
+	error "cannot downgrade software"
+	;;
+*)
+	error "an unknown error occurred (exit code = $ec)"
+	;;
+esac

Added: branches/8.2-nup/nanobsd/Installer/pre-install/0002.arch.sh
===================================================================
--- branches/8.2-nup/nanobsd/Installer/pre-install/0002.arch.sh	                        (rev 0)
+++ branches/8.2-nup/nanobsd/Installer/pre-install/0002.arch.sh	2012-03-14 14:04:56 UTC (rev 10663)
@@ -0,0 +1,30 @@
+#!/bin/sh
+#
+# Makes sure that the architecture is consistent across upgrades
+#
+# There are certain non-NAS critical items that break, like the reporting data)
+# if you switch architectures (x86 <-> x64). In the future, if incompatible
+# architectures are added (arm vs i386 vs mips vs powerpc), this would result
+# in someone 'bricking' their machine.
+#
+# Garrett Cooper, March 2012
+
+if [ "$OLD_AVATAR_ARCH" != "$NEW_AVATAR_ARCH" ]
+then
+	error "architectures do not match ($OLD_AVATAR_ARCH != $NEW_AVATAR_ARCH)"
+fi
+#!/bin/sh
+#
+# Makes sure that the architecture is consistent across upgrades
+#
+# There are certain non-NAS critical items that break, like the reporting data)
+# if you switch architectures (x86 <-> x64). In the future, if incompatible
+# architectures are added (arm vs i386 vs mips vs powerpc), this would result
+# in someone 'bricking' their machine.
+#
+# Garrett Cooper, March 2012
+
+if [ "$OLD_AVATAR_ARCH" != "$NEW_AVATAR_ARCH" ]
+then
+	error "architectures do not match ($OLD_AVATAR_ARCH != $NEW_AVATAR_ARCH)"
+fi

Added: branches/8.2-nup/nanobsd/Installer/pre-install/0003.project_switch.sh
===================================================================
--- branches/8.2-nup/nanobsd/Installer/pre-install/0003.project_switch.sh	                        (rev 0)
+++ branches/8.2-nup/nanobsd/Installer/pre-install/0003.project_switch.sh	2012-03-14 14:04:56 UTC (rev 10663)
@@ -0,0 +1,30 @@
+#!/bin/sh
+#
+# Ensure the user can't install incompatible software.
+#
+# FreeNAS <-> TrueNAS, etc shouldn't be supported, nor should switching from a
+# particular avatar project to another mutually incompatible avatar project
+# (cyb0rg <-> FreeNAS).
+#
+# Garrett Cooper, March 2012
+#
+
+if [ "$OLD_AVATAR_PROJECT" != "$NEW_AVATAR_PROJECT" ]
+then
+	error "projects do not match ($OLD_AVATAR_PROJECT != $NEW_AVATAR_PROJECT)"
+fi
+#!/bin/sh
+#
+# Ensure the user can't install incompatible software.
+#
+# FreeNAS <-> TrueNAS, etc shouldn't be supported, nor should switching from a
+# particular avatar project to another mutually incompatible avatar project
+# (cyb0rg <-> FreeNAS).
+#
+# Garrett Cooper, March 2012
+#
+
+if [ "$OLD_AVATAR_PROJECT" != "$NEW_AVATAR_PROJECT" ]
+then
+	error "projects do not match ($OLD_AVATAR_PROJECT != $NEW_AVATAR_PROJECT)"
+fi

Added: branches/8.2-nup/nanobsd/Installer/pre-install/0004.hardware_requirements.sh
===================================================================
--- branches/8.2-nup/nanobsd/Installer/pre-install/0004.hardware_requirements.sh	                        (rev 0)
+++ branches/8.2-nup/nanobsd/Installer/pre-install/0004.hardware_requirements.sh	2012-03-14 14:04:56 UTC (rev 10663)
@@ -0,0 +1,66 @@
+#!/bin/sh
+#
+# Ensure that users meet the minimum hardware requirements, e.g. don't try and
+# install the software on unsupported machines.
+#
+# Put other fun checks (vendor/firmware specific ones) in separate scripts so
+# this script doesn't grow too large.
+#
+# Garrett Cooper, March 2012
+#
+
+# We're not talkin the business man's RAM ;)..
+GB=$(( 1024*1024*1024 ))
+
+# 1.0GHz
+MINIMUM_CPU_REQUIREMENT=1000
+
+# 1GB
+MINIMUM_RAM_REQUIREMENT=$(( 1 * $GB ))
+
+# XXX: x86 only
+cpufreq=$(sysctl_n machdep.tsc_freq)
+if [ "$cpufreq" -lt $MINIMUM_CPU_REQUIREMENT ]
+then
+	warn "CPU is too slow ($cpufreq < $MINIMUM_CPU_REQUIREMENT)"
+fi
+
+# hw.physmem
+ram=$(sysctl_n hw.physmem)
+if [ $ram -lt $MINIMUM_RAM_REQUIREMENT ]
+then
+	warn "not enough RAM ($ram < $MINIMUM_RAM_REQUIREMENT)"
+fi
+#!/bin/sh
+#
+# Ensure that users meet the minimum hardware requirements, e.g. don't try and
+# install the software on unsupported machines.
+#
+# Put other fun checks (vendor/firmware specific ones) in separate scripts so
+# this script doesn't grow too large.
+#
+# Garrett Cooper, March 2012
+#
+
+# We're not talkin the business man's RAM ;)..
+GB=$(( 1024*1024*1024 ))
+
+# 1.0GHz
+MINIMUM_CPU_REQUIREMENT=1000
+
+# 1GB
+MINIMUM_RAM_REQUIREMENT=$(( 1 * $GB ))
+
+# XXX: x86 only
+cpufreq=$(sysctl_n machdep.tsc_freq)
+if [ "$cpufreq" -lt $MINIMUM_CPU_REQUIREMENT ]
+then
+	warn "CPU is too slow ($cpufreq < $MINIMUM_CPU_REQUIREMENT)"
+fi
+
+# hw.physmem
+ram=$(sysctl_n hw.physmem)
+if [ $ram -lt $MINIMUM_RAM_REQUIREMENT ]
+then
+	warn "not enough RAM ($ram < $MINIMUM_RAM_REQUIREMENT)"
+fi

Modified: branches/8.2-nup/nanobsd/common
===================================================================
--- branches/8.2-nup/nanobsd/common	2012-03-14 12:31:14 UTC (rev 10662)
+++ branches/8.2-nup/nanobsd/common	2012-03-14 14:04:56 UTC (rev 10663)
@@ -381,7 +381,7 @@
 EOF
 
 }
-late_customize_cmd generate_avatar_conf
+customize_cmd generate_avatar_conf
 
 __a=`mount | grep ${NANO_OBJ}/ | awk '{print length($3), $3;}' | sort -rn | awk '{$1=""; print;}'`
 if [ -n "$__a" ]; then

Modified: branches/8.2-nup/nanobsd/os-base
===================================================================
--- branches/8.2-nup/nanobsd/os-base	2012-03-14 12:31:14 UTC (rev 10662)
+++ branches/8.2-nup/nanobsd/os-base	2012-03-14 14:04:56 UTC (rev 10663)
@@ -700,8 +700,21 @@
 		# NOTE: keep in synch with create_*_diskimage.
 		mv "$NANO_DISKIMGDIR/_.disk.image" "$firmware_img"
 
-		cat "$firmware_img" | xz --verbose -9 > "$gui_upgrade_bname.xz"
+		# NOTE: this is still needed after the .txz payload has been
+		# added because pc-sysinstall doesn't support raw images
+		# (-.-).
+		xz --keep --verbose -9 < "$firmware_img" > \
+		    "$gui_upgrade_bname.xz"
 
+		tar --options=xz:compression-level=9 -cJpvf \
+		    "$gui_upgrade_bname.txz" \
+			-C "$NANO_WORLDDIR" \
+				etc/avatar.conf \
+			-C "$AVATAR_ROOT/nanobsd/Installer" \
+				. \
+			-C "$NANO_DISKIMGDIR" \
+				${firmware_img##*/}
+
 		) > "${gui_image_log}" 2>&1
 
 	fi

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Freenas-commit] SF.net SVN: freenas:[10664] branches/8.2-nup

From: <yaberauneya@us...> - 2012-03-14 14:12

Revision: 10664
          http://freenas.svn.sourceforge.net/freenas/?rev=10664&view=rev
Author:   yaberauneya
Date:     2012-03-14 14:11:51 +0000 (Wed, 14 Mar 2012)
Log Message:
-----------
Merge changes from trunk

Modified Paths:
--------------
    branches/8.2-nup/README
    branches/8.2-nup/gui/freeadmin/models.py
    branches/8.2-nup/gui/freeadmin/navtree.py
    branches/8.2-nup/gui/locale/af/LC_MESSAGES/django.po
    branches/8.2-nup/gui/locale/af/LC_MESSAGES/djangojs.po
    branches/8.2-nup/gui/locale/es/LC_MESSAGES/django.po
    branches/8.2-nup/gui/locale/es/LC_MESSAGES/djangojs.po
    branches/8.2-nup/gui/locale/tr/LC_MESSAGES/django.po
    branches/8.2-nup/nanobsd/os-base

Property Changed:
----------------
    branches/8.2-nup/


Property changes on: branches/8.2-nup
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/8.0.1:7333,7346
/branches/8.1:6033-6383
/branches/dojo17:8468-8495
/branches/feedback:6189-6347
/experimental/ix-8.2:5657-5682
/tags/8.0.3-BETA2:9099-9100
/trunk:7833-7857,10603-10638,10641-10654
   + /branches/8.0.1:7333,7346
/branches/8.1:6033-6383
/branches/dojo17:8468-8495
/branches/feedback:6189-6347
/experimental/ix-8.2:5657-5682
/tags/8.0.3-BETA2:9099-9100
/trunk:7833-7857,10603-10638,10641-10662

Modified: branches/8.2-nup/README
===================================================================
--- branches/8.2-nup/README	2012-03-14 14:04:56 UTC (rev 10663)
+++ branches/8.2-nup/README	2012-03-14 14:11:51 UTC (rev 10664)
@@ -17,7 +17,6 @@
 - You need the following additional ports/packages to build the FreeNAS base
   OS image:
   - sysutils/cdrtools
-  - devel/py-polib
 
 - You need the following additional ports/packages to build the plugins jail:
   - ports-mgmt/pbi-manager

Modified: branches/8.2-nup/gui/freeadmin/models.py
===================================================================
--- branches/8.2-nup/gui/freeadmin/models.py	2012-03-14 14:04:56 UTC (rev 10663)
+++ branches/8.2-nup/gui/freeadmin/models.py	2012-03-14 14:11:51 UTC (rev 10664)
@@ -40,7 +40,7 @@
 
     def formfield(self, **kwargs):
         #FIXME: Move to top (causes cycle-dependency)
-        from freeadmin.forms import UserField as UF
+        from freenasUI.freeadmin.forms import UserField as UF
         defaults = {'form_class': UF, 'exclude': self._exclude}
         kwargs.update(defaults)
         return super(UserField, self).formfield(**kwargs)
@@ -49,7 +49,7 @@
 class GroupField(models.CharField):
     def formfield(self, **kwargs):
         #FIXME: Move to top (causes cycle-dependency)
-        from freeadmin.forms import GroupField as GF
+        from freenasUI.freeadmin.forms import GroupField as GF
         defaults = {'form_class': GF}
         kwargs.update(defaults)
         return super(GroupField, self).formfield(**kwargs)
@@ -68,7 +68,7 @@
 
     def formfield(self, **kwargs):
         #FIXME: Move to top (causes cycle-dependency)
-        from freeadmin.forms import PathField as PF
+        from freenasUI.freeadmin.forms import PathField as PF
         defaults = {
             'form_class': PF,
             'abspath': self.abspath,

Modified: branches/8.2-nup/gui/freeadmin/navtree.py
===================================================================
--- branches/8.2-nup/gui/freeadmin/navtree.py	2012-03-14 14:04:56 UTC (rev 10663)
+++ branches/8.2-nup/gui/freeadmin/navtree.py	2012-03-14 14:11:51 UTC (rev 10664)
@@ -62,15 +62,16 @@
         except ImportError, e:
             return None
 
-    """
-    This is used for Menu Item replacement
+    def register_option(self, opt, parent, replace=False, evaluate=True):
+        """
+        This is used for Menu Item replacement
 
-    Every option added to the tree register its name in a dict
-    If the name was already registered before it can be replaced or not
+        Every option added to the tree register its name in a dict
+        If the name was already registered before it can be replaced or not
 
-    Return Value: Item has been added to the tree or not
-    """
-    def register_option(self, opt, parent, replace=False, evaluate=True):
+        Returns::
+            bool: Item has been added to the tree or not
+        """
 
         if evaluate:
             current_parent = parent
@@ -193,22 +194,22 @@
                             _models[form._meta.model] = form
             self._modelforms.update(_models)
 
-    """
-    Tree Menu Auto Generate
-
-    Every app listed at INSTALLED_APPS is scanned
-    1st - app_name.forms is imported. All its objects/classes are scanned
-        looking for ModelForm classes
-    2nd - app_name.nav is imported. TreeNode classes are scanned for hard-coded
-        menu entries or overwriting
-    3rd - app_name.models is imported. models.Model classes are scanned,
-        if a related ModelForm is found several entries are Added to the Menu
-            - Objects
-            - Add (Model)
-            - View (Model)
-    """
     def generate(self, request=None):
+        """
+        Tree Menu Auto Generate
 
+        Every app listed at INSTALLED_APPS is scanned
+        1st - app_name.forms is imported. All its objects/classes are scanned
+            looking for ModelForm classes
+        2nd - app_name.nav is imported. TreeNode classes are scanned for hard-coded
+            menu entries or overwriting
+        3rd - app_name.models is imported. models.Model classes are scanned,
+            if a related ModelForm is found several entries are Added to the Menu
+                - Objects
+                - Add (Model)
+                - View (Model)
+        """
+
         self._generated = True
         self._options.clear()
         tree_roots.clear()
@@ -453,7 +454,7 @@
             options.append(option)
         return options
 
-    def dehydrate(self, o, level, uid, gname=None):
+    def dehydrate(self, o, uid, gname=None):
 
         # info about current node
         my = {
@@ -482,7 +483,7 @@
             my['children'] = []
 
         for i in o.option_list:
-            opt = self.dehydrate(i, level + 1, uid, gname=my['gname'])
+            opt = self.dehydrate(i, uid, gname=my['gname'])
             my['children'].append(opt)
 
         return my
@@ -500,7 +501,7 @@
         items = []
         uid = ByRef(1)
         for n in self._build_nav():
-            items.append(self.dehydrate(n, level=0, uid=uid))
+            items.append(self.dehydrate(n, uid=uid))
         return items
 
 navtree = NavTree()

Modified: branches/8.2-nup/gui/locale/af/LC_MESSAGES/django.po
===================================================================
--- branches/8.2-nup/gui/locale/af/LC_MESSAGES/django.po	2012-03-14 14:04:56 UTC (rev 10663)
+++ branches/8.2-nup/gui/locale/af/LC_MESSAGES/django.po	2012-03-14 14:11:51 UTC (rev 10664)
@@ -9,8 +9,8 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-03-06 09:47-0800\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@..."
+"PO-Revision-Date: 2012-03-13 13:50+0200\n"
+"Last-Translator: Nick <jjstccean@..."
 "Language-Team: LANGUAGE <LL@..."
 "Language: \n"
 "MIME-Version: 1.0\n"
@@ -108,7 +108,7 @@
 
 #: choices.py:86 choices.py:95
 msgid "Disabled"
-msgstr ""
+msgstr "Buite Staat"
 
 #: choices.py:87
 msgid "Level 1 - Minimum power usage with Standby (spindown)"
@@ -140,7 +140,7 @@
 
 #: choices.py:97
 msgid "Medium"
-msgstr ""
+msgstr "Gemiddeld"
 
 #: choices.py:98
 msgid "Maximum"
@@ -360,7 +360,7 @@
 
 #: choices.py:486
 msgid "Day(s)"
-msgstr ""
+msgstr "Dag(ae)"
 
 #: choices.py:487
 msgid "Week(s)"
@@ -399,12 +399,12 @@
 #: choices.py:506 choices.py:507
 #, python-format
 msgid "%(minutes)s minutes"
-msgstr ""
+msgstr "%(minute) minute"
 
 #: choices.py:508
 #, python-format
 msgid "%(hour)s hour"
-msgstr ""
+msgstr "%(uur)e uur"
 
 #: choices.py:509 choices.py:510 choices.py:511 choices.py:512 choices.py:513
 #, python-format
@@ -427,15 +427,15 @@
 
 #: choices.py:520
 msgid "Sleep - Check the device unless it is in SLEEP mode"
-msgstr ""
+msgstr "Slaap - Gaan die toestel na, tensy dit in slaapstand is"
 
 #: choices.py:521
 msgid "Standby - Check the device unless it is in SLEEP or STANDBY mode"
-msgstr ""
+msgstr "Standby - Gaan die toestel na, tensy dit in slaap of standby-af is"
 
 #: choices.py:522
 msgid "Idle - Check the device unless it is in SLEEP, STANDBY or IDLE mode"
-msgstr ""
+msgstr "Luier - Gaan die toestel na, tensy dit slaap, Standby of idle mode is"
 
 #: choices.py:526
 msgid "Long Self-Test"
@@ -552,7 +552,7 @@
 
 #: account/forms.py:256
 msgid "Home Directory Mode"
-msgstr ""
+msgstr "Huis Gids Mode"
 
 #: account/forms.py:259 account/forms.py:693
 msgid "Auxiliary groups"
@@ -580,19 +580,19 @@
 
 #: account/forms.py:351
 msgid "Home directory has to start with /mnt/ or be /nonexistent"
-msgstr ""
+msgstr "Huis gids mag net begin met /mnt/ of /nonexistent"
 
 #: account/forms.py:366 account/forms.py:703
 msgid "A user cannot belong to more than 64 auxiliary groups"
-msgstr ""
+msgstr "'N gebruiker kan nie aan meer as 64 hulp groepe behoort nie"
 
 #: account/forms.py:381 account/forms.py:582
 msgid "Home directory is not writable, leave this blank"
-msgstr ""
+msgstr "Huis gids is nie skryfbaar is nie, los dit leeg"
 
 #: account/forms.py:388
 msgid "Password is disabled, leave this blank"
-msgstr ""
+msgstr "Wagwoord is gestremd, los dit leeg"
 
 #: account/forms.py:394 plugins/forms.py:103 plugins/forms.py:145
 #: services/forms.py:622 services/forms.py:925 storage/forms.py:194
@@ -602,19 +602,19 @@
 
 #: account/forms.py:562
 msgid "Home directory has to start with /mnt or be /nonexistent"
-msgstr ""
+msgstr "Home gids moet begin met /mnt/ of /nonexistent"
 
 #: account/forms.py:634
 msgid "Allow repeated GIDs"
-msgstr ""
+msgstr "Laat herhaalde GIDs toe"
 
 #: account/forms.py:647
 msgid "A group with that name already exists."
-msgstr ""
+msgstr "'N groep met daardie naam  bestaan reeds."
 
 #: account/forms.py:665
 msgid "A group with this gid already exists"
-msgstr ""
+msgstr "Daar bestaan reeds 'n groep met hierdie gid"
 
 #: account/forms.py:675
 msgid "Member users"
@@ -630,7 +630,7 @@
 
 #: account/forms.py:746
 msgid "Change root password as well"
-msgstr ""
+msgstr "Verander ook die root wagwoord"
 
 #: account/forms.py:753
 msgid "Old password"
@@ -663,7 +663,7 @@
 
 #: account/models.py:50 templates/account/index.html:13
 msgid "Groups"
-msgstr ""
+msgstr "Groepe"
 
 #: account/models.py:67
 #, python-format
@@ -711,12 +711,12 @@
 
 #: account/models.py:131 templates/account/index.html:19
 msgid "Users"
-msgstr ""
+msgstr "Gebruikers"
 
 #: account/models.py:150
 #, python-format
 msgid "User %s is built-in and can not be deleted!"
-msgstr ""
+msgstr "Gebruiker% s is in gebou en kan nie geskrap word nie!"
 
 #: account/nav.py:5 templates/menubar.html:53
 msgid "Account"
@@ -730,12 +730,12 @@
 #: templates/account/bsdusers.html.py:35 templates/account/bsdusers.html:112
 #: templates/account/bsdusers.html:114 templates/account/index.html:8
 msgid "Change Password"
-msgstr ""
+msgstr "Verander wagwoord"
 
 #: account/nav.py:22 templates/account/changeform.html:2
 #: templates/account/index.html:3
 msgid "Change Admin User"
-msgstr ""
+msgstr "Verander Admin gebruiker"
 
 #: account/views.py:95
 msgid "Password successfully updated."
@@ -775,7 +775,7 @@
 #: freeadmin/navtree.py:334
 #, python-format
 msgid "Add %s"
-msgstr ""
+msgstr "Voeg %s"
 
 #: freeadmin/navtree.py:346
 #, python-format
@@ -784,15 +784,15 @@
 
 #: freeadmin/navtree.py:366
 msgid "Display System Processes"
-msgstr ""
+msgstr "Vertoon Stelsel Prosesse"
 
 #: freeadmin/navtree.py:375 templates/system/reboot_dialog.html:14
 msgid "Reboot"
-msgstr ""
+msgstr "Herbingin"
 
 #: freeadmin/navtree.py:379 templates/system/shutdown_dialog.html:14
 msgid "Shutdown"
-msgstr ""
+msgstr "Afsluiting"
 
 #: freeadmin/navtree.py:395
 #, python-format
@@ -816,7 +816,7 @@
 #: freeadmin/views.py:428 freeadmin/views.py:648 freeadmin/views.py:650
 #, python-format
 msgid "%s successfully updated."
-msgstr ""
+msgstr "%s suksesvol opgedateer."
 
 #: freeadmin/views.py:432 freeadmin/views.py:652
 msgid "The service failed to restart."
@@ -825,7 +825,7 @@
 #: freeadmin/views.py:761 freeadmin/views.py:765
 #, python-format
 msgid "%s successfully deleted."
-msgstr ""
+msgstr "%s suksesvol verwyder."
 
 #: middleware/zfs.py:527 storage/models.py:556
 msgid "Error getting total space"

Modified: branches/8.2-nup/gui/locale/af/LC_MESSAGES/djangojs.po
===================================================================
--- branches/8.2-nup/gui/locale/af/LC_MESSAGES/djangojs.po	2012-03-14 14:04:56 UTC (rev 10663)
+++ branches/8.2-nup/gui/locale/af/LC_MESSAGES/djangojs.po	2012-03-14 14:11:51 UTC (rev 10664)
@@ -9,8 +9,8 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-03-06 09:50-0800\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@..."
+"PO-Revision-Date: 2012-03-13 13:51+0200\n"
+"Last-Translator: Nick <jjstccean@..."
 "Language-Team: LANGUAGE <LL@..."
 "Language: \n"
 "MIME-Version: 1.0\n"
@@ -23,7 +23,7 @@
 
 #: freeadmin/static/lib/js/freeadmin.js:68
 msgid "Settings"
-msgstr ""
+msgstr "verstellings"
 
 #: freeadmin/static/lib/js/freeadmin.js:79
 msgid "System Information"
@@ -31,7 +31,7 @@
 
 #: freeadmin/static/lib/js/freeadmin.js:119
 msgid "Network Settings"
-msgstr ""
+msgstr "Netwerk Verstellings"
 
 #: freeadmin/static/lib/js/freeadmin.js:184
 msgid "Plugins"

Modified: branches/8.2-nup/gui/locale/es/LC_MESSAGES/django.po
===================================================================
--- branches/8.2-nup/gui/locale/es/LC_MESSAGES/django.po	2012-03-14 14:04:56 UTC (rev 10663)
+++ branches/8.2-nup/gui/locale/es/LC_MESSAGES/django.po	2012-03-14 14:11:51 UTC (rev 10664)
@@ -8,8 +8,8 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-03-06 09:48-0800\n"
-"PO-Revision-Date: 2012-03-07 19:15+0200\n"
-"Last-Translator: efrasoft <efrasoft@..."
+"PO-Revision-Date: 2012-03-13 18:51+0200\n"
+"Last-Translator: raulfg <raulfg3@..."
 "Language-Team: LANGUAGE <LL@..."
 "Language: es\n"
 "MIME-Version: 1.0\n"
@@ -562,7 +562,6 @@
 msgstr "Clave Pública SSH"
 
 #: account/forms.py:256
-#, fuzzy
 msgid "Home Directory Mode"
 msgstr "Directorio Personal"
 
@@ -817,7 +816,7 @@
 #: freeadmin/navtree.py:398
 #, python-format
 msgid "Couldn't retrieve %(url)s: %(error)s"
-msgstr ""
+msgstr "No puedo recuperar %(url)s: %(error)s"
 
 #: freeadmin/navtree.py:432
 #, fuzzy, python-format
@@ -1453,7 +1452,7 @@
 #: services/forms.py:365
 #, fuzzy
 msgid "The UPS service failed to reload."
-msgstr "Ha fallado el reinicio del servicio NFS"
+msgstr "Ha fallado el reinicio del servicio SAI (UPS)"
 
 #: services/forms.py:369
 #, fuzzy
@@ -1511,7 +1510,7 @@
 #: services/forms.py:451 services/forms.py:454
 #, fuzzy
 msgid "The peer user is required if you set a peer secret."
-msgstr "Debe establecer una contraseña si crea un usuario \"peer\""
+msgstr "El usuario peer es necesario si desea establecer una contraseña de peer"
 
 #: services/forms.py:471 services/forms.py:518 services/forms.py:635
 #: services/forms.py:693 services/forms.py:796 services/forms.py:818
@@ -1861,6 +1860,9 @@
 "to automatically discover the CIFS shares on the system similar to the "
 "Computer Browser service in Windows."
 msgstr ""
+"El soporte Zeroconf via Avahi permite el descubrimiento automatico de "
+"compartidos windows (CIFS) de forma parecida a como lo hace Windows con "
+"\"Explorar la red\" "
 
 #: services/models.py:187 services/models.py:188
 #: templates/services/index.html:29
@@ -1888,9 +1890,8 @@
 msgstr "permitir acceso de invitado a todos los compartidos AFP"
 
 #: services/models.py:213
-#, fuzzy
 msgid "Max. Connections"
-msgstr "Máximo número conexiones"
+msgstr "Máximo número de conexiones"
 
 #: services/models.py:215
 #, fuzzy
@@ -2218,7 +2219,7 @@
 
 #: services/models.py:612
 msgid "Optional user-friendly string of the target."
-msgstr "Opcional - apodo del destino"
+msgstr "Opcional - \"Alias\" del destino"
 
 #: services/models.py:615 storage/models.py:318 storage/views.py:226
 msgid "Serial"
@@ -2458,7 +2459,7 @@
 #: services/models.py:880
 #, fuzzy
 msgid "UPS Master User Password"
-msgstr "Contraseña del recurso compartido"
+msgstr "Contraseña del Usuario Maestro de la SAI (UPS)"
 
 #: services/models.py:884
 msgid "Extra users (upsd.users)"
@@ -2820,9 +2821,8 @@
 msgstr "Nombre del grupo de trabajo (Ej: WORKGROUP)"
 
 #: services/models.py:1178
-#, fuzzy
 msgid "Allow Trusted Domains"
-msgstr "Permitir GIDs (Identificadores De Grupo) repetidas"
+msgstr "Permitir dominios autenticados"
 
 #: services/models.py:1182
 msgid "Administrator Name"
@@ -3951,7 +3951,11 @@
 "I'm aware this will destroy all child datasets and snapshots within this "
 "dataset"
 msgstr[0] ""
+"Soy consciente de que esta acción destruira la instantanea de este conjunto "
+"de datos"
 msgstr[1] ""
+"Soy consciente de que esta acción destruira todas las instantaneas de este "
+"conjunto de datos"
 
 #: storage/forms.py:978 system/forms.py:465 system/forms.py:512
 msgid "minute"
@@ -3978,11 +3982,11 @@
 
 #: storage/models.py:188 templates/storage/scrub.html:6
 msgid "Threshold days"
-msgstr ""
+msgstr "Umbral de dias"
 
 #: storage/models.py:190
 msgid "Determine how many days shall be between scrubs"
-msgstr ""
+msgstr "Determina cuantos dias deben pasar entre Reconstruciones (scrubs)"
 
 #: storage/models.py:200 system/models.py:320 system/models.py:468
 #: templates/storage/scrub.html:7 templates/system/cronjob.html:5
@@ -4040,12 +4044,11 @@
 
 #: storage/models.py:231
 msgid "ZFS Scrub"
-msgstr ""
+msgstr "Reconstrucción ZFS (ZFS Scrub)"
 
 #: storage/models.py:232
-#, fuzzy
 msgid "ZFS Scrubs"
-msgstr "Compartido Unix (NFS)"
+msgstr "Reconstrucción ZFS (ZFS Scrub)"
 
 #: storage/models.py:246 system/models.py:367 system/models.py:569
 msgid "Every minute"
@@ -4153,9 +4156,8 @@
 
 #: storage/models.py:625 storage/models.py:679
 #: templates/storage/replications.html:20 templates/storage/tasks.html:21
-#, fuzzy
 msgid "Filesystem/Volume"
-msgstr "Tipo de sistema de archivos"
+msgstr "Sistema de archivos / Volumen"
 
 #: storage/models.py:630
 msgid "Last snapshot sent to remote side (leave blank for full replication)"
@@ -4187,6 +4189,8 @@
 #: storage/models.py:645
 msgid "Initialize remote side for once. (May cause data loss on remote side!)"
 msgstr ""
+"Inicializar lado remoto una vez. (Puede causar pérdida de datos en el lado "
+"remoto!)"
 
 #: storage/models.py:649
 msgid "Limit (kB/s)"
@@ -4221,18 +4225,16 @@
 msgstr "Inicio"
 
 #: storage/models.py:698
-#, fuzzy
 msgid "Do not snapshot before"
-msgstr "Mantenga instantánea para"
+msgstr "No realizar instantaneas antes de..."
 
 #: storage/models.py:702
 msgid "End"
 msgstr "Fin"
 
 #: storage/models.py:703
-#, fuzzy
 msgid "Do not snapshot after"
-msgstr "Mantenga instantánea para"
+msgstr "No realizar instantaneas despues de..."
 
 #: storage/models.py:709
 msgid "Interval"
@@ -4273,9 +4275,8 @@
 msgstr "Ver todas las instantaneas"
 
 #: storage/nav.py:34
-#, fuzzy
 msgid "View ZFS Scrubs"
-msgstr "Ver Todos los Grupos"
+msgstr "Ver Reconstrucciones  (Scrub) ZFS"
 
 #: storage/nav.py:41 templates/storage/volumes.html:4
 #: templates/storage/volumes.html.py:6
@@ -4417,22 +4418,20 @@
 msgstr "La desconexión del disco se ha realizado correctamente"
 
 #: storage/views.py:599
-#, fuzzy
 msgid "Disk offline operation has been issued."
-msgstr "Remplazo de disco iniciado"
+msgstr "La operación de poner fuera de linea el Disco ha sido iniciada."
 
 #: storage/views.py:614
 msgid "Disk has been removed."
 msgstr ""
 
 #: storage/views.py:633
-#, fuzzy
 msgid "The volume has been successfully detached"
-msgstr "Volumen exportado correctamente"
+msgstr "El volumen ha sido correctamente desmontado"
 
 #: storage/views.py:653
 msgid "The scrub process has begun"
-msgstr ""
+msgstr "El proceso de reconstrucción ha comenzado"
 
 #: system/forms.py:161
 msgid "Language (Require UI reload)"
@@ -4454,7 +4453,7 @@
 
 #: system/forms.py:217
 msgid "Max Poll should be higher than Min Poll"
-msgstr ""
+msgstr "Max Poll debe ser mayor que Min Poll"
 
 #: system/forms.py:222
 msgid "Server could not be reached. Check \"Force\" to continue regardless."
@@ -4565,7 +4564,6 @@
 msgstr ""
 
 #: system/models.py:102 templates/system/ntpserver.html:8
-#, fuzzy
 msgid "Prefer"
 msgstr "Preferido"
 
@@ -4574,10 +4572,13 @@
 "Marks the server as preferred. All other things being equal, this host will "
 "be chosen for synchronization among a set of correctly operating hosts."
 msgstr ""
+"Marcar el servidor como preferido. el resto de parametros se mantienen. Este "
+"servidor será usado preferentemente de entre todos los que funcionen "
+"correctamente."
 
 #: system/models.py:107 templates/system/ntpserver.html:9
 msgid "Min. Poll"
-msgstr ""
+msgstr "Min Poll"
 
 #: system/models.py:110
 msgid ""
@@ -4587,7 +4588,7 @@
 
 #: system/models.py:113 templates/system/ntpserver.html:10
 msgid "Max. Poll"
-msgstr ""
+msgstr "Max Poll"
 
 #: system/models.py:116
 msgid ""
@@ -4823,7 +4824,7 @@
 
 #: system/models.py:445
 msgid "Name of the module defined in the remote rsync daemon"
-msgstr ""
+msgstr "Nombre del modulo definido en el demonio de Rsync remoto"
 
 #: system/models.py:449
 #, fuzzy
@@ -4985,14 +4986,12 @@
 msgstr ""
 
 #: system/models.py:794
-#, fuzzy
 msgid "Tunable"
-msgstr "Habilitar AIO"
+msgstr "Ajuste (Tunable)"
 
 #: system/models.py:795
-#, fuzzy
 msgid "Tunables"
-msgstr "Habilitar AIO"
+msgstr "Ajustes (Tunables)"
 
 #: system/nav.py:5 templates/menubar.html:8
 msgid "System"
@@ -5022,28 +5021,24 @@
 msgstr "Opciones de S.M.A.R.T."
 
 #: system/nav.py:54
-#, fuzzy
 msgid "View Sysctls"
-msgstr "Ver Discos"
+msgstr "Ver Sysctls"
 
 #: system/nav.py:61
-#, fuzzy
 msgid "View Tunables"
-msgstr "Ver Todos los Usuarios"
+msgstr "Ver Ajustes"
 
 #: system/views.py:118
 msgid "The uploaded file is not valid."
 msgstr "El fichero subido no es válido."
 
 #: system/views.py:245
-#, fuzzy
 msgid "Reboot is being issued"
-msgstr "Contraseña de root obligatoria"
+msgstr "Ha comenzado el reinicio"
 
 #: system/views.py:267
-#, fuzzy
 msgid "Shutdown is being issued"
-msgstr "Apagar el Sistema"
+msgstr "Ha comenzado el apagado"
 
 #: system/views.py:297
 #, fuzzy, python-format
@@ -5165,9 +5160,8 @@
 msgstr "Cambiar contraseña de Administrador"
 
 #: templates/freeadmin/advanced_btn.html:25
-#, fuzzy
 msgid "Basic Mode"
-msgstr "Modulo Rsync"
+msgstr "Modo Básico"
 
 #: templates/freeadmin/advanced_btn.html:27
 #, fuzzy
@@ -5530,9 +5524,8 @@
 msgstr "Por favor espere..."
 
 #: templates/plugins/pbiwizard.html:16
-#, fuzzy
 msgid "Upload Plugin"
-msgstr "Subir configuración"
+msgstr "Cargar Plugin"
 
 #: templates/registration/login.html:42
 msgid "Your username and password didn't match. Please try again."
@@ -5636,7 +5629,7 @@
 #: templates/services/index.html:175
 #, fuzzy
 msgid "UPS Settings"
-msgstr "Configuración NFS"
+msgstr "Configuración SAI"
 
 #: templates/services/iscsi.html:1
 msgid "iSCSI Management"
@@ -5902,7 +5895,6 @@
 msgstr "¿Está seguro de que quiere borrar?"
 
 #: templates/storage/disk_remove.html:7
-#, fuzzy
 msgid "Are you sure you want to remove?"
 msgstr "¿Está seguro de que quiere borrar?"
 
@@ -5992,28 +5984,27 @@
 msgstr "No está disponible la replicación ZFS"
 
 #: templates/storage/scrub.html:42
-#, fuzzy
 msgid "No scrub tasks defined."
-msgstr "No hay RSyncs definidos"
+msgstr "No hay tareas de Reconstrución (scrub) definidas"
 
 #: templates/storage/scrub.html:48
 msgid "Add ZFS Scrub Task"
-msgstr ""
+msgstr "Añadir una tarea de Reconstrucción (Scrub)"
 
 #: templates/storage/scrub.html:50
-#, fuzzy
 msgid "Add ZFS Scrub"
-msgstr "Añadir Volumen ZFS"
+msgstr "Añadir una Reconstrución (scrub) ZFS"
 
 #: templates/storage/scrub_confirm.html:6
 msgid ""
 "Scrub is currently running! Are you sure you want to STOP the scrub process?"
 msgstr ""
+"La reconstrucción se esta ejecutando. ¿Esta segúro de que desea parar la "
+"recostrucción (STOP SCRUB)?"
 
 #: templates/storage/scrub_confirm.html:8
-#, fuzzy
 msgid "Are you sure you want to scrub?"
-msgstr "¿Está seguro de que desea desconectar el disco?"
+msgstr "¿Está seguro de que desea realizar una reconstrucción (scrub)?"
 
 #: templates/storage/scrub_confirm.html:8
 msgid "This will increase system overhead while in progress"
@@ -6124,14 +6115,12 @@
 msgstr "Estado"
 
 #: templates/storage/volumes.html:92 templates/storage/volumes.html.py:96
-#, fuzzy
 msgid "Detach Volume"
-msgstr "Crear un Volumen"
+msgstr "Desmontar Volumen"
 
 #: templates/storage/volumes.html:102 templates/storage/volumes.html.py:106
-#, fuzzy
 msgid "Scrub Volume"
-msgstr "Volumen ZFS"
+msgstr "Recostruir Volumen (scrub)"
 
 #: templates/storage/volumes.html:111 templates/storage/volumes.html.py:115
 #: templates/storage/volumes.html:200 templates/storage/volumes.html.py:204
@@ -6423,21 +6412,18 @@
 msgstr "S.M.A.R.T."
 
 #: templates/system/sysctl.html:32
-#, fuzzy
 msgid "No sysctl defined."
-msgstr "No hay RSyncs definidos"
+msgstr "No hay Sysctl definidos"
 
 # ¿Se podria tradudir RSync por tarea de sincronización?
 #: templates/system/sysctl.html:38
-#, fuzzy
 msgid "Add sysctl"
-msgstr "Añadir un RSync"
+msgstr "Añadir un Sysctl"
 
 # ¿Se podria tradudir RSync por tarea de sincronización?
 #: templates/system/sysctl.html:40
-#, fuzzy
 msgid "Add Sysctl"
-msgstr "Añadir un RSync"
+msgstr "Añadir un Sysctl"
 
 #: templates/system/system_info.html:9
 msgid "Build"
@@ -6465,22 +6451,19 @@
 
 #: templates/system/system_info.html:34
 msgid "Connected through"
-msgstr ""
+msgstr "Conectado atraves de"
 
 #: templates/system/tunable.html:32
-#, fuzzy
 msgid "No tunable setting defined."
-msgstr "No se ha definido destino"
+msgstr "No hay ajustes definidos."
 
 #: templates/system/tunable.html:38
-#, fuzzy
 msgid "Add Tunable"
-msgstr "Añadir Destino"
+msgstr "Añadir un ajuste"
 
 #: templates/system/tunable.html:40
-#, fuzzy
 msgid "Add Loader"
-msgstr "Añadir Portal"
+msgstr "Añadir cargador"
 
 #: templates/system/wizard.html:14
 #, fuzzy
@@ -6500,7 +6483,7 @@
 #: tools/alert.py:107
 #, python-format
 msgid "The volume %(volume)s status is %(status)s: %(message)s"
-msgstr ""
+msgstr "El estado del volumen %(volume)s es %(status)s: %(message)s"
 
 #: tools/alert.py:111
 #, python-format
@@ -6524,6 +6507,8 @@
 "The following IPs are bind to iSCSI Portal but were not found in the system: "
 "%s"
 msgstr ""
+"Las siguientes direcciones IP se han definido como portal iSCSI pero no se "
+"encuentran en la red:%s"
 
 #: tools/alert.py:169
 #, fuzzy
@@ -6658,9 +6643,8 @@
 msgid "Export Volume"
 msgstr "Exportar Volumen"
 
-#, fuzzy
 msgid "Add loader"
-msgstr "Añadir Portal"
+msgstr "Añadir cargador"
 
 msgid "Volume from which this dataset will be created on"
 msgstr "Volumen donde será creado este conjunto de datos (Dataset)"

Modified: branches/8.2-nup/gui/locale/es/LC_MESSAGES/djangojs.po
===================================================================
--- branches/8.2-nup/gui/locale/es/LC_MESSAGES/djangojs.po	2012-03-14 14:04:56 UTC (rev 10663)
+++ branches/8.2-nup/gui/locale/es/LC_MESSAGES/djangojs.po	2012-03-14 14:11:51 UTC (rev 10664)
@@ -8,8 +8,8 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-03-06 09:50-0800\n"
-"PO-Revision-Date: 2012-01-28 01:39+0200\n"
-"Last-Translator: victor <pi_victor@..."
+"PO-Revision-Date: 2012-03-13 18:52+0200\n"
+"Last-Translator: raulfg <raulfg3@..."
 "Language-Team: LANGUAGE <LL@..."
 "Language: es\n"
 "MIME-Version: 1.0\n"
@@ -36,7 +36,7 @@
 
 #: freeadmin/static/lib/js/freeadmin.js:184
 msgid "Plugins"
-msgstr ""
+msgstr "Plugins"
 
 #: freeadmin/static/lib/js/freeadmin.js:215
 msgid "Services"
@@ -61,7 +61,7 @@
 #: freeadmin/static/lib/js/freeadmin.js:608
 #: freeadmin/static/lib/js/freeadmin.js:710
 msgid "Please wait..."
-msgstr ""
+msgstr "Por favor espere..."
 
 #: freeadmin/static/lib/js/freeadmin.js:657
 #: freeadmin/static/lib/js/freeadmin.js:775

Modified: branches/8.2-nup/gui/locale/tr/LC_MESSAGES/django.po
===================================================================
--- branches/8.2-nup/gui/locale/tr/LC_MESSAGES/django.po	2012-03-14 14:04:56 UTC (rev 10663)
+++ branches/8.2-nup/gui/locale/tr/LC_MESSAGES/django.po	2012-03-14 14:11:51 UTC (rev 10664)
@@ -8,7 +8,7 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-03-06 09:46-0800\n"
-"PO-Revision-Date: 2012-03-12 08:57+0200\n"
+"PO-Revision-Date: 2012-03-14 07:54+0200\n"
 "Last-Translator: Ersan <yakazan@..."
 "Language-Team: LANGUAGE <LL@..."
 "Language: tr\n"
@@ -542,7 +542,7 @@
 #: freeadmin/navtree.py:371 templates/account/bsdusers.html:8
 #: templates/account/bsdusers.html.py:87
 msgid "Shell"
-msgstr "Kabuk"
+msgstr "Terminal"
 
 #: account/forms.py:241 account/forms.py:498
 msgid "Disable password logins"

Modified: branches/8.2-nup/nanobsd/os-base
===================================================================
--- branches/8.2-nup/nanobsd/os-base	2012-03-14 14:04:56 UTC (rev 10663)
+++ branches/8.2-nup/nanobsd/os-base	2012-03-14 14:11:51 UTC (rev 10664)
@@ -328,6 +328,7 @@
 add_port sysutils/ipmitool
 add_port www/py-django-json-rpc
 add_port devel/py-daemon
+add_port devel/py-polib
 # NOTE: in reality these aren't DEBUG apps, but this ensures that they aren't
 # counted against the release image's size because they aren't used in
 # production yet.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Freenas-commit] SF.net SVN: freenas:[10672] branches/8.2-nup

From: <yaberauneya@us...> - 2012-03-14 19:16

Revision: 10672
          http://freenas.svn.sourceforge.net/freenas/?rev=10672&view=rev
Author:   yaberauneya
Date:     2012-03-14 19:16:42 +0000 (Wed, 14 Mar 2012)
Log Message:
-----------
Merge changes from trunk

Modified Paths:
--------------
    branches/8.2-nup/gui/freeadmin/static/css/custom.css
    branches/8.2-nup/gui/freeadmin/static/css/layout.css
    branches/8.2-nup/gui/freeadmin/static/css/reset.css
    branches/8.2-nup/gui/freeadmin/static/css/template.css

Added Paths:
-----------
    branches/8.2-nup/patches/ports-py-polib.patch

Removed Paths:
-------------
    branches/8.2-nup/gui/freeadmin/static/css/freenas.css
    branches/8.2-nup/gui/freeadmin/static/css/typography.css

Property Changed:
----------------
    branches/8.2-nup/


Property changes on: branches/8.2-nup
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/8.0.1:7333,7346
/branches/8.1:6033-6383
/branches/dojo17:8468-8495
/branches/feedback:6189-6347
/experimental/ix-8.2:5657-5682
/tags/8.0.3-BETA2:9099-9100
/trunk:7833-7857,10603-10638,10641-10662
   + /branches/8.0.1:7333,7346
/branches/8.1:6033-6383
/branches/dojo17:8468-8495
/branches/feedback:6189-6347
/experimental/ix-8.2:5657-5682
/tags/8.0.3-BETA2:9099-9100
/trunk:7833-7857,10603-10638,10641-10666

Modified: branches/8.2-nup/gui/freeadmin/static/css/custom.css
===================================================================
--- branches/8.2-nup/gui/freeadmin/static/css/custom.css	2012-03-14 19:15:27 UTC (rev 10671)
+++ branches/8.2-nup/gui/freeadmin/static/css/custom.css	2012-03-14 19:16:42 UTC (rev 10672)
@@ -1,94 +1,169 @@
+/* * headings */
+h1,h2,h3,h4,h5,h6 {
+    font-family:Arial,Helvetica,sans-serif;
+}
+h1 {
+    font-weight:normal;
+    color:#50575F;
+}
+h2 {
+    color:#5C7990;
+}
+h3 {
+    color:#50575F;
+}
+h4 {
+    color:#5C7990;
+}
+h5 {
+    color:#50575F;
+}
+h6 {
+    color: #5C7990;
+}
+/* * anchor */
+a:link,a:visited {
+    color:#396f9d;
+}
+a:hover {
+    color: #ed5d00;
+}
 /* button styles */
 .claro .dijitButtonText {
-    padding: 4px;
+    padding:4px;
     font-weight:bold;
-    font-size: 7pt !important;
+    font-size:7pt !important;
     color:#666;
 }
 .claro .dijitButtonText p:hover {
     color:#333;
 }
-.claro .dijitButtonText p{
-    padding-top: 6px;
-    padding-bottom: 2px !important;
-    font-size:7pt;
+.claro .dijitButtonText p {
+    padding-top:6px;
+    padding-bottom:2px !important;
+    font-size: 7pt;
 }
 /* system->settings->config */
 .configbtn {
-        float:left;
-        padding:4px;
-    }
+    float:left;
+    padding: 4px;
+}
 /**/
-.claro .dijitTextBox  {
-    margin-right:18px;
+.claro .dijitTextBox {
+    margin-right: 18px;
 }
 /* end field styles */
-
-
-#rebootDialog_underlay { background-color:#000; }
-#shutdownDialog_underlay, #editscary_dialog_underlay { background-color:#FD0000; }
-#top_dialog_underlay { background-color:#000; }
-#top_dialog .dijitDialogPaneContent { background-color:#000 !important; }
-#shell_dialog_underlay { background-color:#000; }
-#shell_dialog .dijitDialogPaneContent { background-color:#000 !important; }
-#shell_dialog pre {border:none !important;}
-#log_dialog .dijitDialogPaneContent { width:800px;background-color:#000 !important; }
+#rebootDialog_underlay {
+    background-color:#000;
+}
+#shutdownDialog_underlay,#editscary_dialog_underlay {
+    background-color:#FD0000;
+}
+#top_dialog_underlay {
+    background-color:#000;
+}
+#top_dialog .dijitDialogPaneContent {
+    background-color:#000 !important;
+}
+#shell_dialog_underlay {
+    background-color:#000;
+}
+#shell_dialog .dijitDialogPaneContent {
+    background-color:#000 !important;
+}
+#shell_dialog pre {
+    border:none !important;
+}
+#log_dialog .dijitDialogPaneContent {
+    width:800px;
+    background-color:#000 !important;
+}
 #log_dialog {
-min-height:400px;background-color:black;
+    min-height:400px;
+    background-color:black;
 }
-.dijitDialogPaneContent { border-top:1px solid #333 !important; }
-#top_dialog pre {border:none !important;}
-#top_dialog {
-min-height:400px;
+.dijitDialogPaneContent {
+    border-top:1px solid #333 !important;
 }
+#top_dialog pre {
+    border:none !important;
+}
 .error {
-background-color:#F7977A;
-border:1px solid #222;
-max-width:500px;word-wrap:break-word;color:#000;height:50px;text-align:center;opacity:0.6;filter:alpha(opacity=18);
+    background-color:#F7977A;
+    border:1px solid #222;
+    max-width:500px;
+    word-wrap:break-word;
+    color:#000;
+    height:50px;
+    text-align:center;
+    opacity:0.6;
+    filter:alpha(opacity=18);
 }
 #msgfull_output {
-min-width:900px;
-max-height:400px;overflow-y:auto;border:none;word-wrap: break-word;
+    min-width:900px;
+    max-height:400px;
+    overflow-y:auto;
+    border:none;
+    word-wrap:break-word;
 }
 #helpDialog {
-background:#fff;width:400px;
+    background:#fff;
+    width:400px;
 }
 #helpDialog .helpIcon {
-float:left;position:relative;top:-36px;right:5px;
+    float:left;
+    position:relative;
+    top:-36px;
+    right:5px;
 }
 #helpDialog .float24 {
-float:left;padding-left:24px;
+    float:left;
+    padding-left:24px;
 }
 #helpDialog .float36 {
-float:left;padding-left:36px;
+    float:left;
+    padding-left:36px;
 }
 pre.message {
-font-family: monospace, Courier New, Courier;
-font-size: 9pt;
-color:#00FF00;
-padding:0;
-width:70%;
-background-color:#000;
-min-width:600px;
-border:1px solid #222;
-height:77px;
-white-space:pre-wrap;
-max-height:77px;
-opacity:0.6;filter:alpha(opacity=18);
+    font-family:monospace,Courier New,Courier;
+    font-size:9pt;
+    color:#00FF00;
+    padding:0;
+    width:70%;
+    background-color:#000;
+    min-width:600px;
+    border:1px solid #222;
+    height:77px;
+    white-space:pre-wrap;
+    max-height:77px;
+    opacity:0.6;
+    filter:alpha(opacity=18);
 }
 .error {
-background-color:#40664D;
-margin-left:100px;
-min-width:400px;
-border:1px solid #222;
-max-width:500px;word-wrap:break-word;color:#000;height:50px;text-align:center;opacity:0.6;filter:alpha(opacity=18);
+    background-color:#40664D;
+    margin-left:100px;
+    min-width:400px;
+    border:1px solid #222;
+    max-width:500px;
+    word-wrap:break-word;
+    color:#000;
+    height:50px;
+    text-align:center;
+    opacity:0.6;
+    filter:alpha(opacity=18);
 }
 .success {
-background-color:#40664D;
-min-width:400px;
-margin-left:100px;
-border:1px solid #222;
-max-width:500px;word-wrap:break-word;color:#000;height:50px;text-align:center;opacity:0.6;filter:alpha(opacity=18);
+    background-color:#40664D;
+    min-width:400px;
+    margin-left:100px;
+    border:1px solid #222;
+    max-width:500px;
+    word-wrap:break-word;
+    color:#000;
+    height:50px;
+    text-align:center;
+    opacity:0.6;
+    filter:alpha(opacity=18);
 }
 .error p {
     padding-top:18px;
@@ -98,9 +173,6 @@
     padding-top:18px;
     color:#fff;
 }
-.footer-block {
-float:left;color:#f5f5f5;
-}
 .dijitTooltipContainer {
     max-width:250px;
     margin-top:10px;
@@ -108,7 +180,6 @@
 }
 #successmsg {
     margin-left:100px;
-
 }
 #id_stg_timezone_menu {
     max-height:200px;
@@ -118,17 +189,15 @@
     max-height:200px;
     overflow:auto !important;
 }
-
 #id_int_v4netmaskbit_menu {
     max-height:200px;
     overflow:auto !important;
     width:155px;
 }
-
 ul.radio {
-    list-style: none;
+    list-style:none;
 }
-ul.radio li{
+ul.radio li {
     position:relative;
     left:-25px;
 }
@@ -136,12 +205,10 @@
     width:50px;
     text-align:center;
 }
-table.srv td{
+table.srv td {
     padding:8px;
 }
-
-
-table.srv img{
+table.srv img {
     cursor:pointer;
 }
 img.srv {
@@ -154,15 +221,6 @@
     font-weight:bold;
     color:#5C7990;
 }
-table.config {
-    margin-top:10px;
-}
-.config th{
-    color:#ff0000;
-}
-.config td{
-    padding-right:6px;
-}
 .dijitContentPane {
     padding:0px !important;
 }
@@ -180,7 +238,7 @@
 thead td:hover {
     background:#d7ebff;
 }
-table.grid  {
+table.grid {
     margin-top:10px;
     margin-left:10px;
     border-spacing:0;
@@ -198,20 +256,6 @@
 .odd {
     background:#fff;
 }
-#srv div.services {
-    width: 145px;
-    height: 145px;
-    border-right: 1px solid #c5c5c5;
-    border-bottom: 1px solid #c2c2c2;
-    text-align:left;
-    float: left;
-    margin:8px;
-    background: #f5f5f5;
-    overflow:auto;
-}
-#srv div.p {
-    padding:2px;
-}
 #reports div.chart {
     text-align:left;
     padding-bottom:10px;
@@ -221,97 +265,43 @@
     padding:2px;
 }
 #cp div {
-    width: 125px;
-    height: 125px;
-    border: 1px solid #000;
+    width:125px;
+    height:125px;
+    border:1px solid #000;
     text-align:center;
-    float: left;
+    float:left;
     margin:8px;
     overflow:auto;
 }
-#sub-menu {
-    float:right;
-    margin:8px;
-    padding:4px;
-    border:1px solid #C5C5C5;
-    background:#fff;
-}
-.sub-menu_item {
-    float:left;
-}
-.sub-menu_item a{
-    font-weight:bold;
-    margin-right:6px;
-}
-
-
 #sidepanel {
     margin:8px;
 }
-
 .icons {
-width:130px;
-position:relative;
-float:left;
-text-align:left;
+    width:130px;
+    position:relative;
+    float:left;
+    text-align:left;
 }
 .label {
     font-weight:bold;
     color:#50575F;
     line-height:24px;
-    padding-left:10px;
+    padding-left: 10px;
 }
-html, body, #mainDiv {
-      width: 100%; height: 100%;
-      border: 0; padding: 0; margin: 0;
-}
-
-.raidmenu {
-    background:transparent;
-    padding-bottom:14px;
-    font-size:14px;
+/* * FORM */
+.errorlist {
+    color:#ff0000;
+    list-style-type:none;
+    padding-left:0px;
     font-weight:bold;
-    height:40px;
-    line-height:40px;
-    text-shadow:0 -1px 1px #000000;
-    font-family:Arial,Helvetica,sans-serif;
 }
-.raidmenu a {
-
-    color:#EDF0F1;
-    padding-right:18px;
-}
-/*
- * FORM 
- */
-
- .errorlist {
-    color:#ff0000;
-    list-style-type: none;
+.errorlist li {
+    list-style-type:none;
     padding-left:0px;
-    font-weight: bold;
+    text-decoration:bold;
 }
- .errorlist li{
-     list-style-type: none;
-     padding-left:0px;
-     text-decoration:bold;
-}
-table.ix {
-    width:100%;
-}
-
-tr.ix, td.ix{
-    vertical-align:text-top;
-    line-height:26px;
-}
-
- td.ix {
-    padding:6px;
-    background-color:#f7f7f7;
-    color:#000;
-}
- th{
-    color: #50575F;
+th {
+    color:#50575F;
     background:#f5f5f5;
     padding:6px;
     font-weight:bold;
@@ -319,307 +309,731 @@
     vertical-align:top;
     line-height:24px;
 }
-
-.cifs_text_class radio{
+.cifs_text_class radio {
     color:#ff0000;
-    background-color:#000;
-
+    background-color: #000;
 }
 /* Tree Expand / Collapse */
-#colexpand { 
-margin-left:10px !important;
-margin-top:10px !important;
-height:20px;
+#colexpand {
+    margin-left:10px !important;
+    margin-top:10px !important;
+    height:20px;
 }
-
 table.grid tr {
     border-bottom:1px #ccc solid;
 }
-.SystemIcon { background-image: url('/static/images/ui/tree/system.png'); width:16px; height:    16px; }
-.ReportingIcon { background-image: url('/static/images/ui/tree/reporting.png'); width:16px; height:    16px; }
-.InfoIcon { background-image: url('/static/images/ui/tree/system_information.png'); width:16px; height:    16px; }
-.SettingsIcon { background-image: url('/static/images/ui/tree/settings.png'); width:16px; height:    16px; }
-.RebootIcon { background-image: url('/static/images/ui/tree/reboot.png'); width:16px; height:    16px; }
-.ShutdownIcon { background-image: url('/static/images/ui/tree/shutdown.png'); width:16px; height:    16px; }
-.AccountIcon { background-image: url('/static/images/ui/tree/account.png'); width:16px;          height:16px; }
-.NetworkIcon { background-image: url('/static/images/ui/tree/network.png'); width:16px;          height:16px; }
-.InterfacesIcon { background-image: url('/static/images/ui/tree/interfaces.png'); width:16px;          height:16px; }
-.AddInterfaceIcon { background-image: url('/static/images/ui/tree/add_interfaces.png'); width:16px;          height:16px; }
-.ViewAllInterfacesIcon { background-image: url('/static/images/ui/tree/view_all_interfaces.png'); width:16px;          height:16px; }
-.VLANIcon { background-image: url('/static/images/ui/tree/vlan.png'); width:16px;          height:16px; }
-.AddVLANIcon { background-image: url('/static/images/ui/tree/add_vlan.png'); width:16px;          height:16px; }
-.ViewAllVLANsIcon { background-image: url('/static/images/ui/tree/view_all_vlans.png'); width:16px;          height:16px; }
-.LAGGIcon { background-image: url('/static/images/ui/tree/lagg.png'); width:16px;          height:16px; }
-.AddLAGGIcon { background-image: url('/static/images/ui/tree/add_lagg.png'); width:16px;          height:16px; }
-.ViewAllLAGGsIcon { background-image: url('/static/images/ui/tree/view_all_laggs.png'); width:16px;          height:16px; }
-.StaticRouteIcon { background-image: url('/static/images/ui/tree/static_routes.png'); width:16px;          height:16px; }
-.AddStaticRouteIcon { background-image: url('/static/images/ui/tree/add_static_route.png'); width:16px;          height:16px; }
-.ViewAllStaticRoutesIcon { background-image: url('/static/images/ui/tree/view_all_static_routes.png'); width:16px;          height:16px; }
-.AddInterfaceIcon { background-image: url('/static/images/ui/tree/add_interfaces.png'); width:16px;          height:16px; }
-.ViewAllInterfacesIcon { background-image: url('/static/images/ui/tree/view_all_interfaces.png'); width:16px;          height:16px; }
-.StorageIcon { background-image: url('/static/images/ui/tree/storage.png'); width:16px;          height:16px; }
-.SharingIcon { background-image: url('/static/images/ui/tree/sharing.png'); width:16px;          height:16px; }
-.ServicesIcon { background-image: url('/static/images/ui/tree/services.png'); width:16px;        height:16px; }
-.iSCSIIcon { background-image: url('/static/images/ui/tree/iscsi.png'); width:16px;        height:16px; }
-.SNMPIcon { background-image: url('/static/images/ui/tree/snmp.png'); width:16px;        height:16px; }
-.ActiveDirectoryIcon { background-image: url('/static/images/ui/tree/active_directory.png'); width:16px;        height:16px; }
-.DDNSIcon { background-image: url('/static/images/ui/tree/dynamic_dns.png'); width:16px;        height:16px; }
-.OpenSSHIcon { background-image: url('/static/images/ui/tree/open_ssh.png'); width:16px;        height:16px; }
-.FTPIcon { background-image: url('/static/images/ui/tree/ftp.png'); width:16px;        height:16px; }
-.TFTPIcon { background-image: url('/static/images/ui/tree/tftp.png'); width:16px;        height:16px; }
-.LDAPIcon { background-image: url('/static/images/ui/tree/ldap.png'); width:16px;        height:16px; }
-.UPSIcon { background-image: url('/static/images/ui/tree/ups.png'); width:16px;        height:16px; }
-.StaticRoutesIcon { background-image: url('/static/images/ui/tree/static_routes.png'); width:16px;        height:16px; }
-.TopIcon { background-image: url('/static/images/ui/tree/display_system_processes.png'); width:16px;        height:16px; }
-.AdminAccountIcon { background-image: url('/static/images/ui/tree/nfs.png'); width:16px;        height:16px; }
-.ChangeAdminIcon { background-image: url('/static/images/ui/tree/change_admin_user.png'); width:16px;        height:16px; }
-.ChangePasswordIcon { background-image: url('/static/images/ui/tree/change_password.png'); width:16px;        height:16px; }
-.LogOutIcon { background-image: url('/static/images/ui/tree/logout.png'); width:16px;        height:16px; }
-.GroupsIcon { background-image: url('/static/images/ui/tree/groups.png'); width:16px;        height:16px; }
-.AddGroupIcon { background-image: url('/static/images/ui/tree/add_groups.png'); width:16px;        height:16px; }
-.GroupIcon { background-image: url('/static/images/ui/tree/group.png'); width:16px;        height:16px; }
-.ViewAllGroupsIcon { background-image: url('/static/images/ui/tree/view_all_groups.png'); width:16px;        height:16px; }
-.UsersIcon { background-image: url('/static/images/ui/tree/users.png'); width:16px;        height:16px; }
-.ViewAllUsersIcon { background-image: url('/static/images/ui/tree/view_all_users.png'); width:16px;        height:16px; }
-.AddUserIcon { background-image: url('/static/images/ui/tree/add_users.png'); width:16px;        height:16px; }
-.UserIcon { background-image: url('/static/images/ui/tree/user.png'); width:16px;        height:16px; }
-.ViewUsersIcon { background-image: url('/static/images/ui/tree/view_all_users.png'); width:16px;        height:16px; }
-.VolumesIcon { background-image: url('/static/images/ui/tree/volumes.png'); width:16px;        height:16px; }
-.AddVolumeIcon { background-image: url('/static/images/ui/tree/add_volume.png'); width:16px;        height:16px; }
-.ViewAllVolumesIcon { background-image: url('/static/images/ui/tree/view_all_volumes.png'); width:16px;        height:16px; }
-.AddVolumeIcon { background-image: url('/static/images/ui/tree/add_volume.png'); width:16px;        height:16px; }
-.AddShareIcon { background-image: url('/static/images/ui/tree/add_share.png'); width:16px;        height:16px; }
-.AFPIcon { background-image: url('/static/images/ui/tree/apple_shares.png'); width:16px;        height:16px; }
-.AppleShareIcon { background-image: url('/static/images/ui/tree/apple_shares.png'); width:16px;        height:16px; }
-.AddAppleShareIcon { background-image: url('/static/images/ui/tree/add_apple_share.png'); width:16px;        height:16px; }
-.ViewAllAppleSharesIcon { background-image: url('/static/images/ui/tree/view_all_apple_shares.png'); width:16px;        height:16px; }
-.CIFSIcon { background-image: url('/static/images/ui/tree/windows_shares.png'); width:16px;        height:16px; }
-.WindowsShareIcon { background-image: url('/static/images/ui/tree/windows_shares.png'); width:16px;        height:16px; }
-.AddWindowsShareIcon { background-image: url('/static/images/ui/tree/add_windows_share.png'); width:16px;        height:16px; }
-.ViewAllWindowsSharesIcon { background-image: url('/static/images/ui/tree/view_all_windows_shares.png'); width:16px;        height:16px; }
-.NFSIcon { background-image: url('/static/images/ui/tree/nfs.png'); width:16px;        height:16px; }
-.UNIXShareIcon { background-image: url('/static/images/ui/tree/nfs.png'); width:16px;        height:16px; }
-.AddUNIXShareIcon { background-image: url('/static/images/ui/tree/add_unix_share.png'); width:16px;        height:16px; }
-.ViewAllUNIXSharesIcon { background-image: url('/static/images/ui/tree/view_all_unix_shares.png'); width:16px;        height:16px; }
-.TargetExtentIcon { background-image: url('/static/images/ui/tree/target_extents.png'); width:16px;        height:16px; }
-.AddTargetExtentIcon { background-image: url('/static/images/ui/tree/add_target_extents.png'); width:16px;        height:16px; }
-.ViewAllTargetExtentsIcon { background-image: url('/static/images/ui/tree/view_all_target_extents.png'); width:16px;        height:16px; }
-.TargetIcon { background-image: url('/static/images/ui/tree/targets.png'); width:16px;        height:16px; }
-.AddTargetIcon { background-image: url('/static/images/ui/tree/add_target.png'); width:16px;        height:16px; }
-.ViewAllTargetsIcon { background-image: url('/static/images/ui/tree/view_all_targets.png'); width:16px;        height:16px; }
-.ExtentIcon { background-image: url('/static/images/ui/tree/extents.png'); width:16px;        height:16px; }
-.AddExtentIcon { background-image: url('/static/images/ui/tree/add_extents.png'); width:16px;        height:16px; }
-.ViewAllExtentsIcon { background-image: url('/static/images/ui/tree/view_all_extents.png'); width:16px;        height:16px; }
-.InitiatorIcon { background-image: url('/static/images/ui/tree/initiators.png'); width:16px;        height:16px; }
-.AddInitiatorIcon { background-image: url('/static/images/ui/tree/add_initiator.png'); width:16px;        height:16px; }
-.ViewAllInitiatorsIcon { background-image: url('/static/images/ui/tree/view_all_initiators.png'); width:16px;        height:16px; }
-.PortalIcon { background-image: url('/static/images/ui/tree/portals.png'); width:16px;        height:16px; }
-.AddPortalIcon { background-image: url('/static/images/ui/tree/add_portals.png'); width:16px;        height:16px; }
-.ViewAllPortalsIcon { background-image: url('/static/images/ui/tree/view_all_portals.png'); width:16px;        height:16px; }
-.AuthorizedAccessIcon { background-image: url('/static/images/ui/tree/authorized_access.png'); width:16px;        height:16px; }
-.AddAuthorizedAccessIcon { background-image: url('/static/images/ui/tree/add_authorized_access.png'); width:16px;        height:16px; }
-.ViewAllAuthorizedAccessIcon { background-image: url('/static/images/ui/tree/view_all_authorized_access.png'); width:16px;        height:16px; }
-.AddDatasetIcon { background-image: url('/static/images/ui/tree/add_dataset.png'); width:16px;        height:16px; }
-.AddZFSVolumeIcon { background-image: url('/static/images/ui/tree/add_zfs_volume.png'); width:16px;        height:16px; }
-.ImportVolumeIcon { background-image: url('/static/images/ui/tree/import_volume.png'); width:16px;        height:16px; }
-.ImportVolumeIcon { background-image: url('/static/images/ui/tree/import_volume.png'); width:16px;        height:16px; }
-.CreatePeriodicSnapIcon { background-image: url('/static/images/ui/tree/create_periodic_snapshot.png'); width:16px;        height:16px; }
-.ViewAllPeriodicSnapIcon { background-image: url('/static/images/ui/tree/view_all_periodic_snapshots.png'); width:16px;        height:16px; }
-.SnapIcon { background-image: url('/static/images/ui/tree/snapshots.png'); width:16px;        height:16px; }
-.AddReplIcon { background-image: url('/static/images/ui/tree/add_replication.png'); width:16px;        height:16px; }
-.ReplIcon { background-image: url('/static/images/ui/tree/replication.png'); width:16px;        height:16px; }
-.ViewAllReplIcon { background-image: url('/static/images/ui/tree/view_all_replication.png'); width:16px;        height:16px; }
-.cronJobIcon { background-image: url('/static/images/ui/tree/cron.png'); width:16px;        height:16px; }
-.AddcronJobIcon { background-image: url('/static/images/ui/tree/add_cron_job.png'); width:16px;        height:16px; }
-.ViewcronJobIcon { background-image: url('/static/images/ui/tree/view_cron_jobs.png'); width:16px;        height:16px; }
-.SMARTIcon { background-image: url('/static/images/ui/tree/smart.png'); width:16px;        height:16px; }
-.AddSMARTTestIcon { background-image: url('/static/images/ui/tree/add_smart_test.png'); width:16px;        height:16px; }
-.ViewSMARTTestIcon { background-image: url('/static/images/ui/tree/view_smart_tests.png'); width:16px;        height:16px; }
-.rsyncIcon { background-image: url('/static/images/ui/tree/rsync.png'); width:16px;        height:16px; }
-.rsyncdIcon { background-image: url('/static/images/ui/tree/settings.png'); width:16px;        height:16px; }
-.rsyncModIcon { background-image: url('/static/images/ui/tree/rsync_modules.png'); width:16px;        height:16px; }
-.AddrsyncTaskIcon { background-image: url('/static/images/ui/tree/add_rsync_task.png'); width:16px;        height:16px; }
-.ViewrsyncTaskIcon { background-image: url('/static/images/ui/tree/view_rsync_tasks.png'); width:16px;        height:16px; }
-.AddrsyncModIcon { background-image: url('/static/images/ui/tree/add_rsync_module.png'); width:16px;        height:16px; }
-.ViewAllrsyncModIcon { background-image: url('/static/images/ui/tree/view_rsync_modules.png'); width:16px;        height:16px; }
-
-.TunableIcon { background-image: url('/static/images/ui/tree/Tunable_16x16px.png'); width:16px; height:16px; }
-.NTPServerIcon { background-image: url('/static/images/ui/tree/NTP_Servers_16x16px.png'); width:16px; height:16px; }
-
+.SystemIcon {
+    background-image:url('/static/images/ui/tree/system.png');
+    width:16px;
+    height:16px;
+}
+.ReportingIcon {
+    background-image:url('/static/images/ui/tree/reporting.png');
+    width:16px;
+    height:16px;
+}
+.InfoIcon {
+    background-image:url('/static/images/ui/tree/system_information.png');
+    width:16px;
+    height:16px;
+}
+.SettingsIcon {
+    background-image:url('/static/images/ui/tree/settings.png');
+    width:16px;
+    height:16px;
+}
+.RebootIcon {
+    background-image:url('/static/images/ui/tree/reboot.png');
+    width:16px;
+    height:16px;
+}
+.ShutdownIcon {
+    background-image:url('/static/images/ui/tree/shutdown.png');
+    width:16px;
+    height:16px;
+}
+.AccountIcon {
+    background-image:url('/static/images/ui/tree/account.png');
+    width:16px;
+    height:16px;
+}
+.NetworkIcon {
+    background-image:url('/static/images/ui/tree/network.png');
+    width:16px;
+    height:16px;
+}
+.InterfacesIcon {
+    background-image:url('/static/images/ui/tree/interfaces.png');
+    width:16px;
+    height:16px;
+}
+.AddInterfaceIcon {
+    background-image:url('/static/images/ui/tree/add_interfaces.png');
+    width:16px;
+    height:16px;
+}
+.ViewAllInterfacesIcon {
+    background-image:url('/static/images/ui/tree/view_all_interfaces.png');
+    width:16px;
+    height:16px;
+}
+.VLANIcon {
+    background-image:url('/static/images/ui/tree/vlan.png');
+    width:16px;
+    height:16px;
+}
+.AddVLANIcon {
+    background-image:url('/static/images/ui/tree/add_vlan.png');
+    width:16px;
+    height:16px;
+}
+.ViewAllVLANsIcon {
+    background-image:url('/static/images/ui/tree/view_all_vlans.png');
+    width:16px;
+    height:16px;
+}
+.LAGGIcon {
+    background-image:url('/static/images/ui/tree/lagg.png');
+    width:16px;
+    height:16px;
+}
+.AddLAGGIcon {
+    background-image:url('/static/images/ui/tree/add_lagg.png');
+    width:16px;
+    height:16px;
+}
+.ViewAllLAGGsIcon {
+    background-image:url('/static/images/ui/tree/view_all_laggs.png');
+    width:16px;
+    height:16px;
+}
+.StaticRouteIcon {
+    background-image:url('/static/images/ui/tree/static_routes.png');
+    width:16px;
+    height:16px;
+}
+.AddStaticRouteIcon {
+    background-image:url('/static/images/ui/tree/add_static_route.png');
+    width:16px;
+    height:16px;
+}
+.ViewAllStaticRoutesIcon {
+    background-image:url('/static/images/ui/tree/view_all_static_routes.png');
+    width:16px;
+    height:16px;
+}
+.AddInterfaceIcon {
+    background-image:url('/static/images/ui/tree/add_interfaces.png');
+    width:16px;
+    height:16px;
+}
+.ViewAllInterfacesIcon {
+    background-image:url('/static/images/ui/tree/view_all_interfaces.png');
+    width:16px;
+    height:16px;
+}
+.StorageIcon {
+    background-image:url('/static/images/ui/tree/storage.png');
+    width:16px;
+    height:16px;
+}
+.SharingIcon {
+    background-image:url('/static/images/ui/tree/sharing.png');
+    width:16px;
+    height:16px;
+}
+.ServicesIcon {
+    background-image:url('/static/images/ui/tree/services.png');
+    width:16px;
+    height:16px;
+}
+.iSCSIIcon {
+    background-image:url('/static/images/ui/tree/iscsi.png');
+    width:16px;
+    height:16px;
+}
+.SNMPIcon {
+    background-image:url('/static/images/ui/tree/snmp.png');
+    width:16px;
+    height:16px;
+}
+.ActiveDirectoryIcon {
+    background-image:url('/static/images/ui/tree/active_directory.png');
+    width:16px;
+    height:16px;
+}
+.DDNSIcon {
+    background-image:url('/static/images/ui/tree/dynamic_dns.png');
+    width:16px;
+    height:16px;
+}
+.OpenSSHIcon {
+    background-image:url('/static/images/ui/tree/open_ssh.png');
+    width:16px;
+    height:16px;
+}
+.FTPIcon {
+    background-image:url('/static/images/ui/tree/ftp.png');
+    width:16px;
+    height:16px;
+}
+.TFTPIcon {
+    background-image:url('/static/images/ui/tree/tftp.png');
+    width:16px;
+    height:16px;
+}
+.LDAPIcon {
+    background-image:url('/static/images/ui/tree/ldap.png');
+    width:16px;
+    height:16px;
+}
+.UPSIcon {
+    background-image:url('/static/images/ui/tree/ups.png');
+    width:16px;
+    height:16px;
+}
+.StaticRoutesIcon {
+    background-image:url('/static/images/ui/tree/static_routes.png');
+    width:16px;
+    height:16px;
+}
+.TopIcon {
+    background-image:url('/static/images/ui/tree/display_system_processes.png');
+    width:16px;
+    height:16px;
+}
+.AdminAccountIcon {
+    background-image:url('/static/images/ui/tree/nfs.png');
+    width:16px;
+    height:16px;
+}
+.ChangeAdminIcon {
+    background-image:url('/static/images/ui/tree/change_admin_user.png');
+    width:16px;
+    height:16px;
+}
+.ChangePasswordIcon {
+    background-image:url('/static/images/ui/tree/change_password.png');
+    width:16px;
+    height:16px;
+}
+.LogOutIcon {
+    background-image:url('/static/images/ui/tree/logout.png');
+    width:16px;
+    height:16px;
+}
+.GroupsIcon {
+    background-image:url('/static/images/ui/tree/groups.png');
+    width:16px;
+    height:16px;
+}
+.AddGroupIcon {
+    background-image:url('/static/images/ui/tree/add_groups.png');
+    width:16px;
+    height:16px;
+}
+.GroupIcon {
+    background-image:url('/static/images/ui/tree/group.png');
+    width:16px;
+    height:16px;
+}
+.ViewAllGroupsIcon {
+    background-image:url('/static/images/ui/tree/view_all_groups.png');
+    width:16px;
+    height:16px;
+}
+.UsersIcon {
+    background-image:url('/static/images/ui/tree/users.png');
+    width:16px;
+    height:16px;
+}
+.ViewAllUsersIcon {
+    background-image:url('/static/images/ui/tree/view_all_users.png');
+    width:16px;
+    height:16px;
+}
+.AddUserIcon {
+    background-image:url('/static/images/ui/tree/add_users.png');
+    width:16px;
+    height:16px;
+}
+.UserIcon {
+    background-image:url('/static/images/ui/tree/user.png');
+    width:16px;
+    height:16px;
+}
+.ViewUsersIcon {
+    background-image:url('/static/images/ui/tree/view_all_users.png');
+    width:16px;
+    height:16px;
+}
+.VolumesIcon {
+    background-image:url('/static/images/ui/tree/volumes.png');
+    width:16px;
+    height:16px;
+}
+.AddVolumeIcon {
+    background-image:url('/static/images/ui/tree/add_volume.png');
+    width:16px;
+    height:16px;
+}
+.ViewAllVolumesIcon {
+    background-image:url('/static/images/ui/tree/view_all_volumes.png');
+    width:16px;
+    height:16px;
+}
+.AddVolumeIcon {
+    background-image:url('/static/images/ui/tree/add_volume.png');
+    width:16px;
+    height:16px;
+}
+.AddShareIcon {
+    background-image:url('/static/images/ui/tree/add_share.png');
+    width:16px;
+    height:16px;
+}
+.AFPIcon {
+    background-image:url('/static/images/ui/tree/apple_shares.png');
+    width:16px;
+    height:16px;
+}
+.AppleShareIcon {
+    background-image:url('/static/images/ui/tree/apple_shares.png');
+    width:16px;
+    height:16px;
+}
+.AddAppleShareIcon {
+    background-image:url('/static/images/ui/tree/add_apple_share.png');
+    width:16px;
+    height:16px;
+}
+.ViewAllAppleSharesIcon {
+    background-image:url('/static/images/ui/tree/view_all_apple_shares.png');
+    width:16px;
+    height:16px;
+}
+.CIFSIcon {
+    background-image:url('/static/images/ui/tree/windows_shares.png');
+    width:16px;
+    height:16px;
+}
+.WindowsShareIcon {
+    background-image:url('/static/images/ui/tree/windows_shares.png');
+    width:16px;
+    height:16px;
+}
+.AddWindowsShareIcon {
+    background-image:url('/static/images/ui/tree/add_windows_share.png');
+    width:16px;
+    height:16px;
+}
+.ViewAllWindowsSharesIcon {
+    background-image:url('/static/images/ui/tree/view_all_windows_shares.png');
+    width:16px;
+    height:16px;
+}
+.NFSIcon {
+    background-image:url('/static/images/ui/tree/nfs.png');
+    width:16px;
+    height:16px;
+}
+.UNIXShareIcon {
+    background-image:url('/static/images/ui/tree/nfs.png');
+    width:16px;
+    height:16px;
+}
+.AddUNIXShareIcon {
+    background-image:url('/static/images/ui/tree/add_unix_share.png');
+    width:16px;
+    height:16px;
+}
+.ViewAllUNIXSharesIcon {
+    background-image:url('/static/images/ui/tree/view_all_unix_shares.png');
+    width:16px;
+    height:16px;
+}
+.TargetExtentIcon {
+    background-image:url('/static/images/ui/tree/target_extents.png');
+    width:16px;
+    height:16px;
+}
+.AddTargetExtentIcon {
+    background-image:url('/static/images/ui/tree/add_target_extents.png');
+    width:16px;
+    height:16px;
+}
+.ViewAllTargetExtentsIcon {
+    background-image:url('/static/images/ui/tree/view_all_target_extents.png');
+    width:16px;
+    height:16px;
+}
+.TargetIcon {
+    background-image:url('/static/images/ui/tree/targets.png');
+    width:16px;
+    height:16px;
+}
+.AddTargetIcon {
+    background-image:url('/static/images/ui/tree/add_target.png');
+    width:16px;
+    height:16px;
+}
+.ViewAllTargetsIcon {
+    background-image:url('/static/images/ui/tree/view_all_targets.png');
+    width:16px;
+    height:16px;
+}
+.ExtentIcon {
+    background-image:url('/static/images/ui/tree/extents.png');
+    width:16px;
+    height:16px;
+}
+.AddExtentIcon {
+    background-image:url('/static/images/ui/tree/add_extents.png');
+    width:16px;
+    height:16px;
+}
+.ViewAllExtentsIcon {
+    background-image:url('/static/images/ui/tree/view_all_extents.png');
+    width:16px;
+    height:16px;
+}
+.InitiatorIcon {
+    background-image:url('/static/images/ui/tree/initiators.png');
+    width:16px;
+    height:16px;
+}
+.AddInitiatorIcon {
+    background-image:url('/static/images/ui/tree/add_initiator.png');
+    width:16px;
+    height:16px;
+}
+.ViewAllInitiatorsIcon {
+    background-image:url('/static/images/ui/tree/view_all_initiators.png');
+    width:16px;
+    height:16px;
+}
+.PortalIcon {
+    background-image:url('/static/images/ui/tree/portals.png');
+    width:16px;
+    height:16px;
+}
+.AddPortalIcon {
+    background-image:url('/static/images/ui/tree/add_portals.png');
+    width:16px;
+    height:16px;
+}
+.ViewAllPortalsIcon {
+    background-image:url('/static/images/ui/tree/view_all_portals.png');
+    width:16px;
+    height:16px;
+}
+.AuthorizedAccessIcon {
+    background-image:url('/static/images/ui/tree/authorized_access.png');
+    width:16px;
+    height:16px;
+}
+.AddAuthorizedAccessIcon {
+    background-image:url('/static/images/ui/tree/add_authorized_access.png');
+    width:16px;
+    height:16px;
+}
+.ViewAllAuthorizedAccessIcon {
+    background-image:url('/static/images/ui/tree/view_all_authorized_access.png');
+    width:16px;
+    height:16px;
+}
+.AddDatasetIcon {
+    background-image:url('/static/images/ui/tree/add_dataset.png');
+    width:16px;
+    height:16px;
+}
+.AddZFSVolumeIcon {
+    background-image:url('/static/images/ui/tree/add_zfs_volume.png');
+    width:16px;
+    height:16px;
+}
+.ImportVolumeIcon {
+    background-image:url('/static/images/ui/tree/import_volume.png');
+    width:16px;
+    height:16px;
+}
+.ImportVolumeIcon {
+    background-image:url('/static/images/ui/tree/import_volume.png');
+    width:16px;
+    height:16px;
+}
+.CreatePeriodicSnapIcon {
+    background-image:url('/static/images/ui/tree/create_periodic_snapshot.png');
+    width:16px;
+    height:16px;
+}
+.ViewAllPeriodicSnapIcon {
+    background-image:url('/static/images/ui/tree/view_all_periodic_snapshots.png');
+    width:16px;
+    height:16px;
+}
+.SnapIcon {
+    background-image:url('/static/images/ui/tree/snapshots.png');
+    width:16px;
+    height:16px;
+}
+.AddReplIcon {
+    background-image:url('/static/images/ui/tree/add_replication.png');
+    width:16px;
+    height:16px;
+}
+.ReplIcon {
+    background-image:url('/static/images/ui/tree/replication.png');
+    width:16px;
+    height:16px;
+}
+.ViewAllReplIcon {
+    background-image:url('/static/images/ui/tree/view_all_replication.png');
+    width:16px;
+    height:16px;
+}
+.cronJobIcon {
+    background-image:url('/static/images/ui/tree/cron.png');
+    width:16px;
+    height:16px;
+}
+.AddcronJobIcon {
+    background-image:url('/static/images/ui/tree/add_cron_job.png');
+    width:16px;
+    height:16px;
+}
+.ViewcronJobIcon {
+    background-image:url('/static/images/ui/tree/view_cron_jobs.png');
+    width:16px;
+    height:16px;
+}
+.SMARTIcon {
+    background-image:url('/static/images/ui/tree/smart.png');
+    width:16px;
+    height:16px;
+}
+.AddSMARTTestIcon {
+    background-image:url('/static/images/ui/tree/add_smart_test.png');
+    width:16px;
+    height:16px;
+}
+.ViewSMARTTestIcon {
+    background-image:url('/static/images/ui/tree/view_smart_tests.png');
+    width:16px;
+    height:16px;
+}
+.rsyncIcon {
+    background-image:url('/static/images/ui/tree/rsync.png');
+    width:16px;
+    height:16px;
+}
+.rsyncdIcon {
+    background-image:url('/static/images/ui/tree/settings.png');
+    width:16px;
+    height:16px;
+}
+.rsyncModIcon {
+    background-image:url('/static/images/ui/tree/rsync_modules.png');
+    width:16px;
+    height:16px;
+}
+.AddrsyncTaskIcon {
+    background-image:url('/static/images/ui/tree/add_rsync_task.png');
+    width:16px;
+    height:16px;
+}
+.ViewrsyncTaskIcon {
+    background-image:url('/static/images/ui/tree/view_rsync_tasks.png');
+    width:16px;
+    height:16px;
+}
+.AddrsyncModIcon {
+    background-image:url('/static/images/ui/tree/add_rsync_module.png');
+    width:16px;
+    height:16px;
+}
+.ViewAllrsyncModIcon {
+    background-image:url('/static/images/ui/tree/view_rsync_modules.png');
+    width:16px;
+    height:16px;
+}
+.TunableIcon {
+    background-image:url('/static/images/ui/tree/Tunable_16x16px.png');
+    width:16px;
+    height:16px;
+}
+.NTPServerIcon {
+    background-image:url('/static/images/ui/tree/NTP_Servers_16x16px.png');
+    width:16px;
+    height:16px;
+}
 .dijitTextArea {
-min-height:60px;
+    min-height:60px;
 }
 .claro .dijitDialogTitleBar {
-    -moz-border-bottom-colors: none;
-    -moz-border-image: none;
-    -moz-border-left-colors: none;
-    -moz-border-right-colors: none;
-    -moz-border-top-colors: none;
-    background-color: #242424;
-    background-image: url("../images/titlebar.png");
-    background-position: -100px 100%;
-    background-repeat: repeat-x;
-    border-color: -moz-use-text-color #373535 #373535;
-    border-right: 1px solid #373535;
-    border-style: none solid solid;
-    border-width: medium 1px 1px;
-    padding: 5px 7px 4px;
+    -moz-border-bottom-colors:none;
+    -moz-border-image:none;
+    -moz-border-left-colors:none;
+    -moz-border-right-colors:none;
+    -moz-border-top-colors:none;
+    background-color:#242424;
+    background-image:url("../images/titlebar.png");
+    background-position:-100px 100%;
+    background-repeat:repeat-x;
+    border-color:-moz-use-text-color #373535 #373535;
+    border-right:1px solid #373535;
+    border-style:none solid solid;
+    border-width:medium 1px 1px;
+    padding:5px 7px 4px;
 }
 .claro .dijitDialogTitle {
-    font-size: 1.091em;
-    padding: 0 1px;
+    font-size:1.091em;
+    padding:0 1px;
 }
 .claro .dijitDialogTitle {
-     color: #FAFAFA;
-     font-size: 1.091em;
-     font-weight: bold;
-     padding: 0 2px;
-     text-shadow: 0 -1px 1px #000000;
- }
+    color:#FAFAFA;
+    font-size:1.091em;
+    font-weight:bold;
+    padding:0 2px;
+    text-shadow:0 -1px 1px #000000;
+}
 .claro .dijitDialog {
-    border: 1px solid #373535;
-    box-shadow: 0 1px 5px #383838;
+    border:1px solid #373535;
+    box-shadow:0 1px 5px #383838;
 }
-.claro .dijitDialogUnderlay { background: none repeat scroll 0 0 #1D1D1D; }
+.claro .dijitDialogUnderlay {
+    background:none repeat scroll 0 0 #1D1D1D;
+}
 .mytoggle {
-margin:2px;
-padding:2px;
+    margin:2px;
+    padding:2px;
 }
-
 .mytoggleChecked {
-background-color: #ddd;
+    background-color:#ddd;
 }
-
 .treecontainer:hover {
-background:white;
+    background:white;
 }
-
 .treecontainer div {
-padding-left:5px;
+    padding-left:5px;
 }
 #alert_status_text p {
     margin-top:20px !important;
     margin-right:20px !important;
     text-align:center;
-    padding-right: !important;
+    padding-right:!important;
 }
 .alert_ok {
-    background: url("/static/images/ui/alerts/ok.png") no-repeat 0 0 transparent !important;
+    background:url("/static/images/ui/alerts/ok.png") no-repeat 0 0 transparent !important;
     width:25px;
     height:25px;
-    padding: 0;
-    margin: 0 auto;
+    padding:0;
+    margin:0 auto;
     margin-bottom:3px;
     border:none !important;
-
 }
 .alert_warn {
-    background: url("/static/images/ui/alerts/warn.gif") no-repeat 0 0 transparent !important;
+    background:url("/static/images/ui/alerts/warn.gif") no-repeat 0 0 transparent !important;
     width:25px;
     height:25px;
-    padding: 0 !important;
-    margin: 0 auto;
+    padding:0 !important;
+    margin:0 auto;
     margin-bottom:3px;
     border:none !important;
-
 }
 .alert_crit {
-    background: url("/static/images/ui/alerts/crit.gif") no-repeat 0 0 transparent !important;
+    background:url("/static/images/ui/alerts/crit.gif") no-repeat 0 0 transparent !important;
     width:25px;
     height:25px;
-    padding: 0 !important;
-    margin: 0 auto;
+    padding:0 !important;
+    margin:0 auto;
     margin-bottom:3px;
     border:none !important;
-
 }
-
-span.shell_f0 { color: #000000; }
-span.shell_f1 { color: #c00006; }
-span.shell_f2 { color: #1bc806; }
-span.shell_f3 { color: #c3c609; }
-span.shell_f4 { color: #0000c2; }
-span.shell_f5 { color: #bf00c2; }
-span.shell_f6 { color: #19c4c2; }
-span.shell_f7 { color: #f2f2f2; }
-span.shell_fc { color: transparent; } /* Concealed */
-span.shell_fe { color: #000000; }     /* Negative fg */
-span.shell_ff { color: #ffffff; }     /* Default fg */
-
-span.shell_b0 { background-color: #000000; }
-span.shell_b1 { background-color: #cc2300; }
-span.shell_b2 { background-color: #00cc00; }
-span.shell_b3 { background-color: #cccc00; }
-span.shell_b4 { background-color: #0e2acc; }
-span.shell_b5 { background-color: #cc34cc; }
-span.shell_b6 { background-color: #00cccc; }
-span.shell_b7 { background-color: #f5f5f5; }
-span.shell_bc { background-color: #555555; }      /* Cursor */
-span.shell_be { background-color: transparent; }  /* Default bg */
-span.shell_bf { background-color: #ffffff; }      /* Negative bg */
-
-#interLayout {
-width:272px; height:100%;
+span.shell_f0 {
+    color:#000000;
 }
-
-#outerLayout {
-width:100%; height:100%;
+span.shell_f1 {
+    color:#c00006;
 }
-
-#topLayout {
-height:125px;overflow:hidden;
+span.shell_f2 {
+    color:#1bc806;
 }
-
-#footer {
-width:100%;
+span.shell_f3 {
+    color:#c3c609;
 }
-
-#footerPane {
-color:#ccc;margin-left:10px;margin-top:35px;width:225px;overflow:hidden;
+span.shell_f4 {
+    color:#0000c2;
 }
-
-#footerLayout {
-height:80px;
-width:100%;
-padding-bottom:0px;
+span.shell_f5 {
+    color:#bf00c2;
 }
-
-#footerLogo {
-width:125px;overflow:hidden;
+span.shell_f6 {
+    color:#19c4c2;
 }
-
-#footerLogo img {
-padding-right:10px;
+span.shell_f7 {
+    color:#f2f2f2;
 }
-
-#footerMessages {
-margin-left:auto;margin-right:auto;display:block;width:80%;overflow:hidden;
+span.shell_fc {
+    color: transparent;
 }
-
+/* Concealed */
+span.shell_fe {
+    color: #000000;
+}
+/* Negative fg */
+span.shell_ff {
+    color: #ffffff;
+}
+/* Default fg */
+span.shell_b0 {
+    background-color:#000000;
+}
+span.shell_b1 {
+    background-color:#cc2300;
+}
+span.shell_b2 {
+    background-color:#00cc00;
+}
+span.shell_b3 {
+    background-color:#cccc00;
+}
+span.shell_b4 {
+    background-color:#0e2acc;
+}
+span.shell_b5 {
+    background-color:#cc34cc;
+}
+span.shell_b6 {
+    background-color:#00cccc;
+}
+span.shell_b7 {
+    background-color:#f5f5f5;
+}
+span.shell_bc {
+    background-color: #555555;
+}
+/* Cursor */
+span.shell_be {
+    background-color: transparent;
+}
+/* Default bg */
+span.shell_bf {
+    background-color: #ffffff;
+}
+/* Negative bg */
 #msg_output {
-display: none;
+    display:none;
 }
-
 #navMenu {
-position:relative;
+    position:relative;
 }
-
 #messages {
-position:absolute;left: 400px; min-width:250px;opacity:0.6;
+    position:absolute;
+    left:400px;
+    min-width:250px;
+    opacity:0.6;
 }
-
-.clear {
-clear: both;
-}
-
-.left {
-float: left;
-}
-
-.right {
-float: right;
-}
-
 label[for=stopmsgrefresh] {
-color:white;
+    color: white;
 }

Deleted: branches/8.2-nup/gui/freeadmin/static/css/freenas.css
===================================================================
--- branches/8.2-nup/gui/freeadmin/static/css/freenas.css	2012-03-14 19:15:27 UTC (rev 10671)
+++ branches/8.2-nup/gui/freeadmin/static/css/freenas.css	2012-03-14 19:16:42 UTC (rev 10672)
@@ -1,31 +0,0 @@
-/*
- * global CSS
- */
-
-/* readmore button */
-p.readmore { overflow: hidden; }
-div.module p.readmore {	margin-bottom: 0px; }
-
-#page a.readmore {
-	display: block;
-	width: 100px;
-	height: 20px;
-	background: transparent url(../images/readmore.png) 0 0
-no-repeat;
-	float: left;
-	line-height: 20px;
-	text-indent: 10px;
-	font-size: 90%;
-	text-decoration: none;
-	text-shadow: 0px -1px 1px #ffffff, 0px 2px 2px #b4b4b4;
-}
-
-#page a.readmore:link,
-#page a.readmore:visited { color: #505050; }
-
-#page a.readmore:hover {
-	background: transparent url(../images/readmore.png) 0 -25px
-no-repeat;
-	color: #000000;
-	text-shadow: 0px 1px 1px #ffffff, 0px 2px 2px #969696;
-}

Modified: branches/8.2-nup/gui/freeadmin/static/css/layout.css
===================================================================
--- branches/8.2-nup/gui/freeadmin/static/css/layout.css	2012-03-14 19:15:27 UTC (rev 10671)
+++ branches/8.2-nup/gui/freeadmin/static/css/layout.css	2012-03-14 19:16:42 UTC (rev 10672)
@@ -1,10 +1,8 @@
-body.iXpage { background:#eceff0;}
-#page-header { height:72px;background: #464C53 url("../images/headerbg.png") repeat-x;}
-#footer { 
-    height:80px;
-    background: #464C53 url("../images/footerbg.png") repeat-x; 
-} 
+* {
+    outline: none !important;
+}
 
+
 /*Opera Fix*/
 body:before {
 	content:"";
@@ -14,12 +12,40 @@
 	margin-top:-32767px;/
 }
 body, html { overflow:hidden; width:100%; height:100%; margin:0; padding:0; }
-#main {overflow:auto;
-        padding-bottom: 150px;}  /* must be same height as the footer */
 
+#page-header {
+    height:72px;
+    background: #464C53 url("../images/headerbg.png") repeat-x;
+}
+#footer {
+    height:80px;
+    background: #464C53 url("../images/footerbg.png") repeat-x;
+}
 
-#wrap {min-height: 100%;}
+#fntree, #menupane {
+     width:272px;
+     background-color:white;
+}
 
+#menupane {
+     border-right:1px solid #ccc;
+     margin-top:6px;
+     border-top:1px solid #ccc;
+     margin-left:5px;
+     border-left:1px solid #ccc;
+     margin-bottom:6px;
+     border-bottom:1px solid #ccc;
+}
+
+#main {
+    overflow:auto;
+    padding-bottom: 150px;
+}  /* must be same height as the footer */
+
+#wrap {
+    min-height: 100%;
+}
+
 #toolbar {
 	height: 30px;
 	padding-right: 140px;
@@ -29,25 +55,73 @@
 	color: #ffffff;
 }
 
-#menu {	
+#menu {
     position:relative;
     width:100%;
     border:0 !important;
     margin:0 0 0 0;
     padding:0;
+}
 
+#interLayout {
+    width:272px;
+    height:100%;
 }
-.selector { width: 600px; float:left; }
 
-.select-available { width:45%; float:left; }
-.select-available select { width:100%; }
-.select-options { text-align:center;width:5%;position:relative;top:-26px;float:left; }
-.select-selected { width:45%; float:left; }
-.select-selected select { width:100%; }
-#fntree,#menupane { width:272px; background-color:white;}
-#menupane { border-right:1px solid #ccc; margin-top:6px;border-top:1px solid #ccc;margin-left:5px;border-left:1px solid #ccc;margin-bottom:6px;border-bottom:1px solid #ccc;}
-.nohover {
-background-image: none;
-background-color: none;
-border: none;
+#outerLayout {
+    width:100%;
+    height:100%;
 }
+
+#topLayout {
+    height:125px;
+    overflow:hidden;
+}
+
+#footer {
+    width:100%;
+}
+
+#footerPane {
+    color:#ccc;
+    margin-left:10px;
+    margin-top:35px;
+    width:225px;
+    overflow:hidden;
+}
+
+#footerLayout {
+    height:80px;
+    width:100%;
+    padding-bottom:0px;
+}
+
+#footerLogo {
+    width:125px;
+    overflow:hidden;
+}
+
+#footerLogo img {
+    padding-right:10px;
+}
+
+#footerMessages {
+    margin-left:auto;
+    margin-right:auto;
+    display:block;
+    width:80%;
+    overflow:hidden;
+}
+
+.clear {
+    clear: both;
+}
+
+.left {
+    float: left;
+}
+
+.right {
+    float: right;
+}
+

Modified: branches/8.2-nup/gui/freeadmin/static/css/reset.css
===================================================================
--- branches/8.2-nup/gui/freeadmin/static/css/reset.css	2012-03-14 19:15:27 UTC (rev 10671)
+++ branches/8.2-nup/gui/freeadmin/static/css/reset.css	2012-03-14 19:16:42 UTC (rev 10672)
@@ -1,17 +1,5 @@
-.wrapper800 {
-   width:1000px;
-   position:relative;
-        }
-#cronjob ul {
-    padding-left:0px;
-    margin:0 0 0 0;
-    line-height:12px;
-    list-style-type: none;
-    }
-
- 
 body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,textarea,p,blockquote,th,td {
-	margin: 0; 
+	margin: 0;
 	padding: 0;
 }
 
@@ -21,11 +9,8 @@
 
 fieldset, img { border: 0; }
 
- 
 a:focus { outline: none; }
 
- 
-body { overflow-y: scroll; }
 
 /*
  * default values
@@ -36,7 +21,6 @@
 	padding-bottom: 8px;
 }
 
- 
 ul, ol, dl {
 	margin: 10px 0;
 	padding-left: 30px
@@ -45,75 +29,18 @@
 dl { margin: 10px 0; }
 dd { padding-left: 40px; }
 
- 
 td, th { padding: 1px; }
 
 a:link, a:visited { text-decoration: none; }
 a:hover { text-decoration: none; }
 
- 
 fieldset {
 	margin: 10px 0 10px 0;
 	padding: 0 10px 10px 10px;
 	border: 1px solid #c8c8c8;
 }
 
-legend {
-	padding: 0 10px 0 10px;
-	background: #ffffff;
-}
 
-
-textarea { padding: 1px 0 1px 5px; }
-
-option { padding: 0 0 1px 5px; }
-
-input[type='hidden'] { display: none; }
-
-input[type='text'],
-input[type='password'] { padding: 1px 0 1px 5px; }
-
-button,
-input[type='button'],
-input[type='submit'] {
-	padding: 2px 4px 2px 1px;
-	line-height: 100%;
-}
-
-input[type='button'],
-input[type='submit'],
-input[type='checkbox'],
-input[type='image'],
-input[type='radio'],
-input[type='reset'],
-select,
-button { cursor: pointer; }
-
- 
-textarea,
-input[type='text'],
-input[type='password'],
-select {
-	border: 1px solid #c8c8c8;
-	background: #ffffff;
-}
-
- 
-textarea:hover,
-input[type='text']:hover,
-input[type='password']:hover,
-select:hover { border-color: #aaaaaa; }
-
- 
-textarea:focus,
-input[type='text']:focus,
-input[type='password']:focus,
-select:focus {
-	border-color: #8c8c8c;
-	outline: 2px solid #dcdcdc;
-}
-
- 
 h1, h2, h3, h4, h5, h6 {
 	margin-bottom: 10px;
 	font-weight: normal;
@@ -126,7 +53,6 @@
 h5 { font-size: 14px; line-height: 18px; margin-top: 12px; }
 h6 { font-size: 10px; line-height: 10px; margin-top: 10px; }
 
- 
 hr {
 	margin: 15px 0 15px 0;
 	display: block;
@@ -135,17 +61,6 @@
 	border: none;
 }
 
- 
-q { font-style: italic; }
-
-blockquote {
-	margin: 10px 0 10px 15px;
-	font-style: italic;
-	font-size: 130%
-}
-blockquote > *:first-child:first-letter { font-size: 150% }
-
- 
 pre.ix {
 	margin: 10px 0 10px 0px;
     background:#000000;
@@ -156,11 +71,3 @@
 	white-space: pre-wrap;
     width:600px;
 }
-
- 
-acronym, abbr {
-	border-bottom: 1px dashed #969696;
-	cursor: help;
-	font-variant: small-caps;
-	text-transform: lowercase;
-}

Modified: branches/8.2-nup/gui/freeadmin/static/css/template.css
===================================================================
--- branches/8.2-nup/gui/freeadmin/static/css/template.css	2012-03-14 19:15:27 UTC (rev 10671)
+++ branches/8.2-nup/gui/freeadmin/static/css/template.css	2012-03-14 19:16:42 UTC (rev 10672)
@@ -1,5 +1,3 @@
 @import url(reset.css);
 @import url(custom.css);
 @import url(layout.css);
-@... url(typography.css);
-@... url(freenas.css);

Deleted: branches/8.2-nup/gui/freeadmin/static/css/typography.css
===================================================================
--- branches/8.2-nup/gui/freeadmin/static/css/typography.css	2012-03-14 19:15:27 UTC (rev 10671)
+++ branches/8.2-nup/gui/freeadmin/static/css/typography.css	2012-03-14 19:16:42 UTC (rev 10672)
@@ -1,342 +0,0 @@
-/*
- * headings
- */
-
-h1, h2, h3, h4, h5, h6 { font-family: Arial, Helvetica, sans-serif; }
-
-#top h1, .joomla h1,
-#top h2, .joomla h2,
-#top h3, .joomla h3 {
-	text-shadow: 0px 1px 0px #ffffff, 0px -1px 3px #bebebe;
-}
-
-h1 {
-	font-weight: normal;
-	color: #50575F;
-}
-
-#page h1 a {
-	color: #50575F;
-	text-decoration: none;
-}
-
-h2 { color: #5C7990; }
-h3 { color: #50575F; }
-h4 { color: #5C7990; }
-h5 { color: #50575F; }
-h6 { color: #5C7990; }
-
-/*
- * anchor
- */
-
-a:link,
-a:visited { color: #396f9d; }
-a:hover { color: #ed5d00; }
-
-#headerbar a:link,
-#headerbar a:visited,
-div.mod-rider-templatecolor a:link,
-div.mod-rider-templatecolor a:visited,
-div.mod-rider-templatecolor2 a:link,
-div.mod-rider-templatecolor2 a:visited,
-div.mod-rounded-templatecolor a:link,
-div.mod-rounded-templatecolor a:visited,
-div.mod-rounded-black a:link,
-div.mod-rounded-black a:visited { color: #ffffff; text-decoration: underline; }
-
-#headerbar a:hover,
-div.mod-rider-templatecolor a:hover,
-div.mod-rider-templatecolor2 a:hover,
-div.mod-rounded-templatecolor a:hover,
-div.mod-rounded-black a:hover { color: #ed5d00; }
-
-a.icon-folder {
-        padding-left: 17px;
-        background: url() 0 40% no-repeat;
-}
-
-a.icon-file {
-        padding-left: 17px;
-        background: url() 0 40% no-repeat;
-}
-
-a.icon-download {
-        padding-left: 17px;
-        background: url() 0 40% no-repeat;
-}
-
-a.icon-external {
-        padding-left: 17px;
-        background: url() 0 40% no-repeat;
-}
-
-a.icon-pdf {
-        padding-left: 17px;
-        background: url() 0 40% no-repeat;
-}
-
-/*
- * emphasis
- */
-
-em.box { 
-	padding: 0px 3px 0px 3px;
-	border: 1px dotted #aaaaaa;
-	background: #f5f6f7;
-	font-family: "Courier New", Courier, monospace;
-	font-style: normal;
-}
-
-/*
- * unsorted lists
- */
-
-/* icon style */
-
-ul.arrow,
-ul.checkbox,
-ul.check,
-ul.star {
-	margin: 10px 0px 10px 0px;
-	padding-left: 20px;
-	list-style: none;
-}
-
-ul.arrow li,
-ul.checkbox li,
-ul.check li,
-ul.star li {
-	margin: 5px 0px 5px 0px;
-	padding-left: 35px;
-	font-weight: bold;
-	line-height: 26px;  
-}
-
-ul.arrow li { background: url() 0 0 no-repeat; }
-ul.checkbox li { background: url() 0 0 no-repeat; }
-ul.check li { background: url() 0 0 no-repeat; }
-ul.star li { background: url() 0 0 no-repeat; }
-
-
-
-/* small icon style */
-
-ul.arrow-s,
-ul.checkbox-s,
-ul.check-s,
-ul.star-s {
-	margin: 5px 0px 5px 0px;
-	padding-left: 10px;
-	list-style: none;
-}
-
-ul.arrow-s li,
-ul.checkbox-s li,
-ul.check-s li,
-ul.star-s li {
-	margin: 2px 0px 2px 0px;
-	padding-left: 20px;
-	line-height: 20px;  
-}
-
-ul.arrow-s li { background: url() 0 0 no-repeat; }
-ul.checkbox-s li { background: url() 0 0 no-repeat; }
-ul.check-s li { background: url() 0 0 no-repeat; }
-ul.star-s li { background: url() 0 0 no-repeat; }
-
-
-
-
-
-
-/* table style */
-ul.table {
-	margin: 20px 0px 20px 0px;
-	padding-left: 0px;
-	list-style: none;
-}
-
-ul.table li {
-	padding: 5px;
-	border-bottom: 1px solid #c8c8c8;
-}
-
-ul.table li:nth-child(odd) { background: #fafafa; }
-ul.table li:nth-child(even) { background: #ffffff; }
-ul.table li:last-child { border: none; }
-
-/*
- * ordered lists
- */
-
-ol.disc {
-	margin: 10px 0px 10px 0px;
-	padding: 0px 0px 0px 45px;
-	background: url() 20px 0px repeat-y;
-}
-
-ol.disc li {
-	margin: 5px 0px 5px 0px;
-	padding-left: 10px;
-	font-weight: bold;
-	line-height: 26px;  
-}
-
-/*
- * horizontal rule
- */
- 
-hr.dotted {
-	margin: 15px 0px 15px 0px;
-	display: block;
-	background: url() 0 0 repeat-x;
-	height: 1px;
-	border: none;
-}
-
-
-/*
- * highlighted div and span tags
- */
-
-span.note,
-span.info,
-span.alert,
-span.download,
-span.tip { display: block; }
-
-div.note, span.note {
-	margin: 10px 0px 10px 0px;
-	padding: 5px 10px 5px 10px;
-	background: #ffffff;
-	border-top: 1px dotted #aab4be;
-	border-bottom: 1px dotted #aab4be;
-	text-align:justify;
-}
-
-div.info, span.info,
-div.alert, span.alert,
-div.download, span.download,
-div.tip, span.tip {
-	margin: 10px 0px 10px 0px;
-	padding: 8px 10px 8px 35px;
-}
-
-div.info, span.info {
-	background: #ffffff url() 3px no-repeat;
-	border-top: 1px dotted #aab4be;
-	border-bottom: 1px dotted #aab4be;
-}
-
-div.alert, span.alert {
-	background: #fff5eb url() 3px no-repeat;
-	border-top: 1px dotted #ffb4a0;
-	border-bottom: 1px dotted #ffb4a0;
-}
-
-div.download, span.download {
-	background: #f5faeb url() 3px  no-repeat;
-	border-top: 1px dotted #78be5a;
-	border-bottom: 1px dotted #78be5a;
-}
-
-div.tip, span.tip {
-	background: #fffdeb url() 3px no-repeat;
-	border-top: 1px dotted #ffc864;
-	border-bottom: 1px dotted #ffc864;
-}
-
-/*
- * p tag with dropcaps
- */
- 
-p.dropcap:first-letter {
-	display: block;
-	margin: 7px 4px 0px 0px;
-	float: left;
-	font-size: 280%;
-	font-family: Georgia, "Times New Roman", Times, serif;
-}
-
-/*
- * tables
- */
- 
-table.listing {
-	width: 100%;
-	margin-bottom: 30px;
-	font-size: 11px;
-}
-
-table.listing thead th {
-	height: 30px;
-	padding: 5px;
-	border-bottom: 1px solid #c8c8c8;
-	background: none;
-	vertical-align: top;
-	font-size: 14px;
-	font-weight: normal;
-}
-
-table.listing tbody td {
-	height: 20px;
-	padding: 5px;
-	border-bottom: 1px solid #c8c8c8;
-}
-
-table.listing tr.odd td { background: #fafafa; }
-table.listing tr.even td { background: #ffffff; }
-
-table.listing td.bold {
-	font-weight: bold;
-	font-size: 12px;
-}
-
-/*
- * blockquotes
- */
-
-q.blockquote {
-	margin: 10px 0 10px 15px;
-	font-style: italic;
-	font-size: 130%;
-}
-
-q.blockquote:first-letter { font-size: 150%; }
-
-q.blockquote:before,
-q.blockquote:after { content: ""; }
-
-blockquote.quotation {
-	margin: 10px 0px 10px 0px;
-	padding: 10px 35px 10px 35px;
-	border: none;
-	background: url() 0 0 no-repeat;
-	text-align:justify;
-}
-
-blockquote.quotation p {
-	margin: 0px -35px -10px 0px;
-	padding: 0px 35px 10px 0px;
-	background: url() 100% 100% no-repeat;
-}
-
-/*
- * floating boxes
- */
-
-body .inset-left {
-	margin: 15px 15px 10px 0px;
-	float: left;
-}
-
-body .inset-right {
-	margin: 15px 0px 10px 15px;
-	float: right;
-}
-
-/*
- * preformatted text elements
- */
-pre { background: #ffffff; }

Copied: branches/8.2-nup/patches/ports-py-polib.patch (from rev 10666, trunk/patches/ports-py-polib.patch)
===================================================================
--- branches/8.2-nup/patches/ports-py-polib.patch	                        (rev 0)
+++ branches/8.2-nup/patches/ports-py-polib.patch	2012-03-14 19:16:42 UTC (rev 10672)
@@ -0,0 +1,21 @@
+--- devel/py-polib/Makefile	17 Aug 2009 08:10:35 -0000	1.6
++++ devel/py-polib/Makefile	14 Mar 2012 09:45:59 -0000
+@@ -6,9 +6,9 @@
+ #
+ 
+ PORTNAME=	polib
+-PORTVERSION=	0.4.1
++PORTVERSION=	0.7.0
+ CATEGORIES=	devel python
+-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
++MASTER_SITES=	http://cdn.bitbucket.org/izi/polib/downloads/
+ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+ 
+ MAINTAINER=	yzlin@...
+--- devel/py-polib/distinfo	3 Jul 2011 14:58:45 -0000	1.4
++++ devel/py-polib/distinfo	14 Mar 2012 09:46:04 -0000
+@@ -1,2 +1,2 @@
+-SHA256 (polib-0.4.1.tar.gz) = 37513d2edbb1f5da85df9daa27ffc16c0e15a7c49283990fbf15cb378e8e8d78
+-SIZE (polib-0.4.1.tar.gz) = 211914
++SHA256 (polib-0.7.0.tar.gz) = d9184d7454c650f5a26db54e70da8a50c51dcc6873af65277708ab9c6cf5c449
++SIZE (polib-0.7.0.tar.gz) = 149614

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Freenas-commit] SF.net SVN: freenas:[10682] branches/8.2-nup

From: <yaberauneya@us...> - 2012-03-15 09:50

Revision: 10682
          http://freenas.svn.sourceforge.net/freenas/?rev=10682&view=rev
Author:   yaberauneya
Date:     2012-03-15 09:50:14 +0000 (Thu, 15 Mar 2012)
Log Message:
-----------
Merge changes from trunk in preparation for collapse

Modified Paths:
--------------
    branches/8.2-nup/gui/locale/cs/LC_MESSAGES/django.po
    branches/8.2-nup/gui/locale/cs/LC_MESSAGES/djangojs.po
    branches/8.2-nup/gui/locale/tr/LC_MESSAGES/django.po
    branches/8.2-nup/gui/services/forms.py
    branches/8.2-nup/gui/services/migrations/0005_auto__add_iscsitargetauthorizedinitiator__add_iscsitargetextent__add_i.py
    branches/8.2-nup/gui/services/models.py
    branches/8.2-nup/src/autotune/files/autotune.py

Added Paths:
-----------
    branches/8.2-nup/gui/services/migrations/0061_auto__chg_field_iscsitargetglobalconfiguration_iscsi_luc_authnetwork.py

Property Changed:
----------------
    branches/8.2-nup/


Property changes on: branches/8.2-nup
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/8.0.1:7333,7346
/branches/8.1:6033-6383
/branches/dojo17:8468-8495
/branches/feedback:6189-6347
/experimental/ix-8.2:5657-5682
/tags/8.0.3-BETA2:9099-9100
/trunk:7833-7857,10603-10638,10641-10666
   + /branches/8.0.1:7333,7346
/branches/8.1:6033-6383
/branches/dojo17:8468-8495
/branches/feedback:6189-6347
/experimental/ix-8.2:5657-5682
/tags/8.0.3-BETA2:9099-9100
/trunk:7833-7857,10603-10638,10641-10666,10673-10680

Modified: branches/8.2-nup/gui/locale/cs/LC_MESSAGES/django.po
===================================================================
--- branches/8.2-nup/gui/locale/cs/LC_MESSAGES/django.po	2012-03-15 09:47:06 UTC (rev 10681)
+++ branches/8.2-nup/gui/locale/cs/LC_MESSAGES/django.po	2012-03-15 09:50:14 UTC (rev 10682)
@@ -8,7 +8,7 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-03-06 09:48-0800\n"
-"PO-Revision-Date: 2012-01-29 07:14+0200\n"
+"PO-Revision-Date: 2012-03-14 14:37+0200\n"
 "Last-Translator: lubos <lubosboucek@..."
 "Language-Team: LANGUAGE <LL@..."
 "Language: cs\n"
@@ -398,7 +398,7 @@
 
 #: choices.py:502
 msgid "Read and Write"
-msgstr ""
+msgstr "Čtení a zápis"
 
 #: choices.py:506 choices.py:507
 #, fuzzy, python-format
@@ -461,16 +461,15 @@
 
 #: choices.py:529
 msgid "Offline Immediate Test (ATA only)"
-msgstr ""
+msgstr "Okamžitý offline test (pouze ATA)"
 
 #: choices.py:558
-#, fuzzy
 msgid "Rsync module"
-msgstr "Asynchronní režim"
+msgstr "Rsync modul"
 
 #: choices.py:559
 msgid "Rsync over SSH"
-msgstr ""
+msgstr "Rsync přes SSH"
 
 #: choices.py:563
 msgid "Push"
@@ -1084,7 +1083,7 @@
 
 #: network/models.py:254
 msgid "Aliases"
-msgstr ""
+msgstr "Aliasy"
 
 #: network/models.py:266 templates/network/lagg.html:5
 #: templates/network/vlan.html:5
@@ -1447,7 +1446,7 @@
 
 #: services/forms.py:392
 msgid "The activedirectory service failed to reload."
-msgstr ""
+msgstr "Službě activedirectory se nepodařilo znovu načíst."
 
 #: services/forms.py:403
 msgid "The ldap service failed to reload."
@@ -1503,7 +1502,7 @@
 #: services/forms.py:885 services/forms.py:940 services/models.py:492
 #: services/models.py:709
 msgid "The iSCSI service failed to reload."
-msgstr ""
+msgstr "Nepodařilo se znovu načíst službu iSCSI."
 
 #: services/forms.py:510
 msgid "LUN already exists in the same target."
@@ -1574,7 +1573,7 @@
 #: services/forms.py:859
 #, python-format
 msgid "Your Group ID cannot be higher than %d"
-msgstr ""
+msgstr "Vaše skupinové ID nemůže být vyšší než %d"
 
 #: services/forms.py:877
 msgid ""
@@ -1611,7 +1610,7 @@
 
 #: services/models.py:46
 msgid "Enable Service"
-msgstr ""
+msgstr "Povolit službu"
 
 #: services/models.py:49 services/models.py:50 services/nav.py:7
 #: templates/menubar.html:28 templates/services/index.html:3
@@ -1620,7 +1619,7 @@
 
 #: services/models.py:62
 msgid "Authentication Model"
-msgstr ""
+msgstr "Ověřovací model"
 
 #: services/models.py:63
 msgid ""
@@ -1633,7 +1632,7 @@
 
 #: services/models.py:71
 msgid "Workgroup"
-msgstr ""
+msgstr "Pracovní skupina"
 
 #: services/models.py:72
 msgid ""
@@ -1647,11 +1646,11 @@
 
 #: services/models.py:84
 msgid "DOS charset"
-msgstr ""
+msgstr "DOS znaková sada"
 
 #: services/models.py:90
 msgid "UNIX charset"
-msgstr ""
+msgstr "UNIX znaková sada"
 
 #: services/models.py:96
 msgid "Log level"
@@ -1685,15 +1684,15 @@
 
 #: services/models.py:110
 msgid "Allow guest access"
-msgstr ""
+msgstr "Povolit účet hosta"
 
 #: services/models.py:112
 msgid "Only allow guest access"
-msgstr ""
+msgstr "Povolit pouze účet hosta"
 
 #: services/models.py:115 services/models.py:959
 msgid "File mask"
-msgstr ""
+msgstr "Maska souboru"
 
 #: services/models.py:117
 msgid "Use this option to override the file creation mask (0666 by default)."
@@ -1701,12 +1700,12 @@
 
 #: services/models.py:121 services/models.py:965
 msgid "Directory mask"
-msgstr ""
+msgstr "Maska adresáře"
 
 #: services/models.py:123
 msgid ""
 "Use this option to override the directory creation mask (0777 by default)."
-msgstr ""
+msgstr "Použijte tuto možnost k přepsání masky (výchozí hodnota 0777)."
 
 #: services/models.py:126
 msgid "Large RW support"

Modified: branches/8.2-nup/gui/locale/cs/LC_MESSAGES/djangojs.po
===================================================================
--- branches/8.2-nup/gui/locale/cs/LC_MESSAGES/djangojs.po	2012-03-15 09:47:06 UTC (rev 10681)
+++ branches/8.2-nup/gui/locale/cs/LC_MESSAGES/djangojs.po	2012-03-15 09:50:14 UTC (rev 10682)
@@ -8,7 +8,7 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-03-06 09:50-0800\n"
-"PO-Revision-Date: 2012-01-29 07:14+0200\n"
+"PO-Revision-Date: 2012-03-14 14:17+0200\n"
 "Last-Translator: lubos <lubosboucek@..."
 "Language-Team: LANGUAGE <LL@..."
 "Language: cs\n"
@@ -36,7 +36,7 @@
 
 #: freeadmin/static/lib/js/freeadmin.js:184
 msgid "Plugins"
-msgstr ""
+msgstr "Moduly"
 
 #: freeadmin/static/lib/js/freeadmin.js:215
 msgid "Services"
@@ -61,7 +61,7 @@
 #: freeadmin/static/lib/js/freeadmin.js:608
 #: freeadmin/static/lib/js/freeadmin.js:710
 msgid "Please wait..."
-msgstr ""
+msgstr "Čekejte prosím..."
 
 #: freeadmin/static/lib/js/freeadmin.js:657
 #: freeadmin/static/lib/js/freeadmin.js:775

Modified: branches/8.2-nup/gui/locale/tr/LC_MESSAGES/django.po
===================================================================
--- branches/8.2-nup/gui/locale/tr/LC_MESSAGES/django.po	2012-03-15 09:47:06 UTC (rev 10681)
+++ branches/8.2-nup/gui/locale/tr/LC_MESSAGES/django.po	2012-03-15 09:50:14 UTC (rev 10682)
@@ -8,7 +8,7 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-03-06 09:46-0800\n"
-"PO-Revision-Date: 2012-03-14 07:54+0200\n"
+"PO-Revision-Date: 2012-03-15 09:06+0200\n"
 "Last-Translator: Ersan <yakazan@..."
 "Language-Team: LANGUAGE <LL@..."
 "Language: tr\n"
@@ -562,7 +562,7 @@
 
 #: account/forms.py:251 account/forms.py:504
 msgid "SSH Public Key"
-msgstr "SSH Genel Anahtarı"
+msgstr "SSH genel anahtarı"
 
 #: account/forms.py:256
 msgid "Home Directory Mode"
@@ -1077,7 +1077,7 @@
 #: network/models.py:266 templates/network/lagg.html:5
 #: templates/network/vlan.html:5
 msgid "Virtual Interface"
-msgstr "Sanal Arabirim"
+msgstr "Sanal arabirim"
 
 #: network/models.py:267
 msgid "Interface names must be vlanXX where XX is a number. Example: vlan0."
@@ -1768,7 +1768,7 @@
 
 #: services/models.py:159
 msgid "Unix Extensions"
-msgstr "Unix Uzantıları"
+msgstr "Unix uzantıları"
 
 #: services/models.py:161
 msgid ""
@@ -1804,7 +1804,7 @@
 
 #: services/models.py:181
 msgid "Zeroconf share discovery"
-msgstr ""
+msgstr "Sıfır ayarlama paylaşım keşfi"
 
 #: services/models.py:183
 msgid ""
@@ -1873,7 +1873,7 @@
 "Enable asynchronous mode, which will help performance beyond gigabit network "
 "speed."
 msgstr ""
-"Gigabit ağ hızı aşan performansa yardımcı olamak için uyumsuz biçimi "
+"Gigabit ağ hızı aşan performansa yardımcı olmak için uyumsuz biçimi "
 "etkinleştirin."
 
 #: services/models.py:241 services/models.py:242
@@ -2783,7 +2783,7 @@
 
 #: services/models.py:1178
 msgid "Allow Trusted Domains"
-msgstr "İzin Verilen Güvenilir Alan Adları"
+msgstr "İzin verilen güvenilir alan adları"
 
 #: services/models.py:1182
 msgid "Administrator Name"
@@ -3156,7 +3156,7 @@
 
 #: sharing/forms.py:81
 msgid "Confirm Share Password"
-msgstr "Paylaşılan Parola Onayı"
+msgstr "Paylaşılan parola onayı"
 
 #: sharing/forms.py:123
 #, python-format
@@ -4099,7 +4099,7 @@
 #: storage/models.py:625 storage/models.py:679
 #: templates/storage/replications.html:20 templates/storage/tasks.html:21
 msgid "Filesystem/Volume"
-msgstr "DosyaSistem/Birim"
+msgstr "Dosya Sistemi/Birim"
 
 #: storage/models.py:630
 msgid "Last snapshot sent to remote side (leave blank for full replication)"
@@ -4168,7 +4168,7 @@
 
 #: storage/models.py:698
 msgid "Do not snapshot before"
-msgstr "Önce anlık durum görüntüsünü yapmayın"
+msgstr "Daha önce anlık durum görüntüsü alma"
 
 #: storage/models.py:702
 msgid "End"
@@ -4176,7 +4176,7 @@
 
 #: storage/models.py:703
 msgid "Do not snapshot after"
-msgstr "Sonra anlık durum görüntüsünü yapmayın"
+msgstr "Daha sonra anlık durum görüntüsü alma"
 
 #: storage/models.py:709
 msgid "Interval"
@@ -4186,7 +4186,7 @@
 msgid ""
 "How many minutes passed before a new snapshot is made after the last one."
 msgstr ""
-"Son bir yeni anlık durum görüntüsü yapılmadan önce kaç dakikada geçilecek."
+"Son bir yeni anlık durum görüntüsü yapılmadan önce ne kadar zaman geçecek."
 
 #: storage/models.py:716
 msgid "Occurrence"
@@ -4536,12 +4536,12 @@
 #: system/models.py:128
 #, fuzzy
 msgid "NTP Server"
-msgstr "NTP sunucu 1"
+msgstr "NTP Sunucu"
 
 #: system/models.py:129
 #, fuzzy
 msgid "NTP Servers"
-msgstr "NTP sunucu 1"
+msgstr "NTP Sunucu"
 
 #: system/models.py:141
 msgid "Enable Console Menu"
@@ -4779,7 +4779,7 @@
 #: system/models.py:456
 msgid ""
 "Push - From local to remote machine. Pull - From remote to local machine."
-msgstr ""
+msgstr "Bas - Yerelden uzak makineye. Çek - Uzaktan yerel makineye."
 
 #: system/models.py:500
 msgid "Recurse into directories"
@@ -4799,7 +4799,7 @@
 
 #: system/models.py:510
 msgid "Compress data during the transfer"
-msgstr "veriyi aktarım sırasında sıkıştır"
+msgstr "Veriyi aktarım sırasında sıkıştır"
 
 #: system/models.py:514
 msgid "Archive"
@@ -6213,12 +6213,12 @@
 #: templates/system/ntpserver.html:44
 #, fuzzy
 msgid "Add NTP server"
-msgstr "NTP sunucu 1"
+msgstr "NTP Sunucu ekle"
 
 #: templates/system/ntpserver.html:46
 #, fuzzy
 msgid "Add NTP Server"
-msgstr "NTP sunucu 1"
+msgstr "NTP Sunucu Ekle"
 
 #: templates/system/reboot_dialog.html:3
 #: templates/system/shutdown_dialog.html:3
@@ -6375,7 +6375,7 @@
 
 #: templates/system/system_info.html:34
 msgid "Connected through"
-msgstr ""
+msgstr "Bağlantı adresi"
 
 #: templates/system/tunable.html:32
 #, fuzzy

Modified: branches/8.2-nup/gui/services/forms.py
===================================================================
--- branches/8.2-nup/gui/services/forms.py	2012-03-15 09:47:06 UTC (rev 10681)
+++ branches/8.2-nup/gui/services/forms.py	2012-03-15 09:50:14 UTC (rev 10682)
@@ -521,11 +521,13 @@
     iscsi_luc_authgroup = forms.ChoiceField(label=_("Controller Auth Group"),
             help_text=_("The istgtcontrol can access the targets with correct user and secret in specific Auth Group."))
     iscsi_discoveryauthgroup = forms.ChoiceField(label=_("Discovery Auth Group"))
+
     class Meta:
         model = models.iSCSITargetGlobalConfiguration
         widgets = {
             'iscsi_lucport': forms.widgets.TextInput(),
         }
+
     def __init__(self, *args, **kwargs):
         super(iSCSITargetGlobalConfigurationForm, self).__init__(*args, **kwargs)
         self.fields['iscsi_luc_authgroup'].required = False
@@ -611,6 +613,14 @@
             return None
         return lucgroup
 
+    def clean_iscsi_luc_authnetwork(self):
+        network = self.cleaned_data.get('iscsi_luc_authnetwork').strip()
+        try:
+            network = IPNetwork(network.encode('utf-8'))
+        except (NetmaskValueError, ValueError):
+            raise forms.ValidationError(_("This is not a valid network"))
+        return str(network)
+
     def clean(self):
         cdata = self.cleaned_data
 
@@ -634,6 +644,7 @@
         if started is False and models.services.objects.get(srv_service='iscsitarget').srv_enable:
             raise ServiceFailed("iscsitarget", _("The iSCSI service failed to reload."))
 
+
 class iSCSITargetFileExtentForm(ModelForm):
     class Meta:
         model = models.iSCSITargetExtent

Modified: branches/8.2-nup/gui/services/migrations/0005_auto__add_iscsitargetauthorizedinitiator__add_iscsitargetextent__add_i.py
===================================================================
--- branches/8.2-nup/gui/services/migrations/0005_auto__add_iscsitargetauthorizedinitiator__add_iscsitargetextent__add_i.py	2012-03-15 09:47:06 UTC (rev 10681)
+++ branches/8.2-nup/gui/services/migrations/0005_auto__add_iscsitargetauthorizedinitiator__add_iscsitargetextent__add_i.py	2012-03-15 09:50:14 UTC (rev 10682)
@@ -59,7 +59,7 @@
             ('iscsi_toggleluc', self.gf('django.db.models.fields.BooleanField')(default=False)),
             ('iscsi_lucip', self.gf('django.db.models.fields.CharField')(default='127.0.0.1', max_length=120)),
             ('iscsi_lucport', self.gf('django.db.models.fields.IntegerField')(default=3261, max_length=120)),
-            ('iscsi_luc_authnetwork', self.gf('django.db.models.fields.CharField')(default='255.255.255.0', max_length=120)),
+            ('iscsi_luc_authnetwork', self.gf('django.db.models.fields.CharField')(default='127.0.0.1/8', max_length=120)),
             ('iscsi_luc_authmethod', self.gf('django.db.models.fields.CharField')(default='CHAP', max_length=120)),
             ('iscsi_luc_authgroup', self.gf('django.db.models.fields.IntegerField')(default=1, max_length=120)),
         ))

Copied: branches/8.2-nup/gui/services/migrations/0061_auto__chg_field_iscsitargetglobalconfiguration_iscsi_luc_authnetwork.py (from rev 10680, trunk/gui/services/migrations/0061_auto__chg_field_iscsitargetglobalconfiguration_iscsi_luc_authnetwork.py)
===================================================================
--- branches/8.2-nup/gui/services/migrations/0061_auto__chg_field_iscsitargetglobalconfiguration_iscsi_luc_authnetwork.py	                        (rev 0)
+++ branches/8.2-nup/gui/services/migrations/0061_auto__chg_field_iscsitargetglobalconfiguration_iscsi_luc_authnetwork.py	2012-03-15 09:50:14 UTC (rev 10682)
@@ -0,0 +1,344 @@
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        
+        # Changing field 'iSCSITargetGlobalConfiguration.iscsi_luc_authnetwork'
+        db.alter_column('services_iscsitargetglobalconfiguration', 'iscsi_luc_authnetwork', self.gf('django.db.models.fields.CharField')(max_length=120))
+
+
+    def backwards(self, orm):
+        
+        # Changing field 'iSCSITargetGlobalConfiguration.iscsi_luc_authnetwork'
+        db.alter_column('services_iscsitargetglobalconfiguration', 'iscsi_luc_authnetwork', self.gf('django.db.models.fields.IPAddressField')(max_length=15))
+
+
+    models = {
+        'network.alias': {
+            'Meta': {'object_name': 'Alias'},
+            'alias_interface': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['network.Interfaces']"}),
+            'alias_v4address': ('freenasUI.contrib.IPAddressField.IP4AddressField', [], {'default': "''", 'blank': 'True'}),
+            'alias_v4netmaskbit': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '3', 'blank': 'True'}),
+            'alias_v6address': ('freenasUI.contrib.IPAddressField.IP6AddressField', [], {'default': "''", 'blank': 'True'}),
+            'alias_v6netmaskbit': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '3', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'network.interfaces': {
+            'Meta': {'ordering': "['int_interface']", 'object_name': 'Interfaces'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'int_dhcp': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'int_interface': ('django.db.models.fields.CharField', [], {'max_length': '300'}),
+            'int_ipv4address': ('freenasUI.contrib.IPAddressField.IPAddressField', [], {'default': "''", 'blank': 'True'}),
+            'int_ipv6address': ('freenasUI.contrib.IPAddressField.IPAddressField', [], {'default': "''", 'blank': 'True'}),
+            'int_ipv6auto': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'int_name': ('django.db.models.fields.CharField', [], {'max_length': "'120'"}),
+            'int_options': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'int_v4netmaskbit': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '3', 'blank': 'True'}),
+            'int_v6netmaskbit': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '4', 'blank': 'True'})
+        },
+        'services.activedirectory': {
+            'Meta': {'object_name': 'ActiveDirectory'},
+            'ad_adminname': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ad_adminpw': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ad_allow_trusted_doms': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ad_dcname': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ad_domainname': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ad_netbiosname': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ad_workgroup': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'services.afp': {
+            'Meta': {'object_name': 'AFP'},
+            'afp_srv_connections_limit': ('django.db.models.fields.IntegerField', [], {'default': '50', 'max_length': '120'}),
+            'afp_srv_guest': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'afp_srv_guest_user': ('freeadmin.models.UserField', [], {'default': "'nobody'", 'max_length': '120'}),
+            'afp_srv_name': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'services.cifs': {
+            'Meta': {'object_name': 'CIFS'},
+            'cifs_srv_aio_enable': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_aio_rs': ('django.db.models.fields.IntegerField', [], {'default': '4096', 'max_length': '120'}),
+            'cifs_srv_aio_ws': ('django.db.models.fields.IntegerField', [], {'default': '4096', 'max_length': '120'}),
+            'cifs_srv_authmodel': ('django.db.models.fields.CharField', [], {'max_length': '10'}),
+            'cifs_srv_description': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'cifs_srv_dirmask': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'cifs_srv_dosattr': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_doscharset': ('django.db.models.fields.CharField', [], {'default': "'CP437'", 'max_length': '120'}),
+            'cifs_srv_easupport': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_filemask': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'cifs_srv_guest': ('freeadmin.models.UserField', [], {'default': "'nobody'", 'max_length': '120'}),
+            'cifs_srv_homedir': ('freeadmin.models.PathField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'cifs_srv_homedir_aux': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'cifs_srv_homedir_browseable_enable': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_homedir_enable': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_largerw': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_localmaster': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_loglevel': ('django.db.models.fields.CharField', [], {'default': "'Minimum'", 'max_length': '120'}),
+            'cifs_srv_netbiosname': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'cifs_srv_nullpw': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_sendfile': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_smb_options': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'cifs_srv_timeserver': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_unixcharset': ('django.db.models.fields.CharField', [], {'default': "'UTF-8'", 'max_length': '120'}),
+            'cifs_srv_unixext': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'cifs_srv_workgroup': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'cifs_srv_zeroconf': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'services.dynamicdns': {
+            'Meta': {'object_name': 'DynamicDNS'},
+            'ddns_domain': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ddns_fupdateperiod': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ddns_options': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'ddns_password': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ddns_provider': ('django.db.models.fields.CharField', [], {'default': "'dyndns'", 'max_length': '120', 'blank': 'True'}),
+            'ddns_updateperiod': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ddns_username': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'services.ftp': {
+            'Meta': {'object_name': 'FTP'},
+            'ftp_anonpath': ('freeadmin.models.PathField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'ftp_anonuserbw': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'ftp_anonuserdlbw': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'ftp_banner': ('django.db.models.fields.TextField', [], {'max_length': '120', 'blank': 'True'}),
+            'ftp_clients': ('django.db.models.fields.PositiveIntegerField', [], {'default': '32'}),
+            'ftp_defaultroot': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_dirmask': ('django.db.models.fields.CharField', [], {'default': "'077'", 'max_length': '3'}),
+            'ftp_filemask': ('django.db.models.fields.CharField', [], {'default': "'077'", 'max_length': '3'}),
+            'ftp_fxp': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_ident': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_ipconnections': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'ftp_localuserbw': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'ftp_localuserdlbw': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'ftp_loginattempt': ('django.db.models.fields.PositiveIntegerField', [], {'default': '3'}),
+            'ftp_masqaddress': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ftp_onlyanonymous': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_onlylocal': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_options': ('django.db.models.fields.TextField', [], {'max_length': '120', 'blank': 'True'}),
+            'ftp_passiveportsmax': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'ftp_passiveportsmin': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'ftp_port': ('django.db.models.fields.PositiveIntegerField', [], {'default': '21'}),
+            'ftp_resume': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_reversedns': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_rootlogin': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_ssltls': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_timeout': ('django.db.models.fields.PositiveIntegerField', [], {'default': '120'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'services.iscsitarget': {
+            'Meta': {'object_name': 'iSCSITarget'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'iscsi_target_alias': ('django.db.models.fields.CharField', [], {'max_length': '120', 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'iscsi_target_authgroup': ('django.db.models.fields.IntegerField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}),
+            'iscsi_target_authtype': ('django.db.models.fields.CharField', [], {'default': "'Auto'", 'max_length': '120'}),
+            'iscsi_target_flags': ('django.db.models.fields.CharField', [], {'default': "'rw'", 'max_length': '120'}),
+            'iscsi_target_initialdigest': ('django.db.models.fields.CharField', [], {'default': "'Auto'", 'max_length': '120'}),
+            'iscsi_target_initiatorgroup': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.iSCSITargetAuthorizedInitiator']"}),
+            'iscsi_target_logical_blocksize': ('django.db.models.fields.IntegerField', [], {'default': '512', 'max_length': '3'}),
+            'iscsi_target_name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '120'}),
+            'iscsi_target_portalgroup': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.iSCSITargetPortal']"}),
+            'iscsi_target_queue_depth': ('django.db.models.fields.IntegerField', [], {'default': '32', 'max_length': '3'}),
+            'iscsi_target_serial': ('django.db.models.fields.CharField', [], {'default': "'10000001'", 'max_length': '16'}),
+            'iscsi_target_type': ('django.db.models.fields.CharField', [], {'default': "'Disk'", 'max_length': '120'})
+        },
+        'services.iscsitargetauthcredential': {
+            'Meta': {'object_name': 'iSCSITargetAuthCredential'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'iscsi_target_auth_peersecret': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'iscsi_target_auth_peeruser': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'iscsi_target_auth_secret': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'iscsi_target_auth_tag': ('django.db.models.fields.IntegerField', [], {'default': '1'}),
+            'iscsi_target_auth_user': ('django.db.models.fields.CharField', [], {'max_length': '120'})
+        },
+        'services.iscsitargetauthorizedinitiator': {
+            'Meta': {'object_name': 'iSCSITargetAuthorizedInitiator'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'iscsi_target_initiator_auth_network': ('django.db.models.fields.TextField', [], {'default': "'ALL'", 'max_length': '2048'}),
+            'iscsi_target_initiator_comment': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'iscsi_target_initiator_initiators': ('django.db.models.fields.TextField', [], {'default': "'ALL'", 'max_length': '2048'}),
+            'iscsi_target_initiator_tag': ('django.db.models.fields.IntegerField', [], {'default': '1', 'unique': 'True'})
+        },
+        'services.iscsitargetextent': {
+            'Meta': {'object_name': 'iSCSITargetExtent'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'iscsi_target_extent_comment': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'iscsi_target_extent_filesize': ('django.db.models.fields.CharField', [], {'default': '0', 'max_length': '120'}),
+            'iscsi_target_extent_name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '120'}),
+            'iscsi_target_extent_path': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'iscsi_target_extent_type': ('django.db.models.fields.CharField', [], {'max_length': '120'})
+        },
+        'services.iscsitargetglobalconfiguration': {
+            'Meta': {'object_name': 'iSCSITargetGlobalConfiguration'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'iscsi_basename': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'iscsi_defaultt2r': ('django.db.models.fields.IntegerField', [], {'default': '60', 'max_length': '120'}),
+            'iscsi_defaultt2w': ('django.db.models.fields.IntegerField', [], {'default': '2', 'max_length': '120'}),
+            'iscsi_discoveryauthgroup': ('django.db.models.fields.IntegerField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}),
+            'iscsi_discoveryauthmethod': ('django.db.models.fields.CharField', [], {'default': "'Auto'", 'max_length': '120'}),
+            'iscsi_firstburst': ('django.db.models.fields.IntegerField', [], {'default': '65536', 'max_length': '120'}),
+            'iscsi_iotimeout': ('django.db.models.fields.IntegerField', [], {'default': '30', 'max_length': '120'}),
+            'iscsi_luc_authgroup': ('django.db.models.fields.IntegerField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}),
+            'iscsi_luc_authmethod': ('django.db.models.fields.CharField', [], {'default': "'chap'", 'max_length': '120', 'blank': 'True'}),
+            'iscsi_luc_authnetwork': ('django.db.models.fields.CharField', [], {'default': "'127.0.0.1/8'", 'max_length': '120', 'blank': 'True'}),
+            'iscsi_lucip': ('django.db.models.fields.IPAddressField', [], {'default': "'127.0.0.1'", 'max_length': '15', 'blank': 'True'}),
+            'iscsi_lucport': ('django.db.models.fields.IntegerField', [], {'default': '3261', 'null': 'True', 'blank': 'True'}),
+            'iscsi_maxburst': ('django.db.models.fields.IntegerField', [], {'default': '262144', 'max_length': '120'}),
+            'iscsi_maxconnect': ('django.db.models.fields.IntegerField', [], {'default': '8', 'max_length': '120'}),
+            'iscsi_maxoutstandingr2t': ('django.db.models.fields.IntegerField', [], {'default': '16', 'max_length': '120'}),
+            'iscsi_maxrecdata': ('django.db.models.fields.IntegerField', [], {'default': '262144', 'max_length': '120'}),
+            'iscsi_maxsesh': ('django.db.models.fields.IntegerField', [], {'default': '16', 'max_length': '120'}),
+            'iscsi_nopinint': ('django.db.models.fields.IntegerField', [], {'default': '20', 'max_length': '120'}),
+            'iscsi_r2t': ('django.db.models.fields.IntegerField', [], {'default': '32', 'max_length': '120'}),
+            'iscsi_toggleluc': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'services.iscsitargetportal': {
+            'Meta': {'object_name': 'iSCSITargetPortal'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'iscsi_target_portal_comment': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'iscsi_target_portal_tag': ('django.db.models.fields.IntegerField', [], {'default': '1', 'max_length': '120'})
+        },
+        'services.iscsitargetportalip': {
+            'Meta': {'unique_together': "(('iscsi_target_portalip_ip', 'iscsi_target_portalip_port'),)", 'object_name': 'iSCSITargetPortalIP'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'iscsi_target_portalip_ip': ('django.db.models.fields.IPAddressField', [], {'max_length': '15'}),
+            'iscsi_target_portalip_port': ('django.db.models.fields.SmallIntegerField', [], {'default': '3260'}),
+            'iscsi_target_portalip_portal': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.iSCSITargetPortal']"})
+        },
+        'services.iscsitargettoextent': {
+            'Meta': {'object_name': 'iSCSITargetToExtent'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'iscsi_extent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.iSCSITargetExtent']", 'unique': 'True'}),
+            'iscsi_target': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.iSCSITarget']"})
+        },
+        'services.ldap': {
+            'Meta': {'object_name': 'LDAP'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ldap_anonbind': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ldap_basedn': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ldap_groupsuffix': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ldap_hostname': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ldap_machinesuffix': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ldap_options': ('django.db.models.fields.TextField', [], {'max_length': '120', 'blank': 'True'}),
+            'ldap_passwordsuffix': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ldap_pwencryption': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ldap_rootbasedn': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ldap_rootbindpw': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ldap_ssl': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ldap_tls_cacertfile': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'ldap_usersuffix': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'})
+        },
+        'services.nfs': {
+            'Meta': {'object_name': 'NFS'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'nfs_srv_async': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'nfs_srv_servers': ('django.db.models.fields.PositiveIntegerField', [], {'default': '4'})
+        },
+        'services.plugins': {
+            'Meta': {'object_name': 'Plugins'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'jail_ip': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['network.Alias']"}),
+            'jail_name': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '120'}),
+            'jail_path': ('freeadmin.models.PathField', [], {'max_length': '255'}),
+            'plugins_path': ('freeadmin.models.PathField', [], {'max_length': '255'})
+        },
+        'services.rsyncd': {
+            'Meta': {'object_name': 'Rsyncd'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'rsyncd_auxiliary': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'rsyncd_port': ('django.db.models.fields.IntegerField', [], {'default': '873'})
+        },
+        'services.rsyncmod': {
+            'Meta': {'ordering': "['rsyncmod_name']", 'object_name': 'RsyncMod'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'rsyncmod_auxiliary': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'rsyncmod_comment': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'rsyncmod_group': ('freeadmin.models.GroupField', [], {'default': "'nobody'", 'max_length': '120', 'blank': 'True'}),
+            'rsyncmod_hostsallow': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'rsyncmod_hostsdeny': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'rsyncmod_maxconn': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'rsyncmod_mode': ('django.db.models.fields.CharField', [], {'default': "'rw'", 'max_length': '120'}),
+            'rsyncmod_name': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'rsyncmod_path': ('freeadmin.models.PathField', [], {'max_length': '255'}),
+            'rsyncmod_user': ('freeadmin.models.UserField', [], {'default': "'nobody'", 'max_length': '120', 'blank': 'True'})
+        },
+        'services.services': {
+            'Meta': {'object_name': 'services'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'srv_enable': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'srv_service': ('django.db.models.fields.CharField', [], {'max_length': '120'})
+        },
+        'services.smart': {
+            'Meta': {'object_name': 'SMART'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'smart_critical': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'smart_difference': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'smart_email': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'smart_informal': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'smart_interval': ('django.db.models.fields.IntegerField', [], {'default': '30'}),
+            'smart_powermode': ('django.db.models.fields.CharField', [], {'default': "'never'", 'max_length': '60'})
+        },
+        'services.snmp': {
+            'Meta': {'object_name': 'SNMP'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'snmp_community': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'snmp_contact': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'snmp_location': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'snmp_options': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'snmp_traps': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'services.ssh': {
+            'Meta': {'object_name': 'SSH'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ssh_compression': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ssh_host_dsa_key': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'ssh_host_dsa_key_pub': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'ssh_host_ecdsa_key': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'ssh_host_ecdsa_key_pub': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'ssh_host_key': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'ssh_host_key_pub': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'ssh_host_rsa_key': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'ssh_host_rsa_key_pub': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'ssh_options': ('django.db.models.fields.TextField', [], {'max_length': '120', 'blank': 'True'}),
+            'ssh_passwordauth': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ssh_privatekey': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'blank': 'True'}),
+            'ssh_rootlogin': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ssh_tcpfwd': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ssh_tcpport': ('django.db.models.fields.PositiveIntegerField', [], {})
+        },
+        'services.tftp': {
+            'Meta': {'object_name': 'TFTP'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'tftp_directory': ('freeadmin.models.PathField', [], {'max_length': '255'}),
+            'tftp_newfiles': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'tftp_options': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'tftp_port': ('django.db.models.fields.PositiveIntegerField', [], {}),
+            'tftp_umask': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'tftp_username': ('freeadmin.models.UserField', [], {'default': "'nobody'", 'max_length': '120'})
+        },
+        'services.ups': {
+            'Meta': {'object_name': 'UPS'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ups_description': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ups_driver': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ups_emailnotify': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ups_extrausers': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'ups_identifier': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ups_masterpwd': ('django.db.models.fields.CharField', [], {'default': "'fixmepass'", 'max_length': '30'}),
+            'ups_options': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'ups_port': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ups_rmonitor': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ups_shutdown': ('django.db.models.fields.CharField', [], {'default': "'batt'", 'max_length': '120'}),
+            'ups_shutdowntimer': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ups_subject': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ups_toemail': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['services']

Modified: branches/8.2-nup/gui/services/models.py
===================================================================
--- branches/8.2-nup/gui/services/models.py	2012-03-15 09:47:06 UTC (rev 10681)
+++ branches/8.2-nup/gui/services/models.py	2012-03-15 09:50:14 UTC (rev 10682)
@@ -348,17 +348,18 @@
             blank=True,
             null=True,
             )
-    iscsi_luc_authnetwork = models.IPAddressField(
+    iscsi_luc_authnetwork = models.CharField(
             max_length=120,
-            verbose_name=_("Controller Authorized netmask"),
-            default = "255.255.255.0",
-            help_text=_("Logical Unit Controller Authorized netmask (255.255.255.0 by default)"),
+            verbose_name=_("Controller Authorized Network"),
+            default="127.0.0.1/8",
+            help_text=_("Logical Unit Controller Authorized netmask "
+                "(127.0.0.1/8 by default)"),
             blank=True,
             )
     iscsi_luc_authmethod = models.CharField(
             max_length=120,
             choices=choices.AUTHMETHOD_CHOICES,
-            default = "chap",
+            default="chap",
             verbose_name=_("Controller Auth Method"),
             help_text=_("The method can be accepted in the controller."),
             blank=True,
@@ -366,7 +367,8 @@
     iscsi_luc_authgroup = models.IntegerField(
             max_length=120,
             verbose_name=_("Controller Auth Group"),
-            help_text=_("The istgtcontrol can access the targets with correct user and secret in specific Auth Group."),
+            help_text=_("The istgtcontrol can access the targets with correct "
+                "user and secret in specific Auth Group."),
             blank=True,
             null=True,
             )

Modified: branches/8.2-nup/src/autotune/files/autotune.py
===================================================================
--- branches/8.2-nup/src/autotune/files/autotune.py	2012-03-15 09:47:06 UTC (rev 10681)
+++ branches/8.2-nup/src/autotune/files/autotune.py	2012-03-15 09:50:14 UTC (rev 10682)
@@ -26,7 +26,11 @@
 
 setup_environ(settings)
 
-from freenasUI.system.models import Advanced, Sysctl, Tunable
+try:
+    from freenasUI.system.models import Advanced, Sysctl, Tunable
+except ImportError:
+    # Not working state, abort
+    sys.exit(1)
 
 MB = 1024 * 1024
 GB = 1024 * MB

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.