[Erp5-report] r43955 gabriel - in /erp5/trunk/bt5/erp5_web_ung_theme: SkinTemplateItem/port...
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Mar 3 21:57:02 CET 2011
Author: gabriel
Date: Thu Mar 3 21:57:02 2011
New Revision: 43955
URL: http://svn.erp5.org?rev=43955&view=rev
Log:
- Fix css
- Add new asserts
Modified:
erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_css/ung_theme.css.xml
erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml
erp5/trunk/bt5/erp5_web_ung_theme/TestTemplateItem/testUNG.py
erp5/trunk/bt5/erp5_web_ung_theme/bt/revision
Modified: erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_css/ung_theme.css.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_css/ung_theme.css.xml?rev=43955&r1=43954&r2=43955&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_css/ung_theme.css.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_css/ung_theme.css.xml [utf8] Thu Mar 3 21:57:02 2011
@@ -856,6 +856,7 @@ div#login-box {\n
margin: 0;\n
padding: 23px 23px 0 0;\n
float:right;\n
+ width: 23%;\n
}\n
\n
div#login-box input {\n
Modified: erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml?rev=43955&r1=43954&r2=43955&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml [utf8] Thu Mar 3 21:57:02 2011
@@ -117,12 +117,13 @@ function waitCreateUNGUser(paramStr){\n
});\n
}\n
\n
-function displayLoginForm(){\n
+function displayLoginForm(){ \n
$("a.ung_docs, img[alt=\'calendar_logo_box\'], table#create-new-user, img[alt=\'mail_logo_box\']").hide();\n
$("div.header-left div.field input, div.main-right, div.main-left").hide();\n
$.get("WebSection_loginDialog", function(data){\n
$("div.header-left fieldset.widget").append("<p>" + data + "</p>");\n
$("td#new-account-form").click(function(event){\n
+ $("div#login-box").css("width", "30%");\n
$("table#field_table, table#new-account-table").hide();\n
$("table#create-new-user input[type=\'text\'], table#create-new-user input[type=\'password\']").each(function(){\n
$(this).attr("value", "");\n
@@ -469,6 +470,7 @@ $().ready(function(){\n
displayLoginForm();\n
}\n
if ($("table#create-new-user").css("display") != "none"){\n
+ $("div#login-box").css("width", "23%");\n
$("table#create-new-user").hide();\n
$("table#field_table, table#new-account-table").show();\n
}\n
Modified: erp5/trunk/bt5/erp5_web_ung_theme/TestTemplateItem/testUNG.py
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/TestTemplateItem/testUNG.py?rev=43955&r1=43954&r2=43955&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/TestTemplateItem/testUNG.py [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/TestTemplateItem/testUNG.py [utf8] Thu Mar 3 21:57:02 2011
@@ -283,7 +283,7 @@ class TestUNG(ERP5TypeTestCase):
lastname="User",
email="g at g.com",
password="ung_password",
- reference="ung_user")
+ login_name="ung_user")
self.portal.REQUEST.form.update(form_dict)
self.portal.ERPSite_createUNGUser()
self.stepTic()
@@ -293,6 +293,7 @@ class TestUNG(ERP5TypeTestCase):
self.assertEquals(person.getValidationState(), "validated")
self.assertEquals(person.getEmail().getPortalType(), "Email")
self.assertEquals(person.getEmailText(), "g at g.com")
+ self.assertEquals(person.getReference(), "ung_user")
def testERP5Site_getUserValidationState(self):
"""Test script ERP5Site_getUserValidationState"""
@@ -300,11 +301,12 @@ class TestUNG(ERP5TypeTestCase):
form_dict = dict(firstname="UNG",
lastname="User",
email="g at g.com",
- reference="ung_reference")
+ login_name="ung_reference")
portal.REQUEST.form.update(form_dict)
portal.ERPSite_createUNGUser()
kw = dict(first_name=form_dict["firstname"],
last_name=form_dict["lastname"],
+ reference=form_dict["login_name"],
)
response = json.loads(portal.ERP5Site_getUserValidationState(**kw))
self.assertEquals(response.get("response"), False)
@@ -315,4 +317,7 @@ class TestUNG(ERP5TypeTestCase):
reference="no_reference",
)
response = json.loads(portal.ERP5Site_getUserValidationState(**kw))
- self.assertEquals(response.get("response"), False)
\ No newline at end of file
+ self.assertEquals(response.get("response"), False)
+ self.login("ung_reference")
+ user = portal.ERP5Site_getAuthenticatedMemberPersonValue()
+ self.assertEquals(user.getFirstName(), "UNG")
\ No newline at end of file
Modified: erp5/trunk/bt5/erp5_web_ung_theme/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/bt/revision?rev=43955&r1=43954&r2=43955&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/bt/revision [utf8] Thu Mar 3 21:57:02 2011
@@ -1 +1 @@
-271
\ No newline at end of file
+272
\ No newline at end of file
More information about the Erp5-report
mailing list