Merge branch 'master' of https://github.com/jemproject/JEM-Project

admin/help/css/help.css

@@ -202,6 +202,9 @@ table.help td {
 .icon-32-edit {
 	background-image: url("../../../../../media/com_jem/images/toolbar/icon-32-edit.png");
 }
+.icon-32-export {
+	background-image: url("../../../../../media/com_jem/images/icon-32-tableexport.png");
+}
 .icon-32-featured {
 	background-image: url("../../../../../media/com_jem/images/toolbar/icon-32-featured.png");
 }
@@ -211,11 +214,17 @@ table.help td {
 .icon-32-help {
 	background-image: url("../../../../../media/com_jem/images/toolbar/icon-32-help.png");
 }
+.icon-32-move {
+	background-image: url("../../../../../media/com_jem/images/toolbar/icon-32-move.png");
+}
 .icon-32-new {
 	background-image: url("../../../../../media/com_jem/images/toolbar/icon-32-new.png");
 }
 .icon-32-options {
 	background-image: url("../../../../../media/com_jem/images/toolbar/icon-32-config.png");
+}	
+.icon-32-print {
+	background-image: url("../../../../../media/com_jem/images/toolbar/icon-32-print.png");
 }
 .icon-32-publish {
 	background-image: url("../../../../../media/com_jem/images/toolbar/icon-32-publish.png");

admin/help/en-GB/editattendee.html

@@ -13,7 +13,10 @@ <h3>Description</h3>
 <div>
 	<p><img src="../../../../../media/com_jem/images/icon-48-users.png" alt="" class="left" />
 		Manage the registered users from this screen.
-		Here you can select another user as an Attendee to the Event you are currently editing.</p>
+		Here you can select another user as an Attendee to the Event you are currently editing.
+		Additionally you must also choose a Status (Invited, Attending, Not Attending, On Waiting List). 
+		Optionally you can give a Comment, and decide if an email about this edit should be sent or not. 
+		If you choose to send an email, make sure the Mailer plugin is enabled and configured.</p>
 	<div class="clear"></div>
 	<p>
 		Please note that changing selected user means: You unregister the previously selected user and

admin/help/en-GB/editevents.html

@@ -170,10 +170,10 @@ <h3>Custom Fields</h3>
 
 <h3>Registration</h3>
 
-<p><strong>Enable registration:</strong> 
-	Select yes if users should be able to register to this Event.</p>
-<p><strong>Enable unregistration:</strong> 
-	Select yes if users should be able to unregister/cancel their registration from this Event.</p>
+<p><strong>Registration:</strong> 
+	Select if users should be able to register to this Event. The options are No, Yes or Invited Users Only.</p>
+<p><strong>Registration Annulation:</strong> 
+	Select if users should be able to annulate their registration from this Event. The options are No, Yes or Until .... hours before the event starts.</p>
 <p><strong>Max Places:</strong> 
 	Enter the maximum capacity for the event. When there is no maximum, enter 0 for unlimited registrations.</p>
 <p><strong>Booked Places:</strong> 

admin/help/en-GB/listevents.html

@@ -144,8 +144,16 @@ <h3>Columns:</h3>
 <p><strong>Hits:</strong> 
 	This shows the number of times the Event details page has been viewed in the Frontend.</p>
 <p><strong>Reg. Users:</strong> 
-	This shows the number of Users who have registered for an event, as well as the number of available places. Click 
-	the number if you are interested in more detailed information about them or you want to change or remove any of them.</p>
+	This shows the number of Users who have registered for an event, as well as the number of available places, number of Users on the waiting list, 
+	numer of Users that will not attend and number of intited Users that have not yet responded. 
+	<br /><br />
+	For instance:<br />
+	"150/150 + 300 -24, 822 ?" 
+	<br />means:
+	<br />
+	150 attending on 150 places, 300 on waiting list, 24 not attending and 822 invited
+	<br /><br />
+	Click the numbers if you are interested in more detailed information about them or you want to change or remove any of them.</p>
 <p><strong>ID:</strong> 
 	The number of the entry in the database. This number is generated by JEM sequentially for every new entry.</p>
 

admin/help/en-GB/registereduser.html

@@ -35,7 +35,23 @@ <h3>Toolbar Icons</h3>
 			<li>
 				<span class="icon-32-edit"> </span>
 				Edit
-			</li>
+			</li>			
+			<li>
+				<span class="icon-32-move"> </span>
+				Set Not Attending
+			</li>						
+			<li>
+				<span class="icon-32-move"> </span>
+				Set Attending
+			</li>						
+			<li>
+				<span class="icon-32-export"> </span>
+				Export
+			</li>			
+			<li>
+				<span class="icon-32-print"> </span>
+				Print
+			</li>			
 			<li>
 				<span class="icon-32-delete"> </span>
 				Delete
@@ -60,6 +76,14 @@ <h3>Toolbar Icons</h3>
 
 <p><strong>Edit:</strong> 
 	Click the 'Edit' icon to edit the selected user.</p>
+<p><strong>Set Not Attending:</strong> 
+	Click the 'Set Not Attending' icon to change the status of the selected user(s) to 'Not Attending'.</p>	
+<p><strong>Set Attending:</strong> 
+	Click the 'Set Attending' icon to change the status of the selected user(s) to 'Attending'.</p>
+<p><strong>Export:</strong> 
+	Click the 'Export' icon to export a list of attendees in .csv format.</p>
+<p><strong>Print:</strong> 
+	Click the 'Print' icon to print a list of registered users.</p>	
 <p><strong>Delete:</strong> 
 	Click the 'Delete' icon to delete the selected registered user.</p>
 <p><strong>Back:</strong> 
@@ -87,6 +111,10 @@ <h3>Columns:</h3>
 	The Date when the User has registered for the event.</p>
 <p><strong>User ID:</strong> 
 	The ID of the User.</p>
+<p><strong>Status:</strong> 
+	Indicates whether the user is Invited, Not attending, Attending or On waiting list.</p>
+<p><strong>Comment:</strong> 
+	Optional free text comment.</p>	
 <p><strong>Remove:</strong> 
 	Click to remove the User from this Event.</p>
 

admin/help/en-GB/settings.html

@@ -107,6 +107,12 @@ <h3>Display</h3>
 	Fill in "h" or "Uhr" for example. This will be displayed behind the
 	time on the frontend. Leave blank if you don't need it.</p>
 
+<p><strong>Format Hour:</strong><br />
+	Use the php strftime syntax to format the hour, used in Event Edit views. For example
+	the following code '%H' shows '16'. More Information <a href=
+	"http://www.php.net/strftime" target="_blank">php strftime manual</a>.</p>
+
+
 <p><strong>Store IP:</strong><br />
 	In some countries it isn't permitted to store the IP address of your visitors. You can disable it here.</p>
 
@@ -454,6 +460,8 @@ <h3>Advanced Parameters:</h3>
 	You can set a default country for venues in this field.
 	When entering a new venue the country is then set to the default chosen here, to save handling.</p>
 
+<p><strong>CSV Separator:</strong><br />
+	Choose if comma or semicolon should be used as separator on CSV Exports (e.g. attendee lists).</p>
 
 <h3>Venues:</h3>
 
@@ -536,9 +544,9 @@ <h3>Registration</h3>
 	Select here to always allow registration, always forbid registration,
 	or allow event creator to decide if (s)he needs registration for the specific event.</p>
 
-<p><strong>Allow Event Registration Cancellation:</strong><br />
-	Select here to always allow un-registration, always forbid un-registration,
-	or allow event creator to decide if un-registration for the specific event is allowed.</p>
+<p><strong>Allow Invitation:</strong><br />
+	If set to 'Yes' event creators are allowed to invite users and also to limit permission to register to them. <br />
+	<strong>Attention: This will provide a list of all site users available to all potential event creators!</strong></p>
 
 <p><strong>Allow Comments:</strong><br />
 	Select if Frontend users are allowed to write an additional comment when they register for an event.</p>