Sahana-Eden

Merge lp:~arky/sahana-eden/eden-UI-fixes into lp:sahana-eden

  1. eden-UI-fixes
  2. Merge into trunk
Proposed by arky
Status: Merged
Merged at revision: 1420
Proposed branch: lp:~arky/sahana-eden/eden-UI-fixes
Merge into: lp:sahana-eden
Diff against target: 30 lines (+2/-2)
2 files modified
static/scripts/web2py/web2py.js (+1/-1)
views/layout.html (+1/-1)
To merge this branch: bzr merge lp:~arky/sahana-eden/eden-UI-fixes
Reviewer Review Type Date Requested Status
Fran Boon Needs Fixing
Review via email: mp+40407@code.launchpad.net

Description of the change

Changed jQuery input.string=20 to match other input labels

Display response.* div outside #content wrapper

To post a comment you must log in.
Revision history for this message
Fran Boon (flavour) wrote :

Thanks - I merged the 2nd change, but have held off the 1st for now.
(1) I'm not convinced it's a good idea (I personally like long text INPUT boxes so that I can see more of what I enter in here - we want to encourage people to add more info here rather than less)
(2) The textarea should be made the same width?
(3) We need to build a new S3.min.js in order to see the changes in non-debug mode

review: Needs Fixing

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'static/scripts/web2py/web2py.js'
2--- static/scripts/web2py/web2py.js 2010-07-16 13:03:55 +0000
3+++ static/scripts/web2py/web2py.js 2010-11-09 06:27:50 +0000
4@@ -25,7 +25,7 @@
5 jQuery('.hidden').hide();
6 jQuery('.error').hide().slideDown('slow');
7 jQuery('.flash').click(function() { jQuery(this).fadeOut('slow'); return false; });
8- jQuery('input.string').attr('size',50);
9+ jQuery('input.string').attr('size',20);
10 jQuery('textarea.text').attr('cols',50).attr('rows',10);
11 jQuery('input.integer').keyup(function(){this.value=this.value.reverse().replace(/[^0-9\-]|\-(?=.)/g,'').reverse();});
12 jQuery('input.double').keyup(function(){this.value=this.value.reverse().replace(/[^0-9\-\.]|[\-](?=.)|[\.](?=[0-9]*[\.])/g,'').reverse();});
13
14=== modified file 'views/layout.html'
15--- views/layout.html 2010-09-09 00:12:51 +0000
16+++ views/layout.html 2010-11-09 06:27:50 +0000
17@@ -68,12 +68,12 @@
18
19 <div class='colmask fullpage'>
20 <div class='col1'>
21- <div id='content' class='clearfix'>
22 {{if response.error:}}<div class='error'>{{=response.error}}</div>{{pass}}
23 {{if response.warning:}}<div class='warning'>{{=response.warning}}</div>{{pass}}
24 {{if response.information:}}<div class='information'>{{=response.information}}</div>{{pass}}
25 {{if response.confirmation:}}<div class='confirmation'>{{=response.confirmation}}</div>{{pass}}
26 {{if response.flash:}}<div class='confirmation'>{{=response.flash}}</div>{{pass}}
27+ <div id='content' class='clearfix'>
28 {{include}}
29 </div>
30 </div>