Merge pull request #659 from LearningLocker/develop

v1.5.1

Author: ryasmi

app/views/partials/client/manage.blade.php

@@ -16,7 +16,7 @@
   <div>
     <div class="alert alert-success clearfix">
       <div class="col-sm-10">
-        <b>{{ trans('lrs.endpoint.endpoint') }}:</b> <span class="break-words">{{ URL() }}/data/xAPI</span>
+        <b>{{ trans('lrs.endpoint.endpoint') }}:</b> <span class="break-words">{{ URL() }}/data/xAPI/</span>
       </div>
     </div>
     <div>
@@ -54,4 +54,4 @@
     </div>
   </div>
 
-@stop
+@stop

app/views/partials/site/backbone/templates.blade.php

@@ -14,10 +14,10 @@
   <td>
     <%= created_at %>
   </td>
-  <td>
+  <td class="text-center">
     <a href="{{ URL() }}/lrs/<%= _id %>/edit" class="btn btn-xs btn-success btn-space" title="{{ Lang::get('site.edit') }}"><i class="icon-pencil"></i></a>
   </td>
-  <td>
+  <td class="text-center">
     <button class="btn btn-danger btn-xs delete" title="{{ Lang::get('site.delete') }}"><i class="icon-trash"></i></button>
   </td>
 </script>
@@ -30,8 +30,8 @@
       <th>Statement #</th>
       <th>User #</th>
       <th>Created</th>
-      <th>Edit</th>
-      <th></th>
+      <th class="text-center">Edit</th>
+      <th class="text-center">Delete</th>
     </tr>
   </thead>
   <tbody></tbody>
@@ -60,7 +60,7 @@
   <td class="col-sm-2">
     <%= email %>
   </td>
-  <td class="col-sm-4">
+  <td class="col-sm-3">
     <% if ( lrs_owned.length > 0 ){ %>
       <p>Lrs's owned:
       <% _.each(lrs_owned, function(lrs) { %>  
@@ -86,7 +86,7 @@
   <td class="col-sm-2">
     <%= created_at %>
   </td>
-  <td class="col-sm-1">
+  <td class="col-sm-2 text-center">
     <button class="btn btn-danger btn-xs delete" title="{{ Lang::get('site.delete') }}"><i class="icon-trash"></i></button>
   </td>
 </script>
@@ -100,7 +100,7 @@
       <th>LRSs</th>
       <th>Role</th>
       <th>Joined</th>
-      <th></th>
+      <th class="text-center">Delete</th>
     </tr>
   </thead>
   <tbody></tbody>
@@ -125,7 +125,7 @@
   <td>
     <%= created_at %>
   </td>
-  <td>
+  <td class="text-center">
     <button class="btn btn-danger btn-xs delete" title="{{ Lang::get('site.delete') }}"><i class="icon-remove"></i></button>
   </td>
 </script>

public/assets/js/exports/exports/collectionTemplate.html

@@ -10,8 +10,8 @@
       <th><%= trans('exporting.fields.name') %></th>
       <th><%= trans('exporting.fields.description') %></th>
       <th><%= trans('exporting.fields.created') %></th>
-      <th><%= trans('exporting.actions.edit') %></th>
-      <th><%= trans('exporting.actions.delete') %></th>
+      <th class="text-center"><%= trans('exporting.actions.edit') %></th>
+      <th class="text-center"><%= trans('exporting.actions.delete') %></th>
     </tr>
   </thead>
   <tbody id="exports">

public/assets/js/exports/exports/modelTemplate.html

@@ -7,12 +7,12 @@
 <td>
   <%= created_at %>
 </td>
-<td>
+<td class="text-center">
   <a id="edit" class="btn btn-info btn-sm" href="#<%= _id %>">
     <i class="icon icon-pencil"></i>
   </a>
 </td>
-<td>
+<td class="text-center">
   <div id="delete" class="btn btn-danger btn-sm">
     <i class="icon icon-trash"></i>
   </div>

public/assets/js/reports/reports/Typeahead/itemView.html

@@ -1,4 +1,4 @@
 <td>
   <input id="typeahead-value" value="<%= value %>" data-toggle="tooltip" data-placement="bottom" placeholder="<%= example %>"/>
 </td>
-<td><a id="trash" class="btn btn-danger btn-sm"><i class="icon icon-minus"></i></a></td>
+<td class="text-center"><a id="trash" class="btn btn-danger btn-sm"><i class="icon icon-minus"></i></a></td>

public/assets/js/reports/reports/editLayout.js

@@ -114,7 +114,27 @@ define([
     relations: {
       actors: typeaheadHelpers.view('actors', 'Actor', 'Start typing name e.g. Bob', typeaheadHelpers.displayActor),
       verbs: typeaheadHelpers.view('verbs', 'Verb', 'Start typing verb e.g. completed', function (item) {
-        var id = item.id
+        var id = item.id;
+        var value = null;
+
+        // Return a human-readable value if the browser defines languages.
+        if (navigator.languages instanceof Array) {
+          value = item.display && (navigator.languages.map(function (lang) {
+            return item.display[lang];
+          }).filter(function (value) {
+            return value != null;
+          })[0] || (item.display[Object.keys(item.display)[0]]));
+        }
+
+        // Display human-readable value if it exists
+        if (value != null) {
+          return value + ' (' + id + ')';
+        }
+
+        // Otherwise display just the identifier.
+        else {
+          return id
+        }
         return item.display['en-GB'] + ' (' + id + ')';
       }),
       activities: typeaheadHelpers.view('activities', 'Activity URL', 'www.example.com/quiz/1'),

public/assets/js/reports/reports/row.html

@@ -1,7 +1,7 @@
 <td><%= name %></td>
 <td><%= description %></td>
 <td><%= created_at %></td>
-<td><a id="edit" href="#<%= _id %>/edit" class="btn btn-info btn-sm"><i class="icon icon-pencil"></i></a></td>
-<td><a id="graph" href="#<%= _id %>/graph" class="btn btn-success btn-sm" data-toggle="tooltip" data-placement="bottom" title="View a graph of statements that match this report"><i class="icon icon-signal"></i></a></td>
-<td><a id="statements" href="reporting/<%= _id %>/statements" class="btn btn-success btn-sm" data-toggle="tooltip" data-placement="bottom" title="View a list of statements that match this report"><i class="icon icon-eye-open"></i></a></td>
-<td><a id="trash" class="btn btn-danger btn-sm"><i class="icon icon-trash"></i></a></td>
+<td class="text-center"><a id="edit" href="#<%= _id %>/edit" class="btn btn-info btn-sm"><i class="icon icon-pencil"></i></a></td>
+<td class="text-center"><a id="graph" href="#<%= _id %>/graph" class="btn btn-success btn-sm" data-toggle="tooltip" data-placement="bottom" title="View a graph of statements that match this report"><i class="icon icon-signal"></i></a></td>
+<td class="text-center"><a id="statements" href="reporting/<%= _id %>/statements" class="btn btn-success btn-sm" data-toggle="tooltip" data-placement="bottom" title="View a list of statements that match this report"><i class="icon icon-eye-open"></i></a></td>
+<td class="text-center"><a id="trash" class="btn btn-danger btn-sm"><i class="icon icon-trash"></i></a></td>

public/assets/js/reports/reports/table.html

@@ -9,10 +9,10 @@
       <th><%= trans('site.name') %></th>
       <th><%= trans('site.description') %></th>
       <th><%= trans('reporting.created') %></th>
-      <th><%= trans('site.edit') %></th>
-      <th><%= trans('reporting.graph') %></th>
-      <th><%= trans('statements.statements') %></th>
-      <th><%= trans('site.delete') %></th>
+      <th class="text-center"><%= trans('site.edit') %></th>
+      <th class="text-center"><%= trans('reporting.graph') %></th>
+      <th class="text-center"><%= trans('statements.statements') %></th>
+      <th class="text-center"><%= trans('site.delete') %></th>
     </tr>
   </thead>
   <tbody id="models"></tbody>

public/assets/js/reports/reports/typeaheadHelpers.js

@@ -10,11 +10,11 @@ define([
 
       // Return a human-readable value if the browser defines languages.
       if (navigator.languages instanceof Array) {
-        value = navigator.languages.map(function (lang) {
-          return item.definition && item.definition.name && item.definition.name[lang];
+        value = item.definition && item.definition.name && (navigator.languages.map(function (lang) {
+          return item.definition.name[lang];
         }).filter(function (value) {
           return value != null;
-        })[0];
+        })[0] || (item.definition.name[Object.keys(item.definition.name)[0]]));
       }
 
       // Display human-readable value if it exists