Merge pull request #445 from crazyserver/MOBILE-1520

Mobile 1520

Author: jleyva

www/addons/mod_wiki/controllers/index.js

@@ -32,6 +32,7 @@ angular.module('mm.addons.mod_wiki')
 
     $scope.title = $stateParams.pagetitle || module.name;
     $scope.description = module.description;
+    $scope.mainpage = !currentPage;
     $scope.moduleUrl = module.url;
     $scope.courseId = courseId;
     $scope.subwikiData = {

www/addons/mod_wiki/scss/styles.scss

@@ -3,7 +3,7 @@ $mma-mod-wiki-newentry-link-color:   red !default;
 $mma-mod-wiki-toc-title-color:   #666 !default;
 $mma-mod-wiki-toc-border-color:   #bbb !default;
 $mma-mod-wiki-toc-background-color:   #eee !default;
-$mma-mod-wiki-subwiki-selected-background-color:   #f7f7f7 !default;
+$mma-mod-wiki-subwiki-selected-background-color:   #eee !default;
 
 .wiki-toc {
   border: 1px solid $mma-mod-wiki-toc-border-color;

www/addons/mod_wiki/templates/page.html

@@ -1,7 +1,7 @@
 <ion-content delegate-handle="mmaModWikiIndexScroll" padding="true" mm-state-class>
     <ion-refresher pulling-text="{{ 'mm.core.pulltorefresh' | translate }}" ng-if="wikiLoaded" on-refresh="refreshWiki()"></ion-refresher>
     <mm-loading hide-until="wikiLoaded">
-        <mm-course-mod-description description="description" watch="true"></mm-course-mod-description>
+        <mm-course-mod-description description="description" watch="true" ng-if="mainpage"></mm-course-mod-description>
         <article>
             <mm-format-text class="mm-content-with-float" watch="true">{{ pageContent }}</mm-format-text>
         </article>

www/core/scss/styles.scss

@@ -132,7 +132,8 @@ em {
 }
 
 // Defines a "disabled" item.
-.item.item-disabled {
+.item.item-disabled,
+.platform-android .item.item-disabled {
   color: $item-disabled-color;
 }