From 6ed06eff82c8fde0103185e9e718634b56f678ee Mon Sep 17 00:00:00 2001
From: Holger Frey <mail@holgerfrey.de>
Date: Thu, 28 Sep 2017 12:45:54 +0200
Subject: [PATCH] added deform widgets for deactivated fields

this removes the need of setting deactivated attribute with javascript
---
 ordr2/schemas/account.py                     |  6 ++-
 ordr2/static/js/functions.js                 |  2 +-
 ordr2/templates/deform/select_disabled.pt    | 42 ++++++++++++++++++++
 ordr2/templates/deform/textinput_disabled.pt | 22 ++++++++++
 ordr2/templates/layout.jinja2                |  1 -
 5 files changed, 69 insertions(+), 4 deletions(-)
 create mode 100644 ordr2/templates/deform/select_disabled.pt
 create mode 100644 ordr2/templates/deform/textinput_disabled.pt

diff --git a/ordr2/schemas/account.py b/ordr2/schemas/account.py
index d03c80a..04f66d7 100644
--- a/ordr2/schemas/account.py
+++ b/ordr2/schemas/account.py
@@ -15,9 +15,11 @@ class RegistrationSchema(CSRFSchema):
 
     user_name = colander.SchemaNode(
         colander.String(),
-        widget=deform.widget.TextInputWidget(),
+        widget=deform.widget.TextInputWidget(
+            template='textinput_disabled.pt'
+            ),
         description='automagically generated for you',
-        validator = deferred_unique_username_validator
+        validator = deferred_unique_username_validator,
         )
     first_name = colander.SchemaNode(
         colander.String()
diff --git a/ordr2/static/js/functions.js b/ordr2/static/js/functions.js
index fd4effb..9814d83 100755
--- a/ordr2/static/js/functions.js
+++ b/ordr2/static/js/functions.js
@@ -1 +1 @@
-$(document).ready(function() {

    function capitalize(s){
        return s.replace( /\b./g, function(a){ return a.toUpperCase(); } );
    };

    function generate_user_name() {
        var first_name = $('.registration .item-first_name input').val();
        var last_name = $('.registration .item-last_name input').val();
        var user_name = capitalize(first_name) + capitalize(last_name);
        return user_name.replace( /\s/g, '')
    };

  	// autocomplete of the username (registration form)
  	$('.registration .item-user_name input').attr('disabled', 'disabled');
  	$('.registration .item-user_name input').val( generate_user_name() );
	$('.registration .item-first_name input').keyup(function() {
		$('.registration .item-user_name input').val( generate_user_name() );
	});
	$('.registration .item-last_name input').keyup(function() {
		$('.registration .item-user_name input').val( generate_user_name() );
	});
	$('.registration #deformCreate_Account').click(function() {
      	$('.registration .item-user_name input').removeAttr('disabled');
	    return true;
	});







  	// "dispatch" clicking a th to the corresponding anchor
  	$('th.sortable').click( function() {
    	window.location = $(this).children('a').attr('href');
  	});

  	// "dispatch" clicking list item in collapse to the corresponding anchor
  	$('.accordion li').click( function() {
    	window.location = $(this).children('a').attr('href');
  	});

  	// the mark all
 	$('input[name="mark_all"]').click(function()	{
		var checked_status = this.checked;
		$('input[name*="marked"]').each(function() {
			this.checked = checked_status;
		});
		if( $('input[name="mark_all"]').is(':checked') && $('.marking-needed').is(':hidden') ) {
  			$('.marking-needed').fadeIn("fast");
  		} else if( $('input[name="mark_all"]').is(':checked') && $('.marking-needed').is(':visible') ) {
  			// do nothing
  		} else {
  			$('.marking-needed').fadeOut("fast");
  		}
	});

  	// show actions only if some data is marked
  	$('input[name*="marked"]').change(function() {
  		if( $('input[name*="marked"]').is(':checked') ) {
  			if( $('.marking-needed').is(':hidden') )
  				$('.marking-needed').fadeIn("slow");
  		} else {
  			$('.marking-needed').fadeOut("slow");
  		}
	});

  	// quick-actions
  	$('.quick-action a[data-value]').click(function(event) {
  		event.preventDefault();
  		var value = $(this).attr('data-value');
  		var action = $(this).closest('div').attr('data-action');
  		$('select[name*='+action+']').each(function() {
			$(this).val(value);
		});
  	});

  	// submit search
  	$('.search-form input[type="search"]').keypress(function(event) {
  		if( event.keyCode == 13 && $('.typeahead.dropdown-menu').is(':hidden') )
  			$('.search-form').submit();
  	});

  	// aside filter
  	$('.filter input[type="checkbox"]').click( function() {
  		if( $(this).is(':checked') ) {
  			$(this).parents('li').addClass('active');
  		} else {
  			$(this).parents('li').removeClass('active');
  		}
  	});

	// tooltips
	$('.page-controls').tooltip({
		selector: "[rel=tooltip]"
	});

	// calculator
	if ( $('input[name="price_unit"]').length ) {
		if( $('input[name="price_unit"]').val() != '' && $('input[name="quantity"]').val() != '' ){
			var total = $('input[name="price_unit"]').val().replace(",", ".") * $('input[name="quantity"]').val();
			total = Math.round(total*100)/100;
			$('input[name="price_total_disabled"]').attr( 'placeholder', total );
		}
		$('input[name="price_unit"], input[name="quantity"]').keyup(function() {
			var total = $('input[name="price_unit"]').val().replace(",", ".") * $('input[name="quantity"]').val();
			total = Math.round(total*100)/100;
			$('input[name="price_total_disabled"]').attr( 'placeholder', total );
		});
	}

	if ( $('input[name="currency"]').length ) {
		// added currency to total price
		if( $('input[name="currency"]').val() != '' ){
			$('input[name="currency_disabled"]').attr( 'placeholder', $('input[name="currency"]').val() );
		}
		$('input[name="currency"]').keyup(function() {
			$('input[name="currency_disabled"]').attr( 'placeholder', $('input[name="currency"]').val() );
		});
			$('input[name="currency"]').change(function() {
			$('input[name="currency_disabled"]').attr( 'placeholder', $('input[name="currency"]').val() );
		});
	}

 });
\ No newline at end of file
+$(document).ready(function() {

    function capitalize(s){
        return s.replace( /\b./g, function(a){ return a.toUpperCase(); } );
    };

    function generate_user_name() {
        var first_name = $('.registration .item-first_name input').val();
        var last_name = $('.registration .item-last_name input').val();
        var user_name = capitalize(first_name) + capitalize(last_name);
        return user_name.replace( /\s/g, '')
    };

  	// autocomplete of the username (registration form)

  	$('.registration .item-user_name input').val( generate_user_name() );
	$('.registration .item-first_name input').keyup(function() {
		$('.registration .item-user_name input').val( generate_user_name() );
	});
	$('.registration .item-last_name input').keyup(function() {
		$('.registration .item-user_name input').val( generate_user_name() );
	});
	$('.registration #deformCreate_Account').click(function() {
      	$('.registration .item-user_name input').removeAttr('disabled');
	    return true;
	});







  	// "dispatch" clicking a th to the corresponding anchor
  	$('th.sortable').click( function() {
    	window.location = $(this).children('a').attr('href');
  	});

  	// "dispatch" clicking list item in collapse to the corresponding anchor
  	$('.accordion li').click( function() {
    	window.location = $(this).children('a').attr('href');
  	});

  	// the mark all
 	$('input[name="mark_all"]').click(function()	{
		var checked_status = this.checked;
		$('input[name*="marked"]').each(function() {
			this.checked = checked_status;
		});
		if( $('input[name="mark_all"]').is(':checked') && $('.marking-needed').is(':hidden') ) {
  			$('.marking-needed').fadeIn("fast");
  		} else if( $('input[name="mark_all"]').is(':checked') && $('.marking-needed').is(':visible') ) {
  			// do nothing
  		} else {
  			$('.marking-needed').fadeOut("fast");
  		}
	});

  	// show actions only if some data is marked
  	$('input[name*="marked"]').change(function() {
  		if( $('input[name*="marked"]').is(':checked') ) {
  			if( $('.marking-needed').is(':hidden') )
  				$('.marking-needed').fadeIn("slow");
  		} else {
  			$('.marking-needed').fadeOut("slow");
  		}
	});

  	// quick-actions
  	$('.quick-action a[data-value]').click(function(event) {
  		event.preventDefault();
  		var value = $(this).attr('data-value');
  		var action = $(this).closest('div').attr('data-action');
  		$('select[name*='+action+']').each(function() {
			$(this).val(value);
		});
  	});

  	// submit search
  	$('.search-form input[type="search"]').keypress(function(event) {
  		if( event.keyCode == 13 && $('.typeahead.dropdown-menu').is(':hidden') )
  			$('.search-form').submit();
  	});

  	// aside filter
  	$('.filter input[type="checkbox"]').click( function() {
  		if( $(this).is(':checked') ) {
  			$(this).parents('li').addClass('active');
  		} else {
  			$(this).parents('li').removeClass('active');
  		}
  	});

	// tooltips
	$('.page-controls').tooltip({
		selector: "[rel=tooltip]"
	});

	// calculator
	if ( $('input[name="price_unit"]').length ) {
		if( $('input[name="price_unit"]').val() != '' && $('input[name="quantity"]').val() != '' ){
			var total = $('input[name="price_unit"]').val().replace(",", ".") * $('input[name="quantity"]').val();
			total = Math.round(total*100)/100;
			$('input[name="price_total_disabled"]').attr( 'placeholder', total );
		}
		$('input[name="price_unit"], input[name="quantity"]').keyup(function() {
			var total = $('input[name="price_unit"]').val().replace(",", ".") * $('input[name="quantity"]').val();
			total = Math.round(total*100)/100;
			$('input[name="price_total_disabled"]').attr( 'placeholder', total );
		});
	}

	if ( $('input[name="currency"]').length ) {
		// added currency to total price
		if( $('input[name="currency"]').val() != '' ){
			$('input[name="currency_disabled"]').attr( 'placeholder', $('input[name="currency"]').val() );
		}
		$('input[name="currency"]').keyup(function() {
			$('input[name="currency_disabled"]').attr( 'placeholder', $('input[name="currency"]').val() );
		});
			$('input[name="currency"]').change(function() {
			$('input[name="currency_disabled"]').attr( 'placeholder', $('input[name="currency"]').val() );
		});
	}

 });
\ No newline at end of file
diff --git a/ordr2/templates/deform/select_disabled.pt b/ordr2/templates/deform/select_disabled.pt
new file mode 100644
index 0000000..83304e5
--- /dev/null
+++ b/ordr2/templates/deform/select_disabled.pt
@@ -0,0 +1,42 @@
+<div tal:define="
+     name name|field.name;
+     oid oid|field.oid;
+     style style|field.widget.style;
+     size size|field.widget.size;
+     css_class css_class|field.widget.css_class;
+     unicode unicode|str;
+     optgroup_class optgroup_class|field.widget.optgroup_class;
+     multiple multiple|field.widget.multiple;"
+     tal:omit-tag="">
+
+  <input type="hidden" name="__start__" value="${name}:sequence"
+         tal:condition="multiple" />
+  <select tal:attributes="
+          name name;
+          id oid;
+          class string: form-control ${css_class or ''};
+          multiple multiple;
+          size size;
+          style style;"
+          disabled="disabled">
+    <tal:loop tal:repeat="item values">
+      <optgroup tal:condition="isinstance(item, optgroup_class)"
+                tal:attributes="label item.label">
+        <option tal:repeat="(value, description) item.options"
+                tal:attributes="
+                selected python:field.widget.get_select_value(cstruct, value);
+                class css_class;
+                label field.widget.long_label_generator and description;
+                value value"
+                tal:content="field.widget.long_label_generator and field.widget.long_label_generator(item.label, description) or description"/>
+      </optgroup>
+      <option tal:condition="not isinstance(item, optgroup_class)"
+              tal:attributes="
+              selected python:field.widget.get_select_value(cstruct, item[0]);
+              class css_class;
+              value item[0]">${item[1]}</option>
+    </tal:loop>
+  </select>
+  <input type="hidden" name="__end__" value="${name}:sequence"
+         tal:condition="multiple" />
+</div>
diff --git a/ordr2/templates/deform/textinput_disabled.pt b/ordr2/templates/deform/textinput_disabled.pt
new file mode 100644
index 0000000..ae5b3ba
--- /dev/null
+++ b/ordr2/templates/deform/textinput_disabled.pt
@@ -0,0 +1,22 @@
+<span tal:define="name name|field.name;
+                  css_class css_class|field.widget.css_class;
+                  oid oid|field.oid;
+                  mask mask|field.widget.mask;
+                  mask_placeholder mask_placeholder|field.widget.mask_placeholder;
+                  style style|field.widget.style;
+"
+      tal:omit-tag="">
+    <input type="text" name="${name}" value="${cstruct}"
+           tal:attributes="class string: form-control ${css_class or ''};
+                           style style"
+           id="${oid}"
+           disabled="disabled"/>
+    <script tal:condition="mask" type="text/javascript">
+      deform.addCallback(
+         '${oid}',
+         function (oid) {
+            $("#" + oid).mask("${mask}",
+                 {placeholder:"${mask_placeholder}"});
+         });
+    </script>
+</span>
diff --git a/ordr2/templates/layout.jinja2 b/ordr2/templates/layout.jinja2
index 3a59f72..37145c8 100644
--- a/ordr2/templates/layout.jinja2
+++ b/ordr2/templates/layout.jinja2
@@ -38,7 +38,6 @@
                         <a data-toggle="dropdown" class="dropdown-toggle" href="#">Logged in as <span class="user-name">{{request.user.user_name}}</span></a>
                         <ul class="dropdown-menu">
                           <li><a href="{{request.resource_url(request.root, 'account', 'settings')}}">Settings</a></li>
-                          <li><a href="#">Help</a></li>
                           <li><a href="https://git.cpi.imtek.uni-freiburg.de/holgi/ordr2/issues">Submit an Issue</a></li>
                           <li class="divider"></li>
                           <li><a href="{{request.resource_url(request.root, 'account', 'logout')}}">Logout</a></li>