Merge pull request #1 from learnweb/master

Rebase

Author: Laur0r

classes/admin_form.php

@@ -239,7 +239,8 @@ private function getunassignedcats() {
                                                 FROM {course_categories}
                                                 LEFT JOIN {block_evasys_sync_categories}
                                                 ON {block_evasys_sync_categories}.course_category = {course_categories}.id
-                                                WHERE {block_evasys_sync_categories}.course_category IS NULL');
+                                                WHERE {block_evasys_sync_categories}.course_category IS NULL
+                                                ORDER BY name ASC');
 
         $cat = array();
         foreach ($categories as $category) {
@@ -299,4 +300,4 @@ public function validation($data, $files) {
 
         return $errors;
     }
-}
+}

lang/de/block_evasys_sync.php

@@ -145,6 +145,7 @@
 // Capabilities.
 $string['evasys_sync:mayevaluate'] = 'An Kursevaluation teilnehmen';
 $string['evasys_sync:synchronize'] = 'Teilnehmer zu EvaSys synchronisieren';
+$string['evasys_sync:modifymapping'] = 'Verknüpfung von EvaSys Veranstaltungen zu Moodle Kurs bearbeiten';
 
 // Settings.
 $string['settings'] = 'EvaSys Sync Block Einstellungen';

lang/en/block_evasys_sync.php

@@ -152,6 +152,7 @@
 // Capabilities.
 $string['evasys_sync:mayevaluate'] = 'Evaluate a course using EvaSys';
 $string['evasys_sync:synchronize'] = 'Export participants to EvaSys';
+$string['evasys_sync:modifymapping'] = 'Modify mapping of EvaSys courses to moodle course';
 
 // Settings.
 $string['settings'] = 'EvaSys Sync Block Settings';

templates/block.mustache

@@ -43,7 +43,7 @@ Example context (json):
     {{#courses}}
         {{#.}}
             <div title="{{# str}}evacourseid, block_evasys_sync{{/str}} {{evasyscourseid}}
-                {{# str}}evainternalid, block_evasys_sync{{/str}} {{technicalid}}">
+{{# str}}evainternalid, block_evasys_sync{{/str}} {{technicalid}}">
                 <span class="emphasize">{{# str}}evacoursename, block_evasys_sync{{/str}}</span> {{evasyscoursetitle}}</div>
             <div>
                 <span class="emphasize">{{# str}}countparticipants, block_evasys_sync{{/str}}</span>
@@ -124,4 +124,4 @@ Example context (json):
             <input id='evasyssubmitbutton' class="in_box_button" type="submit" value="{{# str}}planorstartevaluation, block_evasys_sync{{/str}}" {{#disablesubmit}}disabled{{/disablesubmit}}/>
         {{/direct}}
     {{/showcontrols}}
-</form>
+</form>