Rework html help screens

AndroidManifest.xml

@@ -137,31 +137,18 @@
             android:launchMode="singleTop"
             />
 
- 		<activity android:name=".ui.help.HelpGuide"
+ 		<activity android:name=".ui.help.HtmlHelp"
             android:screenOrientation="portrait"
             android:launchMode="singleTop"
             />
- 		<activity android:name=".ui.help.LicenceScreen"
-            android:screenOrientation="portrait"
-            android:launchMode="singleTop"
-            />
- 		<activity android:name=".ui.help.SecurityScreen"
-            android:screenOrientation="portrait"
-            android:launchMode="singleTop"
-            />
- 		<activity android:name=".ui.help.AccountsContactsScreen"
+        		<activity android:name=".ui.help.LicenceScreen"
             android:screenOrientation="portrait"
             android:launchMode="singleTop"
             />
  		<activity android:name=".ui.help.DonateScreen"
             android:screenOrientation="portrait"
             android:launchMode="singleTop"
             />
- 		<activity android:name=".ui.help.LinksScreen"
-            android:screenOrientation="portrait"
-            android:launchMode="singleTop"
-            />
-
 		<activity android:name=".ui.help.AboutScreen"
            	android:screenOrientation="portrait"
             android:launchMode="singleTop"

assets/helpsecurity.html

@@ -14,7 +14,7 @@
 		<div>We have a list of all <a href="helppermissions.html">Android & Serval Permissions used</a>, and what they are used for. However, the message that pops up on starting the Serval Mesh: "Serval Mesh has been granted superuser permissions", is required by Android to perform the necessary tasks, which are again explained in the Permissions List.</div>
 		<div>We also have a <a href="helpprivacy.html">Privacy Policy</a>.</div>
 		<div>For more information, contact us via email: <a href="mailto:enquiry@servalproject.org">enquiry@servalproject.org</a>,
-		<br>or visit <a href="servalproject.org">our website</a></div>
+		<br>or visit <a href="http://servalproject.org">our website</a></div>
 	</body>
 </html>
 

res/layout/accounts_contactscreen.xml → res/layout/htmlhelp.xml

@@ -36,38 +36,15 @@
 	<RelativeLayout android:layout_width="fill_parent"
 		android:layout_height="wrap_content">
 
-		<TextView android:id="@+id/acheader"
+		<TextView android:id="@+id/help_header"
 			android:layout_below="@id/headerLayout" 
-			style="@style/shelpscreensheader"
-			android:text="@string/acheader" />
-
-		<WebView android:id="@+id/acbrowser" 
-		    android:layout_below="@+id/acheader"
+			style="@style/shelpscreensheader"/>	
+
+    	 <WebView android:id="@+id/help_browser" 
+		 	android:layout_below="@+id/help_header"
 			style="@style/sbody" 
 			android:layout_width="fill_parent" 
-			android:layout_height="fill_parent" />
-
-<!-- Pre HTML Based Help -->		
-
-		<!-- Used for Manifest listing code only -->
-		<!-- <ListView android:id="@android:id/android:list" 
-		android:layout_below="@id/permissions_header" 
-			style="@style/spermissions_item" /> -->
-
-		<!-- Used for Array of permissions as list -->
-
-		<!-- <ListView android:id="@android:id/android:list" 
-		android:layout_below="@id/permissions_header" 
-			style="@style/spermissions_item" /> -->
-
-
-		<!-- <TextView android:id="@+id/permissions_screentext" 
-		android:layout_below="@id/permissions_header" 
-			style="@style/stextleft2" 
-			android:text="@string/permissions_screentext" /> 
-			<TextView android:id="@+id/permissions_list" 
-			android:layout_below="@+id/permissions_screentext" 
-			style="@style/stextleft2" /> -->
+			android:layout_height="fill_parent" />	  
 
 
 	</RelativeLayout>