You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2009/05/21 10:24:16 UTC
svn commit: r777009 - in /ofbiz/branches/release09.04: ./
specialpurpose/myportal/script/org/ofbiz/myportal/
specialpurpose/myportal/webapp/myportal/WEB-INF/
specialpurpose/myportal/widget/ themes/bizznesstime/webapp/bizznesstime/css/
Author: hansbak
Date: Thu May 21 08:24:15 2009
New Revision: 777009
URL: http://svn.apache.org/viewvc?rev=777009&view=rev
Log:
merge from trunk 777004: make the myportal 'new registration' working in the business theme
Added:
ofbiz/branches/release09.04/specialpurpose/myportal/widget/RegisterPerson.ftl
- copied unchanged from r777004, ofbiz/trunk/specialpurpose/myportal/widget/RegisterPerson.ftl
ofbiz/branches/release09.04/specialpurpose/myportal/widget/reloadCaptchaCode.ftl
- copied unchanged from r777004, ofbiz/trunk/specialpurpose/myportal/widget/reloadCaptchaCode.ftl
ofbiz/branches/release09.04/specialpurpose/myportal/widget/reloadCaptchaImage.ftl
- copied unchanged from r777004, ofbiz/trunk/specialpurpose/myportal/widget/reloadCaptchaImage.ftl
Modified:
ofbiz/branches/release09.04/ (props changed)
ofbiz/branches/release09.04/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml
ofbiz/branches/release09.04/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml
ofbiz/branches/release09.04/specialpurpose/myportal/widget/CommonScreens.xml
ofbiz/branches/release09.04/themes/bizznesstime/webapp/bizznesstime/css/login.css
Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 21 08:24:15 2009
@@ -1 +1 @@
-/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922
+/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004
Modified: ofbiz/branches/release09.04/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml?rev=777009&r1=777008&r2=777009&view=diff
==============================================================================
--- ofbiz/branches/release09.04/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml (original)
+++ ofbiz/branches/release09.04/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml Thu May 21 08:24:15 2009
@@ -109,7 +109,7 @@
<!-- set parameter of userLogin to userLoginContext Map -->
<set field="userLoginContext.userLoginId" from-field="parameters.USERNAME"/>
-
+
<now-timestamp field="nowStamp"/>
<call-object-method obj-field="parameters.PASSWORD" method-name="toLowerCase" ret-field="parameters.PASSWORD"/>
<call-object-method obj-field="parameters.CONFIRM_PASSWORD" method-name="toLowerCase" ret-field="parameters.CONFIRM_PASSWORD"/>
@@ -172,20 +172,20 @@
<set field="emailParams.bodyScreenUri" from-field="storeEmail.bodyScreenLocation"/>
<set field="emailParams.webSiteId" from-field="webSite.webSiteId"/>
<set field="emailParams.emailType" from-field="storeEmail.emailType"/>
- <call-service service-name="sendMailFromScreen" in-map-name="emailParams"/>
-
+ <call-service service-name="sendMailFromScreen" in-map-name="emailParams"/>
+
<!-- Create Customer Request to show new registration-->
<set field="custRequest.custRequestTypeId" value="RF_SUPPORT"/>
<set field="custRequest.fromPartyId" from-field="partyId"/>
<set field="custRequest.custRequestName" value="New user account created by registration"/>
<set field="custRequest.productStoreId" from-field="webSite.productStoreId"/>
+ <set field="custRequest.statusId" value="CRQ_SUBMITTED"/>
<call-service service-name="createCustRequest" in-map-name="custRequest">
<result-to-field result-name="custRequestId"/>
</call-service>
<set field="custRequestItem.custRequestId" from-field="custRequestId"/>
<set field="custRequestItem.story" from-field="parameters.whyWouldYouLikeToRegister"/>
- <call-service service-name="createCustRequestItem" in-map-name="custRequestItem"/>
-
+ <call-service service-name="createCustRequestItem" in-map-name="custRequestItem"/>
<!-- set field to request -->
<field-to-request field="partyId" request-name="partyId"/>
<field-to-request field="emailPurposeContext.contactMechId" request-name="contactMechId"/>
Modified: ofbiz/branches/release09.04/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml?rev=777009&r1=777008&r2=777009&view=diff
==============================================================================
--- ofbiz/branches/release09.04/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml (original)
+++ ofbiz/branches/release09.04/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml Thu May 21 08:24:15 2009
@@ -46,9 +46,17 @@
<response name="error" type="view" value="newRegisterLogin"/>
<response name="resultPage" type="view" value="newRegisterLogin"/>
</request-map>
-
-
+ <request-map uri="reloadCaptchaImage">
+ <security https="true" auth="false"/>
+ <response name="success" type="view" value="reloadCaptchaImage"/>
+ </request-map>
+ <request-map uri="reloadCaptchaCode">
+ <security https="true" auth="false"/>
+ <response name="success" type="view" value="reloadCaptchaCode"/>
+ </request-map>
<view-map name="main" type="screen" page="component://common/widget/PortalPageScreens.xml#showPortalPage"/>
<view-map name="login" type="screen" page="component://myportal/widget/CommonScreens.xml#login"/>
- <view-map name="newRegisterLogin" type="screen" page="component://myportal/widget/CommonScreens.xml#newRegisterLogin"/>
+ <view-map name="newRegisterLogin" type="screen" page="component://myportal/widget/CommonScreens.xml#newRegisterLogin"/>
+ <view-map name="reloadCaptchaImage" type="screen" page="component://myportal/widget/CommonScreens.xml#reloadCaptchaImage"/>
+ <view-map name="reloadCaptchaCode" type="screen" page="component://myportal/widget/CommonScreens.xml#reloadCaptchaCode"/>
</site-conf>
Modified: ofbiz/branches/release09.04/specialpurpose/myportal/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/myportal/widget/CommonScreens.xml?rev=777009&r1=777008&r2=777009&view=diff
==============================================================================
--- ofbiz/branches/release09.04/specialpurpose/myportal/widget/CommonScreens.xml (original)
+++ ofbiz/branches/release09.04/specialpurpose/myportal/widget/CommonScreens.xml Thu May 21 08:24:15 2009
@@ -153,6 +153,9 @@
<!--New Register Person-->
<screen name="newRegisterLogin">
<section>
+ <actions>
+ <set field="layoutSettings.javaScripts[]" value="/images/dojo/dojo.js" global="true"/>
+ </actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
@@ -183,7 +186,10 @@
<set field="idKey" from-field="parameters.ID_KEY"/>
</actions>
<widgets>
- <include-form name="RegisterPerson" location="component://myportal/widget/MyPortalForms.xml"/>
+ <!--<include-form name="RegisterPerson" location="component://myportal/widget/MyPortalForms.xml"/> -->
+ <platform-specific><html>
+ <html-template location="component://myportal/widget/RegisterPerson.ftl"/></html>
+ </platform-specific>
</widgets>
</section>
</container>
@@ -208,4 +214,25 @@
</section>
</screen>
+ <screen name="reloadCaptchaImage">
+ <section>
+ <actions>
+ <property-map resource="MyPortalUiLabels" map-name="uiLabelMap" global="true"/>
+ </actions>
+ <widgets>
+ <platform-specific><html><html-template location="component://myportal/widget/reloadCaptchaImage.ftl"/></html></platform-specific>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="reloadCaptchaCode">
+ <section>
+ <actions>
+ <property-map resource="MyPortalUiLabels" map-name="uiLabelMap" global="true"/>
+ </actions>
+ <widgets>
+ <platform-specific><html><html-template location="component://myportal/widget/reloadCaptchaCode.ftl"/></html></platform-specific>
+ </widgets>
+ </section>
+ </screen>
</screens>
Modified: ofbiz/branches/release09.04/themes/bizznesstime/webapp/bizznesstime/css/login.css
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/themes/bizznesstime/webapp/bizznesstime/css/login.css?rev=777009&r1=777008&r2=777009&view=diff
==============================================================================
--- ofbiz/branches/release09.04/themes/bizznesstime/webapp/bizznesstime/css/login.css (original)
+++ ofbiz/branches/release09.04/themes/bizznesstime/webapp/bizznesstime/css/login.css Thu May 21 08:24:15 2009
@@ -85,10 +85,10 @@
background:#E7EFF5;
text-decoration: none;
color:#699BC9;
- height:22px;
+ height:18px;
display:block;
line-height:10px;
- padding:15px 0 0 10px;
+ padding:5px 0 0px 0;
font-size:11px;
}
a:hover {
@@ -102,7 +102,10 @@
***********************************************/
table {border-collapse: collapse; border-spacing: 0; margin: 0; width:100%}
caption {text-align: left;}
-th, td {padding: .25em .5em;}
+th, td {padding: .10em .5em;}
+td #RegisterPerson_salutation,#RegisterPerson_middleName {
+ margin-right:12%;
+}
tbody td, tbody th {}
tfoot {font-style: italic;}
@@ -137,11 +140,18 @@
input[type="text"],input[type="password"] {
border: #ddd solid 2px;
font-size: 1.1em;
- margin:5px 5px 5px 5px;
padding:2px 4px;
width:250px;
}
+input[type="password"] {
+ border: #ddd solid 2px;
+ font-size: 1.1em;
+ padding:2px 4px;
+ width:250px;
+
+}
+
input[type="submit"],input[type="button"],input[type="reset"] {
background-color: #ffffff;
border: #ddd solid 2px;
@@ -161,12 +171,13 @@
.label {
font-weight:bold;
- margin:0 4px 0 0;
+ margin:0 0 0 0;
text-align:right;
white-space:nowrap;
- width:1%;
+ width:40%;
}
+
input:focus,textarea:focus { border: 2px solid #6E2723; }
input.focused, textarea.focused { border: 2px solid #6E2723; }
@@ -179,12 +190,11 @@
body {
text-align:center;
- overflow:hidden;
+
}
#wrap {
margin: 0;
-
}
#header {
@@ -195,21 +205,13 @@
display:none;
}
-.contentarea {
- margin-left: -200px;
- position: absolute;
- top: 15%;
- left: 50%;
- width: 400px;
- height: 300px;
- overflow: visible;
-}
+
#column-container {
- width:400px;
+ width:700px;
margin:0 auto;
- padding:100px 0 0 0;
- background:url(../images/login-logo.gif) center 20px no-repeat;
+ padding:70px 0 0 0;
+ background:url(../images/login-logo.gif) center 5px no-repeat;
}
#content-main-section {
@@ -226,7 +228,8 @@
}
.screenlet-body {
- padding:10px;
+ text-align:center;
+ padding:2px;
}
#footer {
@@ -336,7 +339,7 @@
border: solid 5px #ddd;
padding: 5px;
}
-span#modal-close-btn{
+span #modal-close-btn{
color: red;
position: absolute;
right: 10px;
@@ -360,4 +363,4 @@
border: 0.2em solid #ff0000;
color: #ff0000;
font-weight: bold;
-}
\ No newline at end of file
+}