fixed icon in dropdown list of sessions (see #818)

114daf19 · Arturo Montejo Ráez · 6ab36ce0 · 114daf19 · 114daf19 · 114daf19
Commit 114daf19 authored Jan 24, 2017 by Arturo Montejo Ráez
Showing with 7 additions and 9 deletions
android/Pictogram/supervisor_tablet/supervisor_tablet.iml
android/Pictogram/tabletlibrary/tabletlibrary.iml
android/Pictogram/watch/watch.iml
android/Pictogram/yotta_tablet/yotta_tablet.iml
sails/src/assets/scripts/modules/student/views/session.html
--- a/android/Pictogram/supervisor_tablet/supervisor_tablet.iml
+++ b/android/Pictogram/supervisor_tablet/supervisor_tablet.iml
--- a/android/Pictogram/tabletlibrary/tabletlibrary.iml
+++ b/android/Pictogram/tabletlibrary/tabletlibrary.iml
@@ -15,7 +15,6 @@
    <facet type="android" name="Android">
      <configuration>
        <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
        <afterSyncTasks>
@@ -26,7 +25,7 @@
        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
-        <option name="LIBRARY_PROJECT" value="true" />
+        <option name="PROJECT_TYPE" value="1" />
      </configuration>
    </facet>
  </component>
@@ -54,7 +53,6 @@
      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
@@ -62,7 +60,6 @@
      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
@@ -70,7 +67,6 @@
      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
@@ -78,7 +74,6 @@
      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
@@ -86,7 +81,6 @@
      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
@@ -130,7 +124,6 @@
    <orderEntry type="library" exported="" name="support-vector-drawable-24.2.1" level="project" />
    <orderEntry type="library" exported="" name="support-core-utils-24.2.1" level="project" />
    <orderEntry type="module" module-name="commonlibrary" exported="" />
-    <orderEntry type="library" exported="" name="android-android-24" level="project" />
    <orderEntry type="library" exported="" name="okhttp-ws-2.3.0" level="project" />
    <orderEntry type="library" exported="" name="play-services-base-9.2.1" level="project" />
    <orderEntry type="library" exported="" name="socket.io-client-0.5.0" level="project" />

--- a/android/Pictogram/watch/watch.iml
+++ b/android/Pictogram/watch/watch.iml
--- a/android/Pictogram/yotta_tablet/yotta_tablet.iml
+++ b/android/Pictogram/yotta_tablet/yotta_tablet.iml
--- a/sails/src/assets/scripts/modules/student/views/session.html
+++ b/sails/src/assets/scripts/modules/student/views/session.html
@@ -32,7 +32,12 @@
          </a>
        </div>
        <div class="col-md-2" style="text-align: right">
-          <button ng-click="showSessions = !showSessions" class="btn btn-success btn-sm" style="font-size: 10pt">{{ 'sessions' | translate}} <span class="badge" style="font-size: 10pt">{{wsessions.length}}</span> <span class="glyphicon glyphicon-menu-down" ng-show="!showSessions"></span></button>
+          <button ng-click="showSessions = !showSessions" class="btn btn-success btn-sm" style="font-size: 10pt">
+            <i class="fa fa-caret-down" aria-hidden="true" ng-show="!showSessions"></i>
+            <i class="fa fa-caret-up" aria-hidden="true" ng-show="showSessions"></i>
+            <span translate> sessions </span>
+            <span class="badge" style="font-size: 10pt"> {{wsessions.length} }</span>
+          </button>
        </div>
      </p>
    </div>