Menu
▾
▴
[Vlab-commit] SF.net SVN: vlab:[1192] trunk/vlab/portal/input-portlet/src/main/webapp/ pages/single-calc
|
From: <das...@us...> - 2008-10-29 22:38:34
|
Revision: 1192
http://vlab.svn.sourceforge.net/vlab/?rev=1192&view=rev
Author: dasil014
Date: 2008-10-29 22:38:31 +0000 (Wed, 29 Oct 2008)
Log Message:
-----------
Changed option of spin polarized and start magnetization. Now the user has an option to define spin polarized and start magnetization for every component.
Modified Paths:
--------------
trunk/vlab/portal/input-portlet/src/main/webapp/pages/single-calc/step1.jsp
trunk/vlab/portal/input-portlet/src/main/webapp/pages/single-calc/step2.jsp
trunk/vlab/portal/input-portlet/src/main/webapp/pages/single-calc/step3.jsp
Modified: trunk/vlab/portal/input-portlet/src/main/webapp/pages/single-calc/step1.jsp
===================================================================
--- trunk/vlab/portal/input-portlet/src/main/webapp/pages/single-calc/step1.jsp 2008-10-29 22:28:17 UTC (rev 1191)
+++ trunk/vlab/portal/input-portlet/src/main/webapp/pages/single-calc/step1.jsp 2008-10-29 22:38:31 UTC (rev 1192)
@@ -79,13 +79,29 @@
value="#{PwscfInputManager.inputBean.nat}"
required="true" />
+
+ <h:outputText value="Spin polarized" />
+ <h:selectBooleanCheckbox id="spinpolarized" value="#{PwscfInputManager.inputBean.spinpolarized}" />
+
+ <h:outputText value="" />
+ <h:outputText value="you may change these values later" />
+ </h:panelGrid>
+
+
+
+ <%--h:panelGrid width="100%" columns="2"
+ styleClass="container"
+ footerClass="right_footer"
+ rowClasses="cell_gray, cell_white">
+
+ </h:panelGrid>
+
<f:facet name="footer">
<h:panelGroup>
<h:outputText value="you may change these values later" />
</h:panelGroup>
- </f:facet>
+ </f:facet--%>
- </h:panelGrid>
<f:verbatim><br></f:verbatim>
Modified: trunk/vlab/portal/input-portlet/src/main/webapp/pages/single-calc/step2.jsp
===================================================================
--- trunk/vlab/portal/input-portlet/src/main/webapp/pages/single-calc/step2.jsp 2008-10-29 22:28:17 UTC (rev 1191)
+++ trunk/vlab/portal/input-portlet/src/main/webapp/pages/single-calc/step2.jsp 2008-10-29 22:38:31 UTC (rev 1192)
@@ -25,6 +25,20 @@
textbox.disabled = false;
}
}
+
+ function ldaPlusUChanged(objid){
+
+
+ if ( returnObjById(objid).checked == true ) {
+ returnObjById('step2:ldaplusu').disabled = false;
+ } else {
+ returnObjById('step2:ldaplusu').disabled = true;
+ }
+
+
+ }
+
+
/**
* A function that refreshes the 'step2' form, when the pseudo-potentials have
* been uploaded.
@@ -164,7 +178,7 @@
styleClass="imperceptible container" footerClass="right_footer"
columnClasses="align_left">
- <f:facet name="footer">
+ <%--f:facet name="footer">
<h:panelGroup>
<h:inputText
id="ntyp"
@@ -174,10 +188,10 @@
onchange="findParentForm(this).submit()"/>
<h:outputText value="atom types" />
</h:panelGroup>
- </f:facet>
+ </f:facet--%>
<h:panelGroup>
- <h:outputText value="Select pseudo-potentials by..." styleClass="instruction"/>
+ <h:outputText value="Add pseudo-potentials to your project, either by..." styleClass="instruction"/>
<h:outputText value="<ul><li class=indented>" escape="false"/>
<h:commandButton value="searching public repository"
@@ -196,6 +210,13 @@
type="button" />
<h:outputText value="</ul>" escape="false"/>
</h:panelGroup>
+
+ <h:panelGrid width="100%" columns="2" columnClasses="align_right">
+ <h:panelGroup>
+ <h:inputText id="ntyp" value="#{PwscfInputManager.inputBean.ntyp}" size="1" onchange="findParentForm(this).submit()" styleClass="right"/>
+ <h:outputText value=" atom types" styleClass="right"/>
+ </h:panelGroup>
+ </h:panelGrid>
<h:dataTable value="#{PwscfInputManager.inputBean.species}" var="species" id="aSpecies" width="100%" border="0" rowClasses="cell_white, cell_gray" headerClass="cell_header_gray">
<h:column>
@@ -225,7 +246,39 @@
<f:selectItems value="#{PwscfInputManager.files}" />
</h:selectOneMenu>
</h:column>
+
+
+
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="Start Magnetization" />
+ </f:facet>
+
+ <h:inputText id="mmagnetization" size="6" value="#{species.magnetization}" disabled="{#PwscfInputManager.inputBean.spinpolarized}" />
+ </h:column>
+
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="LDA + U" />
+ </f:facet>
+
+ <h:selectBooleanCheckbox id="ldau" value="#{species.ldau}" onclick="javascript:ldaPlusUChanged(this)"/>
+ </h:column>
+
+
</h:dataTable>
+
+
+ <f:verbatim><br></f:verbatim>
+
+ <h:panelGroup>
+
+ <h:outputText value="LDA + U" />
+ <h:inputText id="ldaplusu" value="#{PwscfInputManager.inputBean.ldaSpecies}" disabled="#{species.ldau}"/>
+
+ </h:panelGroup>
+
+
</h:panelGrid>
<f:verbatim><br></f:verbatim>
Modified: trunk/vlab/portal/input-portlet/src/main/webapp/pages/single-calc/step3.jsp
===================================================================
--- trunk/vlab/portal/input-portlet/src/main/webapp/pages/single-calc/step3.jsp 2008-10-29 22:28:17 UTC (rev 1191)
+++ trunk/vlab/portal/input-portlet/src/main/webapp/pages/single-calc/step3.jsp 2008-10-29 22:38:31 UTC (rev 1192)
@@ -19,16 +19,7 @@
}
}
- function ldaPlusUChanged() {
- if ( returnObjById('step3:ldaPlusU').checked == true ) {
- returnObjById('step3:ldaSpecies').disabled = false;
- } else {
- returnObjById('step3:ldaSpecies').disabled = true;
- returnObjById('step3:ldaSpecies').value = "";
- hideBlockDisplay( 'step3:hubbardTbl' );
- }
- }
-
+
function magnetizationSpeciesChanged() {
returnObjById('step3:focusElement').value="step3:magnetizationTbl";
@@ -36,13 +27,6 @@
returnObjById('step3').submit();
}
- function ldaSpeciesChanged() {
- returnObjById('step3:focusElement').value="step3:hubbardTbl";
-
- // submit the form
- returnObjById('step3').submit();
- }
-
function initialize() {
initialize_disabled();
determineFocus();
@@ -126,7 +110,7 @@
// End -->
</script>
</head>
-<body onload="javascript:initialize()">
+<body onLoad="javascript:initialize()">
<f:view>
<h:form id="step3">
@@ -329,9 +313,8 @@
<h:outputText escape="false" value="<br>" />
</h:panelGrid>
- <h:panelGrid width="100%" columns="1" styleClass="imperceptible container">
+ <%--h:panelGrid width="100%" columns="1" styleClass="imperceptible container">
-
<h:panelGrid width="100%" styleClass="speciesTbl" columns="4"
columnClasses="chkbox_cell, name_cell, lbl_cell, data_cell"
rowClasses="cell_gray, cell_white">
@@ -348,9 +331,9 @@
value="#{PwscfInputManager.inputBean.magnetizationSpecies}"
onchange="magnetizationSpeciesChanged()"/>
- </h:panelGrid>
+ </h:panelGrid--%>
- <h:dataTable value="#{PwscfInputManager.inputBean.startingMagnetization}"
+ <%--h:dataTable value="#{PwscfInputManager.inputBean.startingMagnetization}"
id="magnetizationTbl" var="magnetization"
styleClass="magnetizationTbl"
rowClasses="cell_white, cell_gray" headerClass="field, cell_header_gray"
@@ -370,26 +353,8 @@
<h:inputText value="#{magnetization.value}"/>
</h:column>
- </h:dataTable>
+ </h:dataTable--%>
- <h:panelGrid width="100%" styleClass="speciesTbl" columns="4"
- columnClasses="chkbox_cell, name_cell, lbl_cell, data_cell"
- rowClasses="cell_gray, cell_white">
-
- <h:selectBooleanCheckbox id="ldaPlusU"
- value="#{PwscfInputManager.inputBean.ldaPlusU}"
- onclick="javascript:ldaPlusUChanged()" />
- <h:outputText value="LDA + U" />
-
- <h:outputText value="# of species" />
- <h:inputText
- id="ldaSpecies"
- value="#{PwscfInputManager.inputBean.ldaSpecies}"
- valueChangeListener="#{PwscfInputManager.listSizeHandler.updateSize}"
- onchange="ldaSpeciesChanged()" />
-
- </h:panelGrid>
-
<h:dataTable value="#{PwscfInputManager.inputBean.hubbard}"
id="hubbardTbl" var="hubbard"
styleClass="hubbardTbl"
@@ -474,7 +439,7 @@
<h:outputText value="<br>" escape="false" />
<h:outputText value="<br>" escape="false" />
</h:panelGrid>
- </h:panelGrid>
+
<h:outputText escape="false" value="<br>" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
