update to version 1.0

 * several BUGFIXES
 * added support for Partial views
 * extended support for template expressions:
  - control structures: @if [@else], @for(;;), @for( in )
  - partial view expression: @render
  - comments: @* *@
  - "code execution" expressions: @(), @{ }@
 * added message queue for SCION: now raising events from within SCION
event-processing code is supported (i.e. from within BIG STEP in SCION) 
 * added JSDoc generation for framework documentation

.classpath

@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="lib" path="libs/oauth/scribe-1.2.3.jar"/>
-	<classpathentry kind="lib" path="libs/oauth/commons-codec-1.5.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/oauth/scribe-1.2.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/oauth/commons-codec-1.5.jar"/>
 	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="lib" path="libs/apacheCommons/commons-io-2.1.jar"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry kind="lib" path="libs/jdom/jdom-1.1.3.jar"/>
-	<classpathentry kind="lib" path="libs/cordova-2.3.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/apacheCommons/commons-io-2.1.jar"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="lib" path="libs/jdom/jdom-1.1.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/cordova-2.8.1.jar"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>MMIG-StarterKit</name>
+	<name>StarterKit-public</name>
 	<comment></comment>
 	<projects>
 	</projects>

AndroidManifest.xml

@@ -24,23 +24,34 @@
 	<uses-permission android:name="android.permission.GET_ACCOUNTS" />
 
 	<uses-sdk android:minSdkVersion="8" />
+
+	<application
+        android:debuggable="true"
+        android:icon="@drawable/icon"
+        android:label="@string/app_name" >
+
+
+        <activity
+            android:name="de.dfki.iui.mmig.MMIGAppActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:label="@string/app_name"
+            android:launchMode="singleInstance" >
+
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+
+        <activity
+            android:name="org.apache.cordova.DroidGap"
+            android:configChanges="orientation|keyboardHidden"
+            android:label="@string/app_name" >
+
+            <intent-filter>
+            </intent-filter>
+        </activity>
+    </application>
 
-	<application android:icon="@drawable/icon" android:label="@string/app_name" android:debuggable="true">
-
-		<activity android:name="de.dfki.iui.mmig.MMIGAppActivity"
-			android:configChanges="orientation|keyboardHidden" android:label="@string/app_name" android:launchMode="singleInstance">
-			<intent-filter>
-				<action android:name="android.intent.action.MAIN" />
-				<category android:name="android.intent.category.LAUNCHER" />
-			</intent-filter>
-		</activity>
-
-		<activity android:name="org.apache.cordova.DroidGap" android:label="@string/app_name"
-			android:configChanges="orientation|keyboardHidden">
-			<intent-filter>
-			</intent-filter>
-		</activity>
-
-
-	</application>
 </manifest>

assets/www/config/configuration.json

@@ -1,3 +1,15 @@
 {
-    "language": "en"
+    "language": "en",
+    "silenceDetectorNoiseTreshold": "0.1",
+    "silenceDetectorPauseCount": "3",
+    "silenceDetectorMinimalSpeachCount": "3",
+    "silenceDetectorResetCount": "15",
+    "HTML5InputSilenceBuffer": "2000000",
+    "HTML5InputWebSocketAddress": "ws://127.0.0.1:9999",
+    "HTML5InputSoundPackageSize": "4096",
+    "HTML5InputSilenceDetectorPath": "javascripts/mediators/silenceDetection.js",
+    "HTML5OutputServerBasePath": "http://mary.dfki.de:59125/",
+    "autoLogin": "true",
+    "TEST_prefetchRemoteResources": "false",
+    "TEST_resetStylesBeforeLoad": "true"
 }

assets/www/config/languages/de/dictionary.dic

@@ -26,6 +26,8 @@
     "subject_label":"Betreff",
     "save":"Speichern",
     "discard":"Verwerfen",
-	"note_label": "Notiz"
+	"note_label": "Notiz",
+	"loadingText": "Bitte warten...",
+	"did_not_understand_msg": "Ich habe Sie leider nicht verstanden."
 
 }

assets/www/content/grammar.json → assets/www/config/languages/de/grammar.json

@@ -201,8 +201,8 @@
             "reinickendorf"
 	],
         "SQUARE":[
-            "[a-zA-Z]+platz",
-            "([a-zA-Z]+-)+platz"
+            "[a-zA-Z_]+platz",
+            "([a-zA-Z_]+-)+platz"
         ],
         "NEAR_TO_ME": [
             "meiner n__ae__he",
@@ -211,13 +211,13 @@
 	    "hier"
         ], 
 	"STREET": [
-            "[a-zA-Z]+ str",
-            "[a-zA-Z]+ stra__ss__e",
-            "[a-zA-Z]+ str.",
-            "[a-zA-Z]+str",
-            "[a-zA-Z]+stra__ss__e",
-            "[a-zA-Z]+str.",
-            "[a-zA-Z]+damm"
+            "[a-zA-Z_]+ str",
+            "[a-zA-Z_]+ stra__ss__e",
+            "[a-zA-Z_]+ str.",
+            "[a-zA-Z_]+str",
+            "[a-zA-Z_]+stra__ss__e",
+            "[a-zA-Z_]+str.",
+            "[a-zA-Z_]+damm"
         ],
 	"MUSIC": [
 	    "house",
@@ -329,7 +329,7 @@
 	    "erstelle"
 	],
 	"REST": [
-            "[a-zA-Z__ue____ae____oe__]+"
+            "[a-zA-Z_]+"
         ]
     },
     "utterances": {
@@ -526,8 +526,9 @@
                 "V_SEND_FIN"
             ],
             "semantic": {
-                "Send": { "recipient" : "_$social_network[0]",
-                	  "recipient" : "_$social_network[1]" }
+                "Send": { "recipient"  : "_$social_network[0]",
+                	      "recipient2" : "_$social_network[1]",
+                	      "all" : "_$all[0]" }
             }
         },
         "SEND_TWEET": {
@@ -661,7 +662,7 @@
 	    "semantic": {
 		"ShowPOIs": { "poicat": "_$poi_category[0]",
 			      "genre" : "_$music[0]",
-			      "genre" : "_$music[1]",
+			      "genre2" : "_$music[1]",
 			      "location": "_$location[0]['semantic']" }
 	    }
 	},
@@ -679,7 +680,7 @@
                 "RadarStart": {}
             }
         },
-        "LIKE": {
+        "LIKED": {
             "phrases": [
                 "LIKE"
             ],

assets/www/config/languages/de/speaker.json

@@ -0,0 +1,5 @@
+{
+	"voice_lang": "de_DE",
+	"lang_simple": "de",
+	"speaker": "bits1-hsmm"
+}

assets/www/config/languages/en/dictionary.dic

@@ -26,6 +26,8 @@
     "subject_label":"Subject",
     "save":"Save",
     "discard":"Discard",
-	"note_label":"Note"
+	"note_label":"Note",
+	"loadingText": "Please Wait...",
+	"did_not_understand_msg": "Unfortunately, I did not understand you."
 
 }

assets/www/config/languages/en/speaker.json

@@ -0,0 +1,5 @@
+{
+	"voice_lang": "en_US",
+	"lang_simple": "en_US",
+	"speaker": "dfki-spike"
+}

assets/www/config/parsed_directories.json

@@ -1 +1 @@
-{"/controllers":["application.js","calendar.js"],"/views":["application","calendar","layouts"],"/views/application":["login.ehtml","registration.ehtml","welcome.ehtml"],"/views/calendar":["create_appointment.ehtml"],"/views/layouts":["application.ehtml"],"/models":["calendarmodel.js","user.js"],"/config":["languages","statedef","configuration.json","parsed_directories.json"],"/config/languages":["de","en"],"/config/languages/de":["dictionary.dic"],"/config/languages/en":["dictionary.dic"],"/config/statedef":["dialogDescription.xml","dialogDescription.xml.MD5","input_manager_scxml.xml","input_manager_scxml.xml.MD5","readme.txt","scxml2js.bat","scxml2js.sh"],"/javascripts/plugins":["directoryListing.js","multitouchPlugin.js","nativeTTS.js","nuance.js","softkeyboard.js"],"/helpers":["applicationHelper.js"]}
+{"/controllers":["application.js","calendar.js"],"/views":["application","calendar","layouts"],"/views/application":["login.ehtml","registration.ehtml","temp-languagemenu.html","welcome.ehtml","~languagemenu.ehtml"],"/views/calendar":["create_appointment.ehtml"],"/views/layouts":["application.ehtml"],"/models":["calendarmodel.js","user.js"],"/config":["languages","statedef","configuration.json","parsed_directories.json"],"/config/languages":["de","en"],"/config/languages/de":["dictionary.dic","grammar.json","speaker.json"],"/config/languages/en":["dictionary.dic","speaker.json"],"/config/statedef":["dialogDescription.xml","dialogDescription.xml.MD5","input_manager_scxml.xml","input_manager_scxml.xml.MD5","readme.txt","scxml2js.bat","scxml2js.sh"],"/javascripts/plugins":["beepPlugin.js","cookiePlugin.js","directoryListing.js","multitouchPlugin.js","nativeTTS.js","nuance.js","queuePlugin.js","softkeyboard.js","video.js"],"/helpers":["applicationHelper.js"],"/gen/grammar":["de_grammar.js"]}

assets/www/config/statedef/input_manager_scxml.xml

@@ -68,9 +68,10 @@
   <state id="no_match" name="no_match"><!--   node-size-and-position x=610.0 y=50.0 w=120.0 h=20.0  -->
    <onentry>
     <script>
-			    var dm = mobileDS.CalendarModel.getInstance().getDiscourseManager();
+			    var dm = null;//TODO: mobileDS.CalendarModel.getInstance().getDiscourseManager();
 			   	if (dm == null) {
-					window.plugins.nuancePlugin.speak(&#039;Ich habe Sie leider nicht verstanden.&#039;,null, null);
+			   		var msg = mobileDS.LanguageManager.getInstance().getText(&#039;did_not_understand_msg&#039;);
+					mobileDS.AudioOutput.getInstance().textToSpeech(msg, null, null);
 				} else {
 					dm.getCommand().parse(command);
 				}

assets/www/content/stylesheets/application.css

@@ -75,8 +75,8 @@
 
 .ui-input-text, .ui-select
 {
-	width: 97% !important;
-    left:2% !important;
+	width: 97%;
+    left:2%;
 }
 
 .ui-li-has-arrow {
@@ -139,8 +139,13 @@ textarea.ui-voice-tag-text { height: 30%; margin:10px; background:white; color:b
 }
 
 #create_appointment #note{
-	height: 5em;
-	width: 100% !important;
+	height: 4.5em;
+	margin-left: 2%;
+	width: 97%;
+}
+
+#create_appointment div.ui-input-text{
+	padding: 0px;
 }
 
 .login_background_gradient{

assets/www/content/stylesheets/jquery.mobile.datebox-1.0.1.css → assets/www/content/stylesheets/jqm-datebox-1.4.0.css

@@ -7,22 +7,40 @@
 
 /* Base input element Styles */
 
-.ui-input-datebox { width: 97%; background-image: none; padding: .4em; line-height: 1.4; font-size: 16px; display: block; padding-top: 0px; padding-bottom: 0px; } 
+.ui-input-datebox { width: 97%; background-image: none; padding: .4em; line-height: 1.4; font-size: 16px; display: block; padding-top: 0px; padding-bottom: 0px; background-color: transparent; } 
 .ui-input-datebox { min-height: 38px; } /* Fix for IE8 */
-.ui-input-datebox .ui-btn-icon-notext { margin-top: 5px !important; margin-bottom: 5px !important; }
+.ui-datebox-container > .ui-header:first-child { -webkit-border-top-left-radius: 3px; border-top-left-radius: 3px;	-webkit-border-top-right-radius: 3px; border-top-right-radius: 3px; }
+/*.ui-input-datebox .ui-btn-icon-notext { margin-top: 5px !important; margin-bottom: 5px !important; }*/
 .ui-input-datebox input { width: 100% !important; padding: 0 !important; margin-top: 5px !important; margin-right: -40px !important; border: 1px solid transparent !important; vertical-align: middle; display: inline-block !important; background-color: transparent; zoom: 1; *display: inline; }
 .ui-input-datebox input:focus { outline: none;}
 .ui-input-datebox .ui-btn-text {display: none;}
+.ui-input-datebox.ui-mini { min-height: 20px; font-size: 14px; }
+/*.ui-input-datebox.ui-mini .ui-btn-icon-notext { margin-top: 2px !important; margin-bottom: 2px !important; }*/
+.ui-icon-datebox { background-image: url('image/datebox.png') !important; background-repeat: no-repeat !important; background-position: 99% 8px !important; }
+.ui-icon-datebox-alt { background-image: url('image/datebox.png') !important; background-repeat: no-repeat !important; background-position: 99% -28px !important; }
+.ui-mini.ui-icon-datebox { background-position: 99% 6px; }
+.ui-mini.ui-icon-datebox-alt { background-position: 99% -30px; }
 
 @media all and (min-width: 450px){
-  .ui-input-datebox { width: 60%; display: inline-block; zoom:1; *display: inline; }
+  .ui-field-contain .ui-input-datebox { width: 74.7%; display: inline-block; } 
+  .ui-hide-label .ui-input-datebox { width: 100%; }
 }
 
 /* Full width if in a grid, ignore the media query */
 .ui-grid-a .ui-input-datebox { width: 97%; }
 .ui-grid-b .ui-input-datebox { width: 97%; }
 .ui-grid-c .ui-input-datebox { width: 97%; }
 .ui-grid-d .ui-input-datebox { width: 97%; }
+.ui-grid-e .ui-input-datebox { width: 97%; }
+
+/* Define a grid, just in case. */
+/* grid d: 16.65/16.65/16.65/16.65/16.65/16.65 */
+.ui-grid-e .ui-block-a, .ui-grid-e .ui-block-b, .ui-grid-e .ui-block-c, .ui-grid-e .ui-block-d, .ui-grid-e .ui-block-e, .ui-grid-e .ui-block-f { width: 16.65%; }
+.ui-grid-e > :nth-child(n) { width: 16.65%; }
+.ui-grid-e .ui-block-a { clear: left; }
+
+.ui-grid-e { overflow: hidden; }
+.ui-block-f { margin: 0; padding: 0; border: 0; float: left; min-height: 1px; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; -ms-box-sizing: border-box; box-sizing: border-box; }
 
 /* Calendar Mode Styles */
 
@@ -32,16 +50,20 @@
 .ui-datebox-gridminus { float: left; }
 .ui-datebox-gridplus-rtl { float: left; }
 .ui-datebox-gridminus-rtl { float: right; }
-.ui-datebox-gridrow { margin-left: 5px; margin-right: 5px; }
+.ui-datebox-gridrow { margin-left: 5px; margin-right: 5px; margin-bottom: -7px; }
 .ui-datebox-grid { clear: both; margin-bottom: 5px; }
-.ui-datebox-griddate { width: 36px; height: 30px; display: inline-block; vertical-align: middle; text-align: center; line-height: 30px; font-weight: bold; font-size: 12px; zoom:1; *display: inline;}
+.ui-datebox-griddate { width: 36px; height: 30px; padding: 0px; display: inline-block; vertical-align: middle; text-align: center; line-height: 30px; font-weight: bold; font-size: 12px; zoom:1; *display: inline;}
+.ui-datebox-griddate-week { width: 31px; height: 30px; display: inline-block; vertical-align: middle; text-align: center; line-height: 30px; font-weight: bold; font-size: 12px; zoom:1; *display: inline;}
 .ui-datebox-griddate-empty { border: 1px solid transparent; color: #888; }
 .ui-datebox-griddate-label { height: 15px !important; line-height: 15px !important; color: black;}
 .ui-datebox-griddate-disable { color: #888; }
 
 /* Android Mode Styles */
 
 .ui-datebox-header h4 { margin-top: 5px; margin-bottom: 5px; text-align: center; }
+.ui-datebox-container fieldset div { margin: 0px !important; }
+.ui-datebox-dboxin input { padding: .4em 0 !important; text-align: center; width:95%; }
+.ui-datebox-dboxin label { width: 100%; text-align: center; display: block; margin-top: 5px; margin-bottom: -8px; }
 .ui-datebox-controls { text-align: center; }
 .ui-datebox-controls div { width: 77px; text-align: center; display: inline-block; zoom: 1; *display: inline;}
 .ui-datebox-scontrols { text-align: center; }
@@ -57,6 +79,7 @@
 .ui-datebox-sliderow-ym { margin-bottom: 5px; text-align: center; height: 32px; width: 280px; overflow: hidden;}
 .ui-datebox-sliderow-hi { text-align: center; height: 32px; width: 280px; overflow: hidden;}
 .ui-datebox-sliderow-int { display: inline-block; white-space: nowrap;}
+.ui-datebox-slide .ui-btn { margin: 0px; padding: 0px 1em; }
 
 .ui-datebox-slideyear { text-align: center; display: inline-block; zoom:1; *display:inline; width: 84px; vertical-align: middle; line-height: 30px; height: 30px; font-size: 14px; font-weight: bold; }
 .ui-datebox-slidemonth { text-align: center; display: inline-block; zoom:1; *display:inline; width: 51px; vertical-align: middle; line-height: 30px; height: 30px; font-size: 12px; font-weight: bold; }
@@ -69,17 +92,20 @@
 /* Flip Mode Styles */
 .ui-datebox-flipcontent { text-align: center; height: 125px; margin-bottom: -40px;}
 .ui-datebox-flipcontent div { margin-left: 3px; margin-right: 3px; width: 77px; height: 120px; display: inline-block; text-align: center; zoom: 1; *display: inline; overflow: hidden;}
+.ui-datebox-flipcontentd div { width: 60px; }
 .ui-datebox-flipcenter { border: 1px solid #eee; height: 40px; margin-left: 10px; width: 260px; margin-right: auto; margin-left: auto; position: relative; top: -45px;}
 .ui-datebox-flipcontent ul { list-style-type: none; display: inline; }
 .ui-datebox-flipcontent li { height: 30px; }
 .ui-datebox-flipcontent li span { margin-top: 7px; display: block; }
 /* Shared Styles */
 
-.ui-datebox-container { border: 5px solid #111 !important; width: 280px; }
+.ui-datebox-container { border: 5px solid #111 !important; width: 280px; -webkit-transform:translate3d(0,0,0); }
 .ui-datebox-screen { position: absolute; top: 0px; left: 0px; width: 100%; height: 100%; }
 .ui-datebox-screen-modal { background-color: black; -moz-opacity: 0.8; opacity:.80; filter: alpha(opacity=80); }
 .ui-datebox-hidden { display: none; }
 .ui-dialog .ui-datebox-container { border: none !important; }
+.ui-popup-container .ui-datebox-container { border: none !important; }
+.ui-popup-container .ui-datebox-gridrow { margin-left: 0px; margin-right: 0px; }
 .ui-datebox-collapse a { display: inline-block; width: 45% }
 
 .ui-datebox-inline { margin-top: 5px; border: 5px solid #111111 !important; margin-left: auto; margin-right: auto; text-align: center; }