Merge pull request #8 from studer-raimann/develop

Prepared release 2.0.1

classes/class.ilLiveVotingConfigGUI.php

@@ -265,7 +265,7 @@ public function save() {
 					}
 				}
 			}
-			ilUtil::sendSuccess($this->pl->txt('conf_saved'));
+			ilUtil::sendSuccess($this->pl->txt('conf_saved'), true);
 			$ilCtrl->redirect($this, 'configure');
 		} else {
 			$this->form->setValuesByPost();

lang/ilias_de.lang

@@ -108,3 +108,5 @@ htaccess#:#Redirect-Einstellungen
 stress_test#:#Lasttests
 use_responsive#:#Responsive-Design anbieten
 colorful#:#Mehrfarbige Balken
+
+conf_saved#:#Gespeichert

lang/ilias_en.lang

@@ -74,7 +74,7 @@ sms_err_wrongpin#:#This LiveVoting-PIN doesn't exist
 sms_err_voteover#:#This LiveVoting is closed
 sms_err_nosuchvote#:#There's no such option for this LiveVoting
 sms_vote_ok#:#Thank's for voting with ILIAS LiveVoting
-use_smslog#:#Use e separate SMS-Log-File
+use_smslog#:#Use a separate SMS-Log-File
 
 allow_freeze#:#Allow Freeze
 freeze#:#Freeze Voting
@@ -85,7 +85,7 @@ voting_unfreezed#:#Voting unfreezed
 use_qr#:#Use QR-Codes
 qr_close#:#Close
 
-sragsms#:#SRAGsms-Unterstützung
+sragsms#:#SRAGsms-Support
 sragsms_number#:#Phone-Number
 sragsms_userkey#:#UserKey
 sragsms_password#:#Passwort
@@ -110,3 +110,5 @@ htaccess#:#Redirects
 stress_test#:#Stresstests
 use_responsive#:#Allow Responsive-Design
 colorful#:#Multi-colored Bars
+
+conf_saved#:#Saved

plugin.php

@@ -1,6 +1,6 @@
 <?php
 $id = 'xlvo';
-$version = '2.0.0';
+$version = '2.0.1';
 $ilias_min_version = '4.4.0';
 $ilias_max_version = '5.0.999';
 $responsible = 'Oskar Truffer, Fabian Schmid';

templates/images/icon_xlvo.svg.bak

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="-281 404.9 32 32" enable-background="new -281 404.9 32 32" xml:space="preserve">
+<g>
+	<path fill="#0F2152" d="M-260.9,411.5c0,0.1,0,0.3-0.1,0.4c-0.2,0.2-0.5,0.2-0.7,0c0,0-1.1-1-3.3-1s-3.3,1-3.4,1
+		c-0.2,0.2-0.5,0.2-0.7,0c-0.2-0.2-0.2-0.5,0-0.7c0.1-0.1,1.4-1.3,4.1-1.3c2.7,0,4,1.3,4.1,1.3
+		C-260.9,411.2-260.9,411.4-260.9,411.5z"/>
+	<path fill="#0F2152" d="M-259.1,409.8c0,0.1-0.1,0.3-0.2,0.4c-0.2,0.2-0.5,0.2-0.7,0c0,0-1.7-1.8-5.1-1.8c-3.4,0-5.1,1.8-5.1,1.8
+		c-0.2,0.2-0.5,0.2-0.7,0c-0.2-0.2-0.2-0.5,0-0.7c0.1-0.1,2-2.1,5.9-2.1c3.9,0,5.8,2,5.9,2.1C-259.1,409.5-259.1,409.6-259.1,409.8z
+		"/>
+</g>
+<g>
+	<path fill="#FA8C1E" d="M-265.9,415v7.8c0,0.5-0.4,0.9-0.9,0.9h-7.8c-0.5,0-0.9-0.4-0.9-0.9l0-7.8c0-0.5,0.4-0.9,0.9-0.9h7.8
+		C-266.3,414.2-265.9,414.6-265.9,415z"/>
+	<path fill="#6EA03C" d="M-254.8,415v7.8c0,0.5-0.4,0.9-0.9,0.9h-7.8c-0.5,0-0.9-0.4-0.9-0.9V415c0-0.5,0.4-0.9,0.9-0.9h7.8
+		C-255.2,414.2-254.8,414.6-254.8,415z"/>
+	<path fill="#523228" d="M-254.8,425.8v7.8c0,0.5-0.4,0.9-0.9,0.9h-7.8c-0.5,0-0.9-0.4-0.9-0.9v-7.8c0-0.5,0.4-0.9,0.9-0.9h7.8
+		C-255.2,424.9-254.8,425.3-254.8,425.8z"/>
+	<path fill="#536387" d="M-265.9,425.8v7.8c0,0.5-0.4,0.9-0.9,0.9h-7.8c-0.5,0-0.9-0.4-0.9-0.9v-7.8c0-0.5,0.4-0.9,0.9-0.9h7.8
+		C-266.3,424.9-265.9,425.3-265.9,425.8z"/>
+	<text transform="matrix(1.1288 0 0 1 -273.255 421.5074)" fill="#FFFFFF" font-family="'MyriadPro-Regular'" font-size="7.467">A</text>
+	<text transform="matrix(1.1288 0 0 1 -261.799 421.5074)" fill="#FFFFFF" font-family="'MyriadPro-Regular'" font-size="7.467">B</text>
+	<text transform="matrix(1.1288 0 0 1 -273.3926 432.0856)" fill="#FFFFFF" font-family="'MyriadPro-Regular'" font-size="7.467">C</text>
+	<text transform="matrix(1.1288 0 0 1 -262.3214 432.0856)" fill="#FFFFFF" font-family="'MyriadPro-Regular'" font-size="7.467">D</text>
+</g>
+</svg>