dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #11976
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 3526: Sending support for using bulksms as sms service provider
------------------------------------------------------------
revno: 3526
committer: Saptarshi <sunbiz@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2011-05-06 22:21:40 +0200
message:
Sending support for using bulksms as sms service provider
removed:
dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-mobile/
dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-mobile/css/
dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-mobile/css/StylesForTags.css
dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-mobile/css/receiveImportPage.css
dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-mobile/css/stylesForReports.css
dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-mobile/images/
dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-mobile/images/intro.png
dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-mobile/javascript/
dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-mobile/javascript/user.js
dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-mobile/menu.vm
dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-mobile/mobileImportingResult.vm
dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-mobile/mobileSettingsPage.vm
dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-mobile/receiveImportPage.vm
dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-mobile/sendSMSPage.vm
dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-mobile/welcome.vm
added:
dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-sms/
dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-sms/css/
dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-sms/css/StylesForTags.css
dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-sms/css/receiveImportPage.css
dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-sms/css/stylesForReports.css
dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-sms/images/
dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-sms/images/intro.png
dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-sms/javascript/
dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-sms/javascript/user.js
dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-sms/menu.vm
dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-sms/mobileImportingResult.vm
dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-sms/mobileSettingsPage.vm
dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-sms/receiveImportPage.vm
dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-sms/sendSMSPage.vm
dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-sms/welcome.vm
modified:
dhis-mobile/dhis-service-sms/src/main/java/org/hisp/dhis/mobile/sms/SmsService.java
dhis-mobile/dhis-web-sms/src/main/java/org/hisp/dhis/mobile/action/MobileSettingsAction.java
dhis-mobile/dhis-web-sms/src/main/resources/META-INF/dhis/beans.xml
dhis-mobile/dhis-web-sms/src/main/resources/struts.xml
dhis-mobile/dhis-web-sms/src/main/webapp/WEB-INF/web.xml
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-mobile/dhis-service-sms/src/main/java/org/hisp/dhis/mobile/sms/SmsService.java'
--- dhis-mobile/dhis-service-sms/src/main/java/org/hisp/dhis/mobile/sms/SmsService.java 2011-05-06 14:31:30 +0000
+++ dhis-mobile/dhis-service-sms/src/main/java/org/hisp/dhis/mobile/sms/SmsService.java 2011-05-06 20:21:40 +0000
@@ -60,6 +60,7 @@
import org.smslib.Service;
import org.smslib.TimeoutException;
import org.smslib.helper.Logger;
+import org.smslib.http.BulkSmsHTTPGateway;
import org.smslib.modem.SerialModemGateway;
/*
@@ -528,57 +529,67 @@
break;
}
String modemName = propValue.split( "\\," )[0].trim();
- String port = getProperties().getProperty( modemName + ".port" );
- int baudRate = Integer.parseInt( getProperties().getProperty( modemName + ".baudrate" ) );
- String manufacturer = getProperties().getProperty( modemName + ".manufacturer" );
- String model = getProperties().getProperty( modemName + ".model" );
- String protocol = getProperties().getProperty( modemName + ".protocol" );
- String pin = getProperties().getProperty( modemName + ".pin" );
- String inbound = getProperties().getProperty( modemName + ".inbound" );
- String outbound = getProperties().getProperty( modemName + ".outbound" );
- String simMemLocation = getProperties().getProperty( modemName + ".simMemLocation" );
-
- // TODO: DETECT MODEM CLASS AND INSTANTIATE
- SerialModemGateway gateway = new SerialModemGateway( modemName, port, baudRate, manufacturer, model );
-
- if ( simMemLocation != null && !simMemLocation.equals( "-" ) )
- {
- gateway.getATHandler().setStorageLocations( simMemLocation );
- }
-
- if ( protocol != null && protocol.equalsIgnoreCase( "PDU" ) )
- {
- gateway.setProtocol( Protocols.PDU );
+ if ( modemName.contains( "bulksms" ) )
+ {
+ String username = getProperties().getProperty( "bulksms.username" );
+ String password = getProperties().getProperty( "bulksms.password" );
+ BulkSmsHTTPGateway gateway = new BulkSmsHTTPGateway("bulksms.http.1", username, password);
+ gateway.setOutbound( true );
+ Service.getInstance().addGateway( gateway );
} else
{
- if ( protocol != null && protocol.equalsIgnoreCase( "TEXT" ) )
+ String port = getProperties().getProperty( modemName + ".port" );
+ int baudRate = Integer.parseInt( getProperties().getProperty( modemName + ".baudrate" ) );
+ String manufacturer = getProperties().getProperty( modemName + ".manufacturer" );
+ String model = getProperties().getProperty( modemName + ".model" );
+ String protocol = getProperties().getProperty( modemName + ".protocol" );
+ String pin = getProperties().getProperty( modemName + ".pin" );
+ String inbound = getProperties().getProperty( modemName + ".inbound" );
+ String outbound = getProperties().getProperty( modemName + ".outbound" );
+ String simMemLocation = getProperties().getProperty( modemName + ".simMemLocation" );
+
+ // TODO: DETECT MODEM CLASS AND INSTANTIATE
+ SerialModemGateway gateway = new SerialModemGateway( modemName, port, baudRate, manufacturer, model );
+
+ if ( simMemLocation != null && !simMemLocation.equals( "-" ) )
{
- gateway.setProtocol( Protocols.TEXT );
+ gateway.getATHandler().setStorageLocations( simMemLocation );
+ }
- } else
+ if ( protocol != null && protocol.equalsIgnoreCase( "PDU" ) )
{
gateway.setProtocol( Protocols.PDU );
- }
- }
- if ( pin != null )
- {
- gateway.setSimPin( pin );
- }
- if ( inbound.equalsIgnoreCase( "yes" ) )
- {
- gateway.setInbound( true );
- } else
- {
- gateway.setInbound( false );
- }
- if ( outbound.equalsIgnoreCase( "yes" ) )
- {
- gateway.setOutbound( true );
- } else
- {
- gateway.setOutbound( false );
- }
- Service.getInstance().addGateway( gateway );
+ } else
+ {
+ if ( protocol != null && protocol.equalsIgnoreCase( "TEXT" ) )
+ {
+ gateway.setProtocol( Protocols.TEXT );
+
+ } else
+ {
+ gateway.setProtocol( Protocols.PDU );
+ }
+ }
+ if ( pin != null )
+ {
+ gateway.setSimPin( pin );
+ }
+ if ( inbound.equalsIgnoreCase( "yes" ) )
+ {
+ gateway.setInbound( true );
+ } else
+ {
+ gateway.setInbound( false );
+ }
+ if ( outbound.equalsIgnoreCase( "yes" ) )
+ {
+ gateway.setOutbound( true );
+ } else
+ {
+ gateway.setOutbound( false );
+ }
+ Service.getInstance().addGateway( gateway );
+ }
Logger.getInstance().logInfo( "Load Configuration: added gateway " + i + " / ", null, null );
} catch ( Exception e )
{
=== modified file 'dhis-mobile/dhis-web-sms/src/main/java/org/hisp/dhis/mobile/action/MobileSettingsAction.java'
--- dhis-mobile/dhis-web-sms/src/main/java/org/hisp/dhis/mobile/action/MobileSettingsAction.java 2011-05-06 14:31:30 +0000
+++ dhis-mobile/dhis-web-sms/src/main/java/org/hisp/dhis/mobile/action/MobileSettingsAction.java 2011-05-06 20:21:40 +0000
@@ -76,7 +76,31 @@
{
props.setProperty( "gateway.0", gatewayName );
}
-
+
+ private String bulksmsUsername;
+
+ public String getBulksmsUsername()
+ {
+ return props.getProperty( "bulksms.username" );
+ }
+
+ public void setBulksmsUsername( String bulksmsUsername )
+ {
+ props.setProperty( "bulksms.username", bulksmsUsername );
+ }
+
+ private String bulksmsPassword;
+
+ public String getBulksmsPassword()
+ {
+ return props.getProperty( "bulksms.password" );
+ }
+
+ public void setBulksmsPassword( String bulksmsPassword )
+ {
+ props.setProperty( "bulksms.password", bulksmsPassword );
+ }
+
private String port;
public String getPort()
@@ -277,6 +301,8 @@
props.setProperty( "smsserver.balancer", "RoundRobinLoadBalancer" );
props.setProperty( "smsserver.router", "NumberPoolRouter" );
props.setProperty( "gateway.0", "modem1, SerialModem" );
+ props.setProperty( "bulksms.username", "" );
+ props.setProperty( "bulksms.password", "" );
props.setProperty( "modem1.port", "COM1" );
props.setProperty( "modem1.baudrate", "57600" );
props.setProperty( "modem1.manufacturer", "Generic" );
=== modified file 'dhis-mobile/dhis-web-sms/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-mobile/dhis-web-sms/src/main/resources/META-INF/dhis/beans.xml 2011-05-06 14:31:30 +0000
+++ dhis-mobile/dhis-web-sms/src/main/resources/META-INF/dhis/beans.xml 2011-05-06 20:21:40 +0000
@@ -15,54 +15,10 @@
<property name="smsImportService" ref="org.hisp.dhis.mobile.sms.api.SmsImportService"/>
</bean>
-<!-- Inbox -->
- <bean id="org.hisp.dhis.mobile.action.ReceiveMessagesPageAction"
- class="org.hisp.dhis.mobile.action.ReceiveMessagesPageAction"
- scope="prototype">
- <property name="smsService" ref="org.hisp.dhis.mobile.sms.SmsService" />
- <property name="mobileImportService" ref="org.hisp.dhis.mobile.api.MobileImportService"/>
- </bean>
-<!-- Draft -->
- <bean id="org.hisp.dhis.mobile.action.DraftPageAction"
- class="org.hisp.dhis.mobile.action.DraftPageAction"
- scope="prototype">
- <property name="smsService" ref="org.hisp.dhis.mobile.SmsService" />
- <property name="sendSMSService" ref="org.hisp.dhis.mobile.api.SendSMSService"/>
- </bean>
-
- <bean id="org.hisp.dhis.mobile.app.action.CreateMobileAppAction"
- class="org.hisp.dhis.mobile.app.action.CreateMobileAppAction"
- scope="prototype">
- <property name="dataSetService" ref="org.hisp.dhis.dataset.DataSetService" />
- <property name="periodService" ref="org.hisp.dhis.period.PeriodService" />
- </bean>
-
- <bean id="org.hisp.dhis.mobile.app.action.GetDataElementsAction"
- class="org.hisp.dhis.mobile.app.action.GetDataElementsAction"
- scope="prototype">
- <property name="dataSetService" ref="org.hisp.dhis.dataset.DataSetService" />
- </bean>
-
- <bean id="org.hisp.dhis.mobile.app.action.SplashUploadAction"
- class="org.hisp.dhis.mobile.app.action.SplashUploadAction"
- scope="prototype">
- </bean>
-
- <bean id="org.hisp.dhis.mobile.app.action.JarGeneratorAction"
- class="org.hisp.dhis.mobile.app.action.JarGeneratorAction"
- scope="prototype">
- </bean>
-
<bean id="org.hisp.dhis.mobile.action.SendSMSAction"
class="org.hisp.dhis.mobile.action.SendSMSAction"
scope="prototype">
<property name="smsService" ref="org.hisp.dhis.mobile.sms.SmsService" />
</bean>
- <bean id="org.hisp.dhis.mobile.action.SendOtaAction"
- class="org.hisp.dhis.mobile.action.SendOtaAction"
- scope="prototype">
- <property name="smsService" ref="org.hisp.dhis.mobile.SmsService" />
- </bean>
-
</beans>
=== modified file 'dhis-mobile/dhis-web-sms/src/main/resources/struts.xml'
--- dhis-mobile/dhis-web-sms/src/main/resources/struts.xml 2011-05-06 14:31:30 +0000
+++ dhis-mobile/dhis-web-sms/src/main/resources/struts.xml 2011-05-06 20:21:40 +0000
@@ -5,89 +5,36 @@
<struts>
<!-- use the DHIS web portal default -->
<include file="dhis-web-commons.xml"/>
- <package name="dhis-web-mobile" extends="dhis-web-commons"
- namespace="/dhis-web-mobile">
+ <package name="dhis-web-sms" extends="dhis-web-commons"
+ namespace="/dhis-web-sms">
<!-- Pages -->
<action name="index"
class="org.hisp.dhis.mobile.action.MobileHomePageAction">
<result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-mobile/welcome.vm</param>
- <param name="menu">/dhis-web-mobile/menu.vm</param>
+ <param name="page">/dhis-web-sms/welcome.vm</param>
+ <param name="menu">/dhis-web-sms/menu.vm</param>
</action>
<action name="receiveImport"
class="org.hisp.dhis.mobile.action.ReceiveImportPageAction">
<result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-mobile/receiveImportPage.vm</param>
- <param name="menu">/dhis-web-mobile/menu.vm</param>
+ <param name="page">/dhis-web-sms/receiveImportPage.vm</param>
+ <param name="menu">/dhis-web-sms/menu.vm</param>
<param name="stylesheets">css/receiveImportPage.css</param>
</action>
<action name="sendSMS" class="org.hisp.dhis.mobile.action.SendSMSAction">
<result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-mobile/sendSMSPage.vm</param>
- <param name="menu">/dhis-web-mobile/menu.vm</param>
- <param name="requiredAuthorities">F_MOBILE_SENDSMS</param>
- </action>
- <action name="sendOta" class="org.hisp.dhis.mobile.action.SendOtaAction">
- <result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-mobile/sendOtaPage.vm</param>
- <param name="menu">/dhis-web-mobile/menu.vm</param>
+ <param name="page">/dhis-web-sms/sendSMSPage.vm</param>
+ <param name="menu">/dhis-web-sms/menu.vm</param>
<param name="requiredAuthorities">F_MOBILE_SENDSMS</param>
</action>
<action name="mobileSettings"
class="org.hisp.dhis.mobile.action.MobileSettingsAction">
<result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-mobile/mobileSettingsPage.vm</param>
- <param name="menu">/dhis-web-mobile/menu.vm</param>
+ <param name="page">/dhis-web-sms/mobileSettingsPage.vm</param>
+ <param name="menu">/dhis-web-sms/menu.vm</param>
<param name="requiredAuthorities">F_MOBILE_SETTINGS</param>
</action>
- <action name="receiveAllMessages"
- class="org.hisp.dhis.mobile.action.ReceiveMessagesPageAction">
- <result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-mobile/inbox.vm</param>
- <param name="menu">/dhis-web-mobile/menu.vm</param>
- <param name="stylesheets">css/receiveImportPage.css</param>
- </action>
-
- <action name="getAllDraftMessages"
- class="org.hisp.dhis.mobile.action.DraftPageAction">
- <result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-mobile/draft.vm</param>
- <param name="menu">/dhis-web-mobile/menu.vm</param>
- <param name="stylesheets">css/receiveImportPage.css</param>
- </action>
-
-
- <!-- Create Mobile Application -->
- <action name="createMobileApp"
- class="org.hisp.dhis.mobile.app.action.CreateMobileAppAction">
- <result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-mobile/createMobileAppPage.vm</param>
- <param name="menu">/dhis-web-mobile/menu.vm</param>
- </action>
-
- <action name="getDataElements"
- class="org.hisp.dhis.mobile.app.action.GetDataElementsAction">
- <result name="success" type="velocity">
- /dhis-web-mobile/dataElementsResponse.vm</result>
- <param name="onExceptionReturn">plainTextError</param>
- </action>
-
- <action name="splashUpload"
- class="org.hisp.dhis.mobile.app.action.SplashUploadAction">
- <result name="success" type="velocity">
- /dhis-web-mobile/splashUploadResponse.vm</result>
- <param name="onExceptionReturn">plainTextError</param>
- <interceptor-ref name="fileUploadStack">
- <param name="allowedTypes">image/png</param>
- </interceptor-ref>
- </action>
-
- <action name="jarGenerator"
- class="org.hisp.dhis.mobile.app.action.JarGeneratorAction">
- <result name="success" type="chain">createMobileApp</result>
- </action>
-
</package>
</struts>
\ No newline at end of file
=== modified file 'dhis-mobile/dhis-web-sms/src/main/webapp/WEB-INF/web.xml'
--- dhis-mobile/dhis-web-sms/src/main/webapp/WEB-INF/web.xml 2011-05-06 14:31:30 +0000
+++ dhis-mobile/dhis-web-sms/src/main/webapp/WEB-INF/web.xml 2011-05-06 20:21:40 +0000
@@ -18,7 +18,7 @@
<filter-class>org.hisp.dhis.servlet.filter.HttpRedirectFilter</filter-class>
<init-param>
<param-name>redirectPath</param-name>
- <param-value>dhis-web-mobile/index.action</param-value>
+ <param-value>dhis-web-sms/index.action</param-value>
</init-param>
</filter>
<filter>
=== removed directory 'dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-mobile'
=== removed directory 'dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-mobile/css'
=== removed file 'dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-mobile/css/StylesForTags.css'
--- dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-mobile/css/StylesForTags.css 2011-05-06 14:31:30 +0000
+++ dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-mobile/css/StylesForTags.css 1970-01-01 00:00:00 +0000
@@ -1,56 +0,0 @@
-.Heading {
- font-family: times,arial, georgia, tahoma;
- font-size: 35px;
- font-weight: bold;
- white-space: nowrap;
- cursor: default;
-}
-
-.Normal {
- font-family: arial, georgia, tahoma;
- font-size: 10px;
- white-space: nowrap;
- cursor: default;
- text-align: center;
-}
-
-.NormalB {
- font-family: arial, georgia, tahoma;
- font-size: 13px;
- font-weight: bold;
- white-space: nowrap;
- cursor: default;
-}
-
-.TableDataCellStyles {
- font-family: arial, georgia, tahoma;
- font-size: 10px;
- white-space: nowrap;
- cursor: default;
- text-align: center;
- border:1px dotted #C0C0C0;
-}
-
-.TableHeadingCellStyles {
- font-family: arial, georgia, tahoma;
- font-size: 11px;
- white-space: nowrap;
- cursor: default;
-}
-
-.DefaultFontStyles {
- font-family: arial, georgia, tahoma;
- font-size: 13px;
- font-weight: bold;
- white-space: nowrap;
- cursor: default;
-}
-
-.DefaultFontStylesNoBold {
- font-family: arial, georgia, tahoma;
- font-size: 13px;
- white-space: nowrap;
- cursor: default;
-}
-
-
=== removed file 'dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-mobile/css/receiveImportPage.css'
--- dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-mobile/css/receiveImportPage.css 2011-05-06 14:31:30 +0000
+++ dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-mobile/css/receiveImportPage.css 1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-.header{
- color: white;
- padding: 5px 5px;
- margin: -16px 0 0 -20px;
- font-weight: bold;
- background-color: #8FABC7;
-}
-.box{
- position:relative;
- border: 1px solid #8FABC7;
- padding: 5px 5px;
- margin-left: -20px;
-}
-.mainTable{
- width: 100%;
- border-collapse: collapse;
-}
-.mainTable th{
- border: 1px solid #C3C3C3;
- padding: 3px;
- vertical-align: top;
-}
-.mainTable td{
- border: 1px solid #C3C3C3;
- padding: 3px;
- vertical-align: top;
-}
\ No newline at end of file
=== removed file 'dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-mobile/css/stylesForReports.css'
--- dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-mobile/css/stylesForReports.css 2011-05-06 14:31:30 +0000
+++ dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-mobile/css/stylesForReports.css 1970-01-01 00:00:00 +0000
@@ -1,74 +0,0 @@
-
-
-.reportheading {
- font-family: arial, georgia, tahoma;
- font-size: 17px;
- font-weight: bold;
- white-space: nowrap;
- cursor: default;
-}
-
-.reportheadingwithunderline {
- font-family: arial, georgia, tahoma;
- font-size: 13px;
- font-weight: bold;
- white-space: nowrap;
- cursor: default;
-}
-
-.reportsubheading {
- font-family: arial, georgia, tahoma;
- font-size: 15px;
- font-weight: bold;
- white-space: nowrap;
- cursor: default;
-}
-
-.tableheading1 {
- font-family: arial, georgia, tahoma;
- font-size: 13px;
- font-weight: bold;
- cursor: default;
-}
-
-.tabledata1 {
- font-family: arial, georgia, tahoma;
- font-size: 12px;
- cursor: default;
-}
-
-.tableheading2 {
- font-family: arial, georgia, tahoma;
- font-size: 10px;
- font-weight: bold;
- cursor: default;
-}
-
-.tabledata2 {
- font-family: arial, georgia, tahoma;
- font-size: 10px;
- cursor: default;
-}
-
-#dropmenudiv{
- position:absolute;
- border:1px solid black;
- border-bottom-width: 0;
- font:normal 12px Verdana;
- line-height:18px;
- z-index:100;
- }
-
- #dropmenudiv a{
- width: 100%;
- display: block;
- text-indent: 3px;
- border-bottom: 1px solid black;
- padding: 1px 0;
- text-decoration: none;
- font-weight: bold;
- }
-
- #dropmenudiv a:hover{ /*hover background color*/
- background-color: yellow;
- }
=== removed directory 'dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-mobile/images'
=== removed file 'dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-mobile/images/intro.png'
Binary files dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-mobile/images/intro.png 2011-05-06 14:31:30 +0000 and dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-mobile/images/intro.png 1970-01-01 00:00:00 +0000 differ
=== removed directory 'dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-mobile/javascript'
=== removed file 'dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-mobile/javascript/user.js'
--- dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-mobile/javascript/user.js 2011-05-06 14:31:30 +0000
+++ dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-mobile/javascript/user.js 1970-01-01 00:00:00 +0000
@@ -1,54 +0,0 @@
-function removeUserGroup( userGroupId, userGroupName )
-{
- removeItem( userGroupId, userGroupName, i18n_confirm_delete, "removeUserGroup.action" );
-}
-
-function showUserGroupDetails( userGroupId )
-{
- var request = new Request();
- request.setResponseTypeXML( 'userGroup' );
- request.setCallbackSuccess( userGroupReceived );
- request.send( 'getUserGroup.action?userGroupId=' + userGroupId );
-}
-
-function userGroupReceived( userGroupElement )
-{
- setInnerHTML( 'nameField', getElementValue( userGroupElement, 'name' ) );
- setInnerHTML( 'idField', getElementValue( userGroupElement, 'id' ) );
- setInnerHTML( 'noOfGroupField', getElementValue( userGroupElement, 'noOfUsers' ) );
-
- showDetails();
-}
-
-function addValidation ()
-{
- var k =0 ;
- var xyz=document.getElementById("name");
- var abc =document.getElementById("groupMembers");
- var c = abc.length ;
- if( xyz.value == "") {
- alert ("please select name ");
- return false;
- }
- else if ( c <=0 ){
- alert("please select at least one member");
- return false ;
- }else
- if (c >0 )
- {
- for( k =0;k<=c;k++)
- {
- abc.options[k].selected = true ;
-
- }
- }
-
- return true;
-}
-
-function editValidation ()
-{
-alert("dev");
-}
-
-
=== removed file 'dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-mobile/menu.vm'
--- dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-mobile/menu.vm 2011-05-06 14:31:30 +0000
+++ dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-mobile/menu.vm 1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-<h2>DHIS Mobile</h2>
-<ul>
- <li><a href = "receiveImport.action">Receive Data and Import</a></li>
- <li><a href = "sendSMS.action">Send SMS</a></li>
- <li><a href = "mobileSettings.action">Settings</a></li>
-</ul>
\ No newline at end of file
=== removed file 'dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-mobile/mobileImportingResult.vm'
--- dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-mobile/mobileImportingResult.vm 2011-05-06 14:31:30 +0000
+++ dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-mobile/mobileImportingResult.vm 1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-
-<div align="center">
-$importStatus
-</div>
\ No newline at end of file
=== removed file 'dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-mobile/mobileSettingsPage.vm'
--- dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-mobile/mobileSettingsPage.vm 2011-05-06 14:31:30 +0000
+++ dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-mobile/mobileSettingsPage.vm 1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-<h1>Mobile Gateway Settings</h1>
-<div>
- <form method="post">
- <table>
- #if($balancer) <tr><td>Balancer: </td><td><input size="100" name="balancer" type="text" value="$balancer" /></td></tr>#end
- #if($router) <tr><td>Router: </td><td><input size="100" name="router" type="text" value="$router" /></td></tr>#end
- #if($gatewayName) <tr><td>Gateway Name: </td><td><input size="100" name="gatewayName" type="text" value="$gatewayName" /></td></tr>#end
- #if($port) <tr><td>Modem Port#: </td><td><input size="100" name="port" type="text" value="$port" /></td></tr>#end
- #if($baudRate) <tr><td>Baudrate: </td><td><input size="100" name="baudRate" type="text" value="$baudRate" /></td></tr>#end
- #if($manufacturer) <tr><td>Manufacturer: </td><td><input size="100" name="manufacturer" type="text" value="$manufacturer" /></td></tr>#end
- #if($model) <tr><td>Model: </td><td><input size="100" name="model" type="text" value="$model" /></td></tr>#end
- #if($protocol) <tr><td>Protocol: </td><td><input size="100" name="protocol" type="text" value="$protocol" /></td></tr>#end
- #if($pin) <tr><td>Pin: </td><td><input size="100" name="pin" type="text" value="$pin" /></td></tr>#end
- #if($inbound) <tr><td>Allow Inbound Msg: </td><td><input size="100" name="inbound" type="text" value="$inbound" /></td></tr> #end
- #if($outbound) <tr><td>Allow Outbound Msg: </td><td><input size="100" name="outbound" type="text" value="$outbound" /></td></tr> #end
- #if($smsc_number) <tr><td>SMSC Number: </td><td><input size="100" name="smsc_number" type="text" value="$smsc_number" /></td></tr> #end
- #if($init_string) <tr><td>Modem Init String: </td><td><input size="100" name="init_string" type="text" value="$init_string" /></td></tr> #end
- #if($inbound_interval) <tr><td>Inbound Interval: </td><td><input size="100" name="inbound_interval" type="text" value="$inbound_interval" /></td></tr> #end
- #if($outbound_interval) <tr><td>Outbound Interval: </td><td><input size="100" name="outbound_interval" type="text" value="$outbound_interval" /></td></tr> #end
- #if($delete_after_processing) <tr><td>Delete after processing: </td><td><input size="100" name="delete_after_processing" type="text" value="$delete_after_processing" /></td></tr> #end
- #if($send_mode) <tr><td>Send Mode: </td><td><input size="100" name="send_mode" type="text" value="$send_mode" /></td></tr> #end
- #if($simMemLocation) <tr><td>SIM Memory Location: </td><td><input size="100" name="simMemLocation" type="text" value="$simMemLocation" /></td></tr> #end
- <tr><td></td><td></td></tr>
- <tr><td></td><td><input type="submit" name="send" value="Save Settings"/></td>
- </table>
- </form>
- <span id="message" style="display:#if($message.trim().equals(""))none #else block #end">$message</span>
-</div>
\ No newline at end of file
=== removed file 'dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-mobile/receiveImportPage.vm'
--- dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-mobile/receiveImportPage.vm 2011-05-06 14:31:30 +0000
+++ dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-mobile/receiveImportPage.vm 1970-01-01 00:00:00 +0000
@@ -1,69 +0,0 @@
-<script type="text/javascript">
- var pendingShown=false;
- var bouncedShown=false;
- function showPending(){
- if(pendingShown){
- $("#pendingItems").html('');
- pendingShown = false;
- $("#pendingLink").html('Show Details');
- } else{
- $("#pendingItems").html($("#pendingHidden").attr('value'));
- pendingShown = true;
- $("#pendingLink").html('Hide Details');
- }
- }
- function showBounced(){
- if(bouncedShown){
- $("#bouncedItems").html('');
- bouncedShown = false;
- $("#bouncedLink").html('Show Details');
- } else{
- $("#bouncedItems").html($("#bouncedHidden").attr('value'));
- bouncedShown = true;
- $("#bouncedLink").html('Hide Details');
- }
- }
-</script>
-
-#if ($smsServiceStatus)
-<div class="header" style="background-color: olive">
- <form method="post">SMS Service: Started
- <input type="submit" name="statAction" value="Stop" />
- </form>
-</div>
-#else
-<div class="header">
- <form method="post">SMS Service: Not Started
- <input type="submit" name="statAction" value="Start" />
- </form>
-</div>
-#end
-<h1>Receive SMS</h1>
-<br>
-<br>
-<div class="header">Import SMS <form style="float: right;" method="post"><input type="submit" name="importAction" value="Import All Pending" /></form></div>
-<div class="box">
- <table class="mainTable">
- <tbody>
- <tr>
- <th width="33%">Pending ($pending.size())</th>
- <th width="33%">Bounced ($bounced.size())</th>
- <th width="33%">Completed ($completed.size())</th>
- </tr>
- <tr>
- <td><a href="javascript:showPending()" id="pendingLink">Show Details</a></td>
- <td><a href="javascript:showBounced()" id="bouncedLink">Show Details</a></td>
- <td>$completed.size() Already Imported</td>
- </tr>
- <tr>
- <td id="pendingItems"></td>
- <td id="bouncedItems"></td>
- <td></td>
- </tr>
- </tbody>
- </table>
- <input type="hidden" id="pendingHidden" value="<ol>#foreach ($item in $pending)<li>$item</li>#end</ol>" />
- <input type="hidden" id="bouncedHidden" value="<ol>#foreach ($item in $bounced)<li>$item</li>#end</ol>" />
-</div>
-
-<span id="message" style="display:#if($result.trim().equals(""))none #else block #end">$result</span>
\ No newline at end of file
=== removed file 'dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-mobile/sendSMSPage.vm'
--- dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-mobile/sendSMSPage.vm 2011-05-06 14:31:30 +0000
+++ dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-mobile/sendSMSPage.vm 1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-<style type="text/css">
- .statusBar{
- color: white;
- padding: 5px 5px;
- margin: -16px 0 20px -20px;
- font-weight: bold;
- background-color: #8FABC7;
- }
-</style>
-
-<div class="statusBar" #if ($smsServiceStatus)style="background-color: olive"#end>
- #if ($smsServiceStatus)
- <form method="post">SMS Service: Started
- <input type="submit" name="statAction" value="Stop" />
- </form>
- #else
- <form method="post">SMS Service: Not Started
- <input type="submit" name="statAction" value="Start" />
- </form>
- #end
-</div>
-<h1>Send SMS</h1>
-<div>
- <form method="post">
- <table>
- <tr><td>Phone #:</td><td><input name="recipient" type="text"/></td></tr>
- <tr><td></td><td><textarea name="msg" cols="50" rows="10"></textarea></td></tr>
- <tr><td></td><td><input type="submit" name="send" value="Send SMS"/></td>
- </table>
- </form>
-<span id="message" style="display:#if($message.trim().equals(""))none #else block #end">$message</span>
-</div>
\ No newline at end of file
=== removed file 'dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-mobile/welcome.vm'
--- dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-mobile/welcome.vm 2011-05-06 14:31:30 +0000
+++ dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-mobile/welcome.vm 1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-<font face"Arial" color="blue"><h1 align="center">DHIS Mobile</h1></font>
-<div align="center"><img height="300px" width="300px" alt="" src="images/intro.png" /></div>
\ No newline at end of file
=== added directory 'dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-sms'
=== added directory 'dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-sms/css'
=== added file 'dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-sms/css/StylesForTags.css'
--- dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-sms/css/StylesForTags.css 1970-01-01 00:00:00 +0000
+++ dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-sms/css/StylesForTags.css 2011-05-06 20:21:40 +0000
@@ -0,0 +1,56 @@
+.Heading {
+ font-family: times,arial, georgia, tahoma;
+ font-size: 35px;
+ font-weight: bold;
+ white-space: nowrap;
+ cursor: default;
+}
+
+.Normal {
+ font-family: arial, georgia, tahoma;
+ font-size: 10px;
+ white-space: nowrap;
+ cursor: default;
+ text-align: center;
+}
+
+.NormalB {
+ font-family: arial, georgia, tahoma;
+ font-size: 13px;
+ font-weight: bold;
+ white-space: nowrap;
+ cursor: default;
+}
+
+.TableDataCellStyles {
+ font-family: arial, georgia, tahoma;
+ font-size: 10px;
+ white-space: nowrap;
+ cursor: default;
+ text-align: center;
+ border:1px dotted #C0C0C0;
+}
+
+.TableHeadingCellStyles {
+ font-family: arial, georgia, tahoma;
+ font-size: 11px;
+ white-space: nowrap;
+ cursor: default;
+}
+
+.DefaultFontStyles {
+ font-family: arial, georgia, tahoma;
+ font-size: 13px;
+ font-weight: bold;
+ white-space: nowrap;
+ cursor: default;
+}
+
+.DefaultFontStylesNoBold {
+ font-family: arial, georgia, tahoma;
+ font-size: 13px;
+ white-space: nowrap;
+ cursor: default;
+}
+
+
=== added file 'dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-sms/css/receiveImportPage.css'
--- dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-sms/css/receiveImportPage.css 1970-01-01 00:00:00 +0000
+++ dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-sms/css/receiveImportPage.css 2011-05-06 20:21:40 +0000
@@ -0,0 +1,27 @@
+.header{
+ color: white;
+ padding: 5px 5px;
+ margin: -16px 0 0 -20px;
+ font-weight: bold;
+ background-color: #8FABC7;
+}
+.box{
+ position:relative;
+ border: 1px solid #8FABC7;
+ padding: 5px 5px;
+ margin-left: -20px;
+}
+.mainTable{
+ width: 100%;
+ border-collapse: collapse;
+}
+.mainTable th{
+ border: 1px solid #C3C3C3;
+ padding: 3px;
+ vertical-align: top;
+}
+.mainTable td{
+ border: 1px solid #C3C3C3;
+ padding: 3px;
+ vertical-align: top;
+}
\ No newline at end of file
=== added file 'dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-sms/css/stylesForReports.css'
--- dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-sms/css/stylesForReports.css 1970-01-01 00:00:00 +0000
+++ dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-sms/css/stylesForReports.css 2011-05-06 20:21:40 +0000
@@ -0,0 +1,74 @@
+
+
+.reportheading {
+ font-family: arial, georgia, tahoma;
+ font-size: 17px;
+ font-weight: bold;
+ white-space: nowrap;
+ cursor: default;
+}
+
+.reportheadingwithunderline {
+ font-family: arial, georgia, tahoma;
+ font-size: 13px;
+ font-weight: bold;
+ white-space: nowrap;
+ cursor: default;
+}
+
+.reportsubheading {
+ font-family: arial, georgia, tahoma;
+ font-size: 15px;
+ font-weight: bold;
+ white-space: nowrap;
+ cursor: default;
+}
+
+.tableheading1 {
+ font-family: arial, georgia, tahoma;
+ font-size: 13px;
+ font-weight: bold;
+ cursor: default;
+}
+
+.tabledata1 {
+ font-family: arial, georgia, tahoma;
+ font-size: 12px;
+ cursor: default;
+}
+
+.tableheading2 {
+ font-family: arial, georgia, tahoma;
+ font-size: 10px;
+ font-weight: bold;
+ cursor: default;
+}
+
+.tabledata2 {
+ font-family: arial, georgia, tahoma;
+ font-size: 10px;
+ cursor: default;
+}
+
+#dropmenudiv{
+ position:absolute;
+ border:1px solid black;
+ border-bottom-width: 0;
+ font:normal 12px Verdana;
+ line-height:18px;
+ z-index:100;
+ }
+
+ #dropmenudiv a{
+ width: 100%;
+ display: block;
+ text-indent: 3px;
+ border-bottom: 1px solid black;
+ padding: 1px 0;
+ text-decoration: none;
+ font-weight: bold;
+ }
+
+ #dropmenudiv a:hover{ /*hover background color*/
+ background-color: yellow;
+ }
=== added directory 'dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-sms/images'
=== added file 'dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-sms/images/intro.png'
Binary files dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-sms/images/intro.png 1970-01-01 00:00:00 +0000 and dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-sms/images/intro.png 2011-05-06 20:21:40 +0000 differ
=== added directory 'dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-sms/javascript'
=== added file 'dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-sms/javascript/user.js'
--- dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-sms/javascript/user.js 1970-01-01 00:00:00 +0000
+++ dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-sms/javascript/user.js 2011-05-06 20:21:40 +0000
@@ -0,0 +1,54 @@
+function removeUserGroup( userGroupId, userGroupName )
+{
+ removeItem( userGroupId, userGroupName, i18n_confirm_delete, "removeUserGroup.action" );
+}
+
+function showUserGroupDetails( userGroupId )
+{
+ var request = new Request();
+ request.setResponseTypeXML( 'userGroup' );
+ request.setCallbackSuccess( userGroupReceived );
+ request.send( 'getUserGroup.action?userGroupId=' + userGroupId );
+}
+
+function userGroupReceived( userGroupElement )
+{
+ setInnerHTML( 'nameField', getElementValue( userGroupElement, 'name' ) );
+ setInnerHTML( 'idField', getElementValue( userGroupElement, 'id' ) );
+ setInnerHTML( 'noOfGroupField', getElementValue( userGroupElement, 'noOfUsers' ) );
+
+ showDetails();
+}
+
+function addValidation ()
+{
+ var k =0 ;
+ var xyz=document.getElementById("name");
+ var abc =document.getElementById("groupMembers");
+ var c = abc.length ;
+ if( xyz.value == "") {
+ alert ("please select name ");
+ return false;
+ }
+ else if ( c <=0 ){
+ alert("please select at least one member");
+ return false ;
+ }else
+ if (c >0 )
+ {
+ for( k =0;k<=c;k++)
+ {
+ abc.options[k].selected = true ;
+
+ }
+ }
+
+ return true;
+}
+
+function editValidation ()
+{
+alert("dev");
+}
+
+
=== added file 'dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-sms/menu.vm'
--- dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-sms/menu.vm 1970-01-01 00:00:00 +0000
+++ dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-sms/menu.vm 2011-05-06 20:21:40 +0000
@@ -0,0 +1,6 @@
+<h2>DHIS Mobile</h2>
+<ul>
+ <li><a href = "receiveImport.action">Receive Data and Import</a></li>
+ <li><a href = "sendSMS.action">Send SMS</a></li>
+ <li><a href = "mobileSettings.action">Settings</a></li>
+</ul>
\ No newline at end of file
=== added file 'dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-sms/mobileImportingResult.vm'
--- dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-sms/mobileImportingResult.vm 1970-01-01 00:00:00 +0000
+++ dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-sms/mobileImportingResult.vm 2011-05-06 20:21:40 +0000
@@ -0,0 +1,4 @@
+
+<div align="center">
+$importStatus
+</div>
\ No newline at end of file
=== added file 'dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-sms/mobileSettingsPage.vm'
--- dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-sms/mobileSettingsPage.vm 1970-01-01 00:00:00 +0000
+++ dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-sms/mobileSettingsPage.vm 2011-05-06 20:21:40 +0000
@@ -0,0 +1,32 @@
+<h1>Mobile Gateway Settings</h1>
+<div>
+ <form method="post">
+ <table>
+ #if($balancer) <tr><td>Balancer: </td><td><input size="100" name="balancer" type="text" value="$balancer" /></td></tr>#end
+ #if($router) <tr><td>Router: </td><td><input size="100" name="router" type="text" value="$router" /></td></tr>#end
+ #if($gatewayName) <tr><td>Gateway Name: </td><td><input size="100" name="gatewayName" type="text" value="$gatewayName" /></td></tr>#end
+ #if($gatewayName == "bulksms")
+ <tr><td>Bulksms Username: </td><td><input size="100" name="bulksmsUsername" type="text" value="$!bulksmsUsername" /></td></tr>
+ <tr><td>Bulksms Password: </td><td><input size="100" name="bulksmsPassword" type="text" value="$!bulksmsPassword" /></td></tr>
+ #end
+ #if($port) <tr><td>Modem Port#: </td><td><input size="100" name="port" type="text" value="$port" /></td></tr>#end
+ #if($baudRate) <tr><td>Baudrate: </td><td><input size="100" name="baudRate" type="text" value="$baudRate" /></td></tr>#end
+ #if($manufacturer) <tr><td>Manufacturer: </td><td><input size="100" name="manufacturer" type="text" value="$manufacturer" /></td></tr>#end
+ #if($model) <tr><td>Model: </td><td><input size="100" name="model" type="text" value="$model" /></td></tr>#end
+ #if($protocol) <tr><td>Protocol: </td><td><input size="100" name="protocol" type="text" value="$protocol" /></td></tr>#end
+ #if($pin) <tr><td>Pin: </td><td><input size="100" name="pin" type="text" value="$pin" /></td></tr>#end
+ #if($inbound) <tr><td>Allow Inbound Msg: </td><td><input size="100" name="inbound" type="text" value="$inbound" /></td></tr> #end
+ #if($outbound) <tr><td>Allow Outbound Msg: </td><td><input size="100" name="outbound" type="text" value="$outbound" /></td></tr> #end
+ #if($smsc_number) <tr><td>SMSC Number: </td><td><input size="100" name="smsc_number" type="text" value="$smsc_number" /></td></tr> #end
+ #if($init_string) <tr><td>Modem Init String: </td><td><input size="100" name="init_string" type="text" value="$init_string" /></td></tr> #end
+ #if($inbound_interval) <tr><td>Inbound Interval: </td><td><input size="100" name="inbound_interval" type="text" value="$inbound_interval" /></td></tr> #end
+ #if($outbound_interval) <tr><td>Outbound Interval: </td><td><input size="100" name="outbound_interval" type="text" value="$outbound_interval" /></td></tr> #end
+ #if($delete_after_processing) <tr><td>Delete after processing: </td><td><input size="100" name="delete_after_processing" type="text" value="$delete_after_processing" /></td></tr> #end
+ #if($send_mode) <tr><td>Send Mode: </td><td><input size="100" name="send_mode" type="text" value="$send_mode" /></td></tr> #end
+ #if($simMemLocation) <tr><td>SIM Memory Location: </td><td><input size="100" name="simMemLocation" type="text" value="$simMemLocation" /></td></tr> #end
+ <tr><td></td><td></td></tr>
+ <tr><td></td><td><input type="submit" name="send" value="Save Settings"/></td>
+ </table>
+ </form>
+ <span id="message" style="display:#if($message.trim().equals(""))none #else block #end">$message</span>
+</div>
\ No newline at end of file
=== added file 'dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-sms/receiveImportPage.vm'
--- dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-sms/receiveImportPage.vm 1970-01-01 00:00:00 +0000
+++ dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-sms/receiveImportPage.vm 2011-05-06 20:21:40 +0000
@@ -0,0 +1,69 @@
+<script type="text/javascript">
+ var pendingShown=false;
+ var bouncedShown=false;
+ function showPending(){
+ if(pendingShown){
+ $("#pendingItems").html('');
+ pendingShown = false;
+ $("#pendingLink").html('Show Details');
+ } else{
+ $("#pendingItems").html($("#pendingHidden").attr('value'));
+ pendingShown = true;
+ $("#pendingLink").html('Hide Details');
+ }
+ }
+ function showBounced(){
+ if(bouncedShown){
+ $("#bouncedItems").html('');
+ bouncedShown = false;
+ $("#bouncedLink").html('Show Details');
+ } else{
+ $("#bouncedItems").html($("#bouncedHidden").attr('value'));
+ bouncedShown = true;
+ $("#bouncedLink").html('Hide Details');
+ }
+ }
+</script>
+
+#if ($smsServiceStatus)
+<div class="header" style="background-color: olive">
+ <form method="post">SMS Service: Started
+ <input type="submit" name="statAction" value="Stop" />
+ </form>
+</div>
+#else
+<div class="header">
+ <form method="post">SMS Service: Not Started
+ <input type="submit" name="statAction" value="Start" />
+ </form>
+</div>
+#end
+<h1>Receive SMS</h1>
+<br>
+<br>
+<div class="header">Import SMS <form style="float: right;" method="post"><input type="submit" name="importAction" value="Import All Pending" /></form></div>
+<div class="box">
+ <table class="mainTable">
+ <tbody>
+ <tr>
+ <th width="33%">Pending ($pending.size())</th>
+ <th width="33%">Bounced ($bounced.size())</th>
+ <th width="33%">Completed ($completed.size())</th>
+ </tr>
+ <tr>
+ <td><a href="javascript:showPending()" id="pendingLink">Show Details</a></td>
+ <td><a href="javascript:showBounced()" id="bouncedLink">Show Details</a></td>
+ <td>$completed.size() Already Imported</td>
+ </tr>
+ <tr>
+ <td id="pendingItems"></td>
+ <td id="bouncedItems"></td>
+ <td></td>
+ </tr>
+ </tbody>
+ </table>
+ <input type="hidden" id="pendingHidden" value="<ol>#foreach ($item in $pending)<li>$item</li>#end</ol>" />
+ <input type="hidden" id="bouncedHidden" value="<ol>#foreach ($item in $bounced)<li>$item</li>#end</ol>" />
+</div>
+
+<span id="message" style="display:#if($result.trim().equals(""))none #else block #end">$result</span>
\ No newline at end of file
=== added file 'dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-sms/sendSMSPage.vm'
--- dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-sms/sendSMSPage.vm 1970-01-01 00:00:00 +0000
+++ dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-sms/sendSMSPage.vm 2011-05-06 20:21:40 +0000
@@ -0,0 +1,32 @@
+<style type="text/css">
+ .statusBar{
+ color: white;
+ padding: 5px 5px;
+ margin: -16px 0 20px -20px;
+ font-weight: bold;
+ background-color: #8FABC7;
+ }
+</style>
+
+<div class="statusBar" #if ($smsServiceStatus)style="background-color: olive"#end>
+ #if ($smsServiceStatus)
+ <form method="post">SMS Service: Started
+ <input type="submit" name="statAction" value="Stop" />
+ </form>
+ #else
+ <form method="post">SMS Service: Not Started
+ <input type="submit" name="statAction" value="Start" />
+ </form>
+ #end
+</div>
+<h1>Send SMS</h1>
+<div>
+ <form method="post">
+ <table>
+ <tr><td>Phone #:</td><td><input name="recipient" type="text"/></td></tr>
+ <tr><td></td><td><textarea name="msg" cols="50" rows="10"></textarea></td></tr>
+ <tr><td></td><td><input type="submit" name="send" value="Send SMS"/></td>
+ </table>
+ </form>
+<span id="message" style="display:#if($message.trim().equals(""))none #else block #end">$message</span>
+</div>
\ No newline at end of file
=== added file 'dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-sms/welcome.vm'
--- dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-sms/welcome.vm 1970-01-01 00:00:00 +0000
+++ dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-sms/welcome.vm 2011-05-06 20:21:40 +0000
@@ -0,0 +1,2 @@
+<font face"Arial" color="blue"><h1 align="center">DHIS SMS</h1></font>
+<div align="center"><img height="300px" width="300px" alt="" src="images/intro.png" /></div>
\ No newline at end of file
