From 707575df16588fe480f77f4bb34c9d20ffc0530f Mon Sep 17 00:00:00 2001 From: Christian Memije Date: Thu, 12 Jan 2017 16:46:07 -0800 Subject: [PATCH 001/401] Update le-utils. --- requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/base.txt b/requirements/base.txt index 82c6f3dae88..2078aa9c3e5 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -14,5 +14,5 @@ https://github.com/fle-internal/django-q/archive/934d557d77ded18c4a73a702905a6f8 porter2stemmer==1.0 unicodecsv==0.14.1 metafone==0.5 -le-utils==0.0.9rc11 +le-utils==0.0.9rc14 kolibri-exercise-perseus-renderer==0.2.8 From 0d92d2d4512fb72fc6616fb1578be0cf79bb1eaf Mon Sep 17 00:00:00 2001 From: David Canas Date: Thu, 12 Jan 2017 18:49:11 -0800 Subject: [PATCH 002/401] Restructuring login-modal to have its own subdirectory. Previously was inlcuded as part of session-nav-widget but thought this was a cleaner structure. --- .../icons/kolibri-logo.svg | 0 .../icons/password-active.svg | 0 .../{session-nav-widget => login-modal}/icons/password.svg | 0 .../icons/user-active.svg | 0 .../vue/{session-nav-widget => login-modal}/icons/user.svg | 0 .../login-modal.vue => login-modal/index.vue} | 0 kolibri/core/assets/src/vue/nav-bar/index.vue | 5 +++++ kolibri/core/assets/src/vue/session-nav-widget/index.vue | 4 ---- 8 files changed, 5 insertions(+), 4 deletions(-) rename kolibri/core/assets/src/vue/{session-nav-widget => login-modal}/icons/kolibri-logo.svg (100%) rename kolibri/core/assets/src/vue/{session-nav-widget => login-modal}/icons/password-active.svg (100%) rename kolibri/core/assets/src/vue/{session-nav-widget => login-modal}/icons/password.svg (100%) rename kolibri/core/assets/src/vue/{session-nav-widget => login-modal}/icons/user-active.svg (100%) rename kolibri/core/assets/src/vue/{session-nav-widget => login-modal}/icons/user.svg (100%) rename kolibri/core/assets/src/vue/{session-nav-widget/login-modal.vue => login-modal/index.vue} (100%) diff --git a/kolibri/core/assets/src/vue/session-nav-widget/icons/kolibri-logo.svg b/kolibri/core/assets/src/vue/login-modal/icons/kolibri-logo.svg similarity index 100% rename from kolibri/core/assets/src/vue/session-nav-widget/icons/kolibri-logo.svg rename to kolibri/core/assets/src/vue/login-modal/icons/kolibri-logo.svg diff --git a/kolibri/core/assets/src/vue/session-nav-widget/icons/password-active.svg b/kolibri/core/assets/src/vue/login-modal/icons/password-active.svg similarity index 100% rename from kolibri/core/assets/src/vue/session-nav-widget/icons/password-active.svg rename to kolibri/core/assets/src/vue/login-modal/icons/password-active.svg diff --git a/kolibri/core/assets/src/vue/session-nav-widget/icons/password.svg b/kolibri/core/assets/src/vue/login-modal/icons/password.svg similarity index 100% rename from kolibri/core/assets/src/vue/session-nav-widget/icons/password.svg rename to kolibri/core/assets/src/vue/login-modal/icons/password.svg diff --git a/kolibri/core/assets/src/vue/session-nav-widget/icons/user-active.svg b/kolibri/core/assets/src/vue/login-modal/icons/user-active.svg similarity index 100% rename from kolibri/core/assets/src/vue/session-nav-widget/icons/user-active.svg rename to kolibri/core/assets/src/vue/login-modal/icons/user-active.svg diff --git a/kolibri/core/assets/src/vue/session-nav-widget/icons/user.svg b/kolibri/core/assets/src/vue/login-modal/icons/user.svg similarity index 100% rename from kolibri/core/assets/src/vue/session-nav-widget/icons/user.svg rename to kolibri/core/assets/src/vue/login-modal/icons/user.svg diff --git a/kolibri/core/assets/src/vue/session-nav-widget/login-modal.vue b/kolibri/core/assets/src/vue/login-modal/index.vue similarity index 100% rename from kolibri/core/assets/src/vue/session-nav-widget/login-modal.vue rename to kolibri/core/assets/src/vue/login-modal/index.vue diff --git a/kolibri/core/assets/src/vue/nav-bar/index.vue b/kolibri/core/assets/src/vue/nav-bar/index.vue index 9bd348d745c..67cab4f390e 100644 --- a/kolibri/core/assets/src/vue/nav-bar/index.vue +++ b/kolibri/core/assets/src/vue/nav-bar/index.vue @@ -20,6 +20,9 @@ + + + @@ -72,12 +75,14 @@ components: { 'session-nav-widget': require('../session-nav-widget'), 'nav-bar-item': require('kolibri.coreVue.components.navBarItem'), + 'login-modal': require('../login-modal'), }, vuex: { getters: { session: state => state.core.session, isAdminOrSuperuser: getters.isAdminOrSuperuser, isCoachAdminOrSuperuser: getters.isCoachAdminOrSuperuser, + loginModalVisible: state => state.core.loginModalVisible, }, }, }; diff --git a/kolibri/core/assets/src/vue/session-nav-widget/index.vue b/kolibri/core/assets/src/vue/session-nav-widget/index.vue index 452fcfe9e7f..f8a1db3c5a9 100644 --- a/kolibri/core/assets/src/vue/session-nav-widget/index.vue +++ b/kolibri/core/assets/src/vue/session-nav-widget/index.vue @@ -37,8 +37,6 @@ - - @@ -57,7 +55,6 @@ }, components: { 'nav-bar-item': require('kolibri.coreVue.components.navBarItem'), - 'login-modal': require('./login-modal'), }, data: () => ({ showDropdown: false, @@ -111,7 +108,6 @@ fullname: state => state.core.session.full_name, username: state => state.core.session.username, kind: state => state.core.session.kind, - loginModalVisible: state => state.core.loginModalVisible, }, }, }; From 409d53e7fd3170b8769b346401a180d841dc521d Mon Sep 17 00:00:00 2001 From: Radina Matic Date: Fri, 13 Jan 2017 18:53:48 +0100 Subject: [PATCH 003/401] Added tip about making dev server available through LAN --- docs/dev/getting_started.rst | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/docs/dev/getting_started.rst b/docs/dev/getting_started.rst index b74fee87019..30cb76d1774 100644 --- a/docs/dev/getting_started.rst +++ b/docs/dev/getting_started.rst @@ -103,6 +103,17 @@ Now you should be able to access the server at ``http://127.0.0.1:8000/``. Most functionality works fine in the devserver, but some issues exist with streaming media such as videos and audio. +.. tip:: + + If you need to make the development server available through the LAN, you must leave out the ``--webpack`` flag, and use the following command: + + .. code-block:: bash + + npm run build + kolibri manage devserver --debug -- 0.0.0.0:8000 --qcluster + + Now you can simply use your server's IP from another device in the local network through the port 8000, for example ``http://192.168.1.38:8000/``. + Running the Production Server ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ From 61e6b012bd08acfa93c271ab54fff88514eb8d71 Mon Sep 17 00:00:00 2001 From: Christian Memije Date: Fri, 13 Jan 2017 10:03:54 -0800 Subject: [PATCH 004/401] Replaced fullscreen logic within pdf and html5 plugins with screenfull.js. --- .../assets/src/vue/index.vue | 56 +++--------------- .../assets/src/vue/index.vue | 57 +++---------------- package.json | 1 + 3 files changed, 16 insertions(+), 98 deletions(-) diff --git a/kolibri/plugins/document_pdf_render/assets/src/vue/index.vue b/kolibri/plugins/document_pdf_render/assets/src/vue/index.vue index 753b3898c40..8542098ec46 100644 --- a/kolibri/plugins/document_pdf_render/assets/src/vue/index.vue +++ b/kolibri/plugins/document_pdf_render/assets/src/vue/index.vue @@ -4,8 +4,8 @@ + :text="isFullScreen ? $tr('exitFullscreen') : $tr('enterFullscreen')" + @click="toggleFullScreen"/>
@@ -15,6 +15,7 @@ + + + diff --git a/kolibri/plugins/coach_tools/assets/src/vue/index.vue b/kolibri/plugins/coach_tools/assets/src/vue/index.vue index 9d4ea89ed4a..087443709a4 100644 --- a/kolibri/plugins/coach_tools/assets/src/vue/index.vue +++ b/kolibri/plugins/coach_tools/assets/src/vue/index.vue @@ -31,7 +31,8 @@ logInCommand: 'You must be logged in as an Admin to view this page.', }, components: { - reports: require('./reports'), + 'reports': require('./reports'), + 'content-unavailable-page': require('./content-unavailable-page'), }, computed: { topLevelPageName: () => TopLevelPageNames.COACH, @@ -39,6 +40,9 @@ if (this.pageName === constants.PageNames.REPORTS) { return 'reports'; } + if (this.pageName === constants.PageNames.CONTENT_UNAVAILABLE) { + return 'content-unavailable-page'; + } return null; }, }, From 0eed8f0a1aa396705f69d43ad4cfe88f500a72af Mon Sep 17 00:00:00 2001 From: David Date: Thu, 19 Jan 2017 19:44:10 -0800 Subject: [PATCH 041/401] Wrapping strings in Manage > create modal --- .../src/vue/user-page/user-create-modal.vue | 50 +++++++++++++------ 1 file changed, 36 insertions(+), 14 deletions(-) diff --git a/kolibri/plugins/management/assets/src/vue/user-page/user-create-modal.vue b/kolibri/plugins/management/assets/src/vue/user-page/user-create-modal.vue index bc52bf364cd..44948ec5e8a 100644 --- a/kolibri/plugins/management/assets/src/vue/user-page/user-create-modal.vue +++ b/kolibri/plugins/management/assets/src/vue/user-page/user-create-modal.vue @@ -1,7 +1,7 @@ diff --git a/kolibri/plugins/management/assets/src/vue/data-page/index.vue b/kolibri/plugins/management/assets/src/vue/data-page/index.vue index 02ac2ddd1c9..4579ae3e85f 100644 --- a/kolibri/plugins/management/assets/src/vue/data-page/index.vue +++ b/kolibri/plugins/management/assets/src/vue/data-page/index.vue @@ -15,7 +15,7 @@

- +

@@ -30,7 +30,7 @@

- +

diff --git a/kolibri/plugins/management/assets/src/vue/manage-content-page/index.vue b/kolibri/plugins/management/assets/src/vue/manage-content-page/index.vue index ce8add7d4db..9fed21dde51 100644 --- a/kolibri/plugins/management/assets/src/vue/manage-content-page/index.vue +++ b/kolibri/plugins/management/assets/src/vue/manage-content-page/index.vue @@ -22,7 +22,7 @@ class="button" @click="startImportWizard" :primary="true"> - +

- +
diff --git a/kolibri/plugins/management/assets/src/vue/manage-content-page/wizard-import-local.vue b/kolibri/plugins/management/assets/src/vue/manage-content-page/wizard-import-local.vue index 59fbc763619..d1541f51d9e 100644 --- a/kolibri/plugins/management/assets/src/vue/manage-content-page/wizard-import-local.vue +++ b/kolibri/plugins/management/assets/src/vue/manage-content-page/wizard-import-local.vue @@ -13,7 +13,7 @@ diff --git a/kolibri/plugins/management/assets/src/vue/manage-content-page/wizard-import-source.vue b/kolibri/plugins/management/assets/src/vue/manage-content-page/wizard-import-source.vue index 020760ded60..38ec269663e 100644 --- a/kolibri/plugins/management/assets/src/vue/manage-content-page/wizard-import-source.vue +++ b/kolibri/plugins/management/assets/src/vue/manage-content-page/wizard-import-source.vue @@ -8,10 +8,10 @@
- + - +
- - +
+ + +
+
+ + +
@@ -135,10 +141,11 @@ margin-bottom: 15px .login-form - width: 300px + width: 275px margin: 0 auto - display: block - padding: 5px 30px + display: inline-block + padding-top: 5px + padding-bottom: 5px letter-spacing: 0.08em border: none border-bottom: 1px solid $core-text-default @@ -149,18 +156,15 @@ .login-username margin: 30px auto - background: url('./icons/user.svg') no-repeat 8px 6px transition: all 0.15s - &:focus - background: url('./icons/user-active.svg') no-repeat 8px 6px .login-password - background: url('./icons/password.svg') no-repeat 7px 3px transition: all 0.15s - &:focus - background: url('./icons/password-active.svg') no-repeat 7px 3px .error-wrapper text-align: center + svg + vertical-align: middle + diff --git a/kolibri/core/assets/src/vue/session-nav-widget/index.vue b/kolibri/core/assets/src/vue/session-nav-widget/index.vue index 06e8d650308..cb40341b162 100644 --- a/kolibri/core/assets/src/vue/session-nav-widget/index.vue +++ b/kolibri/core/assets/src/vue/session-nav-widget/index.vue @@ -29,6 +29,7 @@
  • + {{ $tr('logOut') }}
  • @@ -226,13 +227,15 @@ div color: $core-action-normal transition: all 0.2s - background: url('./icons/active-logout.svg') no-repeat + svg + fill: $core-action-normal + display: inline-block &:hover - background: url('./icons/logout-hover.svg') no-repeat + svg + fill: $core-action-dark span position: relative bottom: 2px - margin-left: 25px &:hover cursor: pointer color: $core-action-dark diff --git a/kolibri/plugins/audio_mp3_render/assets/src/vue/index.vue b/kolibri/plugins/audio_mp3_render/assets/src/vue/index.vue index d90ac26d9e4..adb5cbb7aec 100644 --- a/kolibri/plugins/audio_mp3_render/assets/src/vue/index.vue +++ b/kolibri/plugins/audio_mp3_render/assets/src/vue/index.vue @@ -5,8 +5,10 @@ + > + + +
    {{ currentMinutes }} : {{ formattedCurrentSec }}
    @@ -55,8 +57,7 @@ ], data: () => ({ - isPlay: true, - isPause: false, + isPlaying: false, max: 0, displayTime: 0, progressStartingPoint: 0, @@ -106,16 +107,14 @@ methods: { play() { this.$refs.audio.play(); - this.isPlay = false; - this.isPause = true; + this.isPlaying = true; this.recordProgress(); this.$emit('startTracking'); }, pause() { this.$refs.audio.pause(); - this.isPlay = true; - this.isPause = false; + this.isPlaying = false; this.recordProgress(); this.$emit('stopTracking'); }, @@ -230,12 +229,6 @@ #current-time, #total-time top: 0 - .is-play - background: url('./play.svg') no-repeat - - .is-pause - background: url('./pause.svg') no-repeat - .timeline background: transparent @@ -306,4 +299,8 @@ input width: 25% + .play-icon + fill: $core-action-normal + transform: scale(3.5) + diff --git a/kolibri/plugins/learn/assets/src/vue/topic-list-item/index.vue b/kolibri/plugins/learn/assets/src/vue/topic-list-item/index.vue index 35ba627ce8f..cb4ca106e40 100644 --- a/kolibri/plugins/learn/assets/src/vue/topic-list-item/index.vue +++ b/kolibri/plugins/learn/assets/src/vue/topic-list-item/index.vue @@ -2,7 +2,9 @@
    -
    +
    + +
    @@ -50,11 +52,6 @@ position: relative width: 60% height: 100% - background-position: center - background-image: url(../icons/folder.svg) - background-repeat: no-repeat - // chosen to approximage ~0.5em - the card's internal padding - background-size: 78% margin-left: 10% From 021cb4711d8c0b688382c8d96bbc7bf5a41011a9 Mon Sep 17 00:00:00 2001 From: David Date: Thu, 2 Feb 2017 13:15:01 -0800 Subject: [PATCH 106/401] Tweaking conditional render, messages in local import tool. Adding namespace to manageContent page --- .../assets/src/vue/manage-content-page/index.vue | 4 ++-- .../vue/manage-content-page/wizard-import-local.vue | 11 +++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/kolibri/plugins/management/assets/src/vue/manage-content-page/index.vue b/kolibri/plugins/management/assets/src/vue/manage-content-page/index.vue index daef2f9d7bf..6fe87fe30e3 100644 --- a/kolibri/plugins/management/assets/src/vue/manage-content-page/index.vue +++ b/kolibri/plugins/management/assets/src/vue/manage-content-page/index.vue @@ -59,7 +59,7 @@ - + @@ -71,7 +71,7 @@ const ContentWizardPages = require('../../state/constants').ContentWizardPages; module.exports = { - $trNameSpace: '', + $trNameSpace: 'manage-content-state', $trs: { title: 'My Channels', import: 'Import', diff --git a/kolibri/plugins/management/assets/src/vue/manage-content-page/wizard-import-local.vue b/kolibri/plugins/management/assets/src/vue/manage-content-page/wizard-import-local.vue index 5aaacab5409..775c67f4e7a 100644 --- a/kolibri/plugins/management/assets/src/vue/manage-content-page/wizard-import-local.vue +++ b/kolibri/plugins/management/assets/src/vue/manage-content-page/wizard-import-local.vue @@ -12,7 +12,7 @@