Index: debian/control
===================================================================
--- debian/control	(revision 5155)
+++ debian/control	(working copy)
@@ -16,6 +16,7 @@
  foomatic-db
 Standards-Version: 3.8.2
 
+
 Package: univention-printserver
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends},
Index: umc/icons/50x50/printing.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: umc/icons/50x50/printing.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: umc/icons/16x16/printing.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: umc/icons/16x16/printing.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: umc/icons/scalable/printing.svgz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: umc/icons/scalable/printing.svgz
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: umc/js/_printers/QuotaDialog.js
===================================================================
--- umc/js/_printers/QuotaDialog.js	(revision 0)
+++ umc/js/_printers/QuotaDialog.js	(revision 0)
@@ -0,0 +1,203 @@
+/*global console MyError dojo dojox dijit umc */
+
+dojo.provide("umc.modules._printers.QuotaDialog");
+
+dojo.require("umc.i18n");
+dojo.require("umc.dialog");
+dojo.require("umc.store");
+dojo.require("umc.tools");
+
+dojo.require("umc.widgets.Page");
+dojo.require("umc.widgets.Grid");
+dojo.require("umc.widgets.Form");
+
+dojo.declare("umc.modules._printers.QuotaDialog",
+[
+	dijit.Dialog,
+	umc.i18n.Mixin
+], {
+
+	i18nClass:              'umc.modules.printers',
+	
+    buildRendering: function() {
+
+        this.inherited(arguments);
+        
+        var buttons = [
+	    	{
+	    		name:			'submit',
+	    		label:			this._("Save changes")
+	    		// no callback here: the onSubmit() event of the form
+	    		// will automatically be fired if our button has
+	    		// the name 'submit'
+	    	},
+	    	{
+	    		name:			'cancel',
+	    		label:			this._("Cancel"),
+	    		// no special meaning of the button name 'cancel', so we
+	    		// have to make a seperate callback for this button.
+	    		callback: dojo.hitch(this, function() {
+	    			this.onCancel();
+	    		})
+	    	}
+    	];
+        
+        var widgets = [
+			{
+				name:				'printer',
+				type:				'TextBox',
+				label:				this._("Printer name"),
+				disabled:			true
+			},
+			{
+				name:				'user',
+				type:				'ComboBox',
+				label:				this._("User name"),
+				sortStaticValues:	true,
+				required:			true
+			},
+			{
+				name:				'soft',
+				type:				'TextBox',
+				regExp:				'\\d+',
+				required:			true,
+				label:				this._("Soft limit")
+			},
+			{
+				name:				'hard',
+				type:				'TextBox',
+				regExp:				'\\d+',
+				required:			true,
+				label:				this._("Hard limit")
+			}
+		];
+        
+        var layout = [
+			[ 'printer' ],
+			[ 'user' ],
+			[ 'soft' ],
+			[ 'hard' ]
+		];
+
+        this._form = new umc.widgets.Form({
+        	buttons:		buttons,
+        	widgets:		widgets,
+        	layout:			layout,
+        	onSubmit: dojo.hitch(this, function(values) {
+            	if (this._check_valid('onsubmit'))
+            	{
+            		this.onSubmit(this._form.gatherFormValues());
+            	}
+        	})
+        });
+        this.set('content',this._form);
+        
+        dojo.connect(this._form,'onCancel',dojo.hitch(this,function() {
+        	this.onCancel();
+        }));
+        
+        // check 'submit' allowance on every field change
+        umc.tools.forIn(this._form._widgets, function(wname, wobj) {
+			dojo.connect(wobj,'onChange',dojo.hitch(this, function() {
+				this._check_valid(wname);
+			}));
+		}, this);
+        
+    },
+    
+    // checks that all dialog elements are valid, allows
+    // or forbids the 'submit' button.
+    _check_valid: function(title) {
+    	
+    	var allow = true;
+    	for (var w in this._form._widgets)
+    	{
+    		var wid = this._form._widgets[w];
+    		
+    		if (! wid.isValid())
+    		{
+    			allow = false;
+    			wid.set('state','Error');		// force visibility of state
+    		}
+    	}
+    	this._form._buttons['submit'].setDisabled(! allow);
+    	    	
+    	return allow;
+    },
+    
+    onShow: function() {
+    	
+    	this.inherited(arguments);
+
+    	// reset all error indicators
+    	for (var w in this._form._widgets)
+    	{
+    		var wid = this._form._widgets[w];
+    		wid.setValid(null);
+    	}
+    	// allow/forbid SUBMIT according to current form contents
+    	this._check_valid();
+    },
+    
+    // will be called from QuotaPage just before showing
+    // the dialog. the 'values' are now composed from
+    // different things:
+    //
+    //	(1)	initial values for the dialog elements (printer, user, hard, soft)
+    //	(2)	the title for the dialog
+    //	(3)	the list of users to show in the ComboBox
+    //
+	setValues: function(values) {
+		
+		// for 'add quota entry': set a list of users, excluding those
+		// that already have a quota entry
+		var userlist = [];
+		
+		if (values['users'])
+		{
+			for (var u in values['users'])
+			{
+				var un = values['users'][u];
+				var entry = { id: un, label: un };
+				userlist.push(entry);
+			}
+		}
+		// for 'edit quota entry' the 'user' ComboBox is readonly, so it is
+		// sufficient to set the list to the one user being edited... this will
+		// catch the case where we have an entry for a user that doesn't exist
+		// anymore.
+		var disabled = false;
+		
+		if (values['user'])
+		{
+			this._work_mode = 'edit';
+			var entry = { id: values['user'], label: values['users'] };
+			userlist.push(entry);
+			disabled = true;
+		}
+		else
+		{
+			this._work_mode = 'add';
+			values['user'] = null;		// force them to touch the ComboBox at least once
+		}
+		this._form.getWidget('user').set('staticValues',userlist);
+    	this._form.getWidget('user').setDisabled(disabled);
+		
+		if (values['title'])
+		{
+			this.set('title',values['title']);
+		}
+		
+		this._form.setFormValues(values);
+	},
+	
+	// event stubs for our caller
+	onSubmit: function(values) {		
+		this.hide();
+	},
+	
+	onCancel: function() {
+		this.hide();
+	}
+
+});