Merge pull request #73 from up2university/develop

Cosmetic changes and pumukit/pr plugin tidying.

envs-templates/pumukit.env

@@ -1,12 +1,6 @@
 PUMUKIT_MOODLE_PHP_CONFIG="pumukit-settings.scsv"
-PUMUKIT_MOODLE_SQL_CONFIG="pmksearch_mdl_repository_instances.sql pmksearch_mdl_repository_instance_config.sql"
-PMKSEARCH_REPO_NAME=''
-PMKSEARCH_REPOSITORY_TYPE='pmksearch'
-PUMUKIT_PR_SECRET=\"'''\"
+PUMUKIT_MOODLE_SQL_CONFIG=""
+PUMUKIT_PR_SECRET=\"''\"
 REPOSECRETKEY=\"\"
 PUMUKIT_SECRET=\"''\"
 PUMUKIT_URL=\"\"
-PMKSEARCH_REPOSITORY_URL=''
-PMKSEARCH_REPOSITORY_SECRET=''
-PMKSEARCH_MANAGERURL=''
-PMKSEARCH_TICKET_FIELD='email'

moodle/Dockerfile

@@ -87,16 +87,6 @@ RUN cd /var/www/html/auth \
     && mv moodle-auth_saml2* saml2 \
     && rm auth_saml2.zip
 
-COPY ./pumoodle/filter.zip /var/www/html/filter/filter.zip
-RUN cd /var/www/html/filter/ \
-    && unzip filter.zip \
-    && rm filter.zip
-
-COPY ./pumoodle/pmksearch.zip /var/www/html/repository/pmksearch.zip
-RUN cd /var/www/html/repository/ \
-    && unzip pmksearch.zip \
-    && rm pmksearch.zip
-
 COPY ./pumoodle/pumukit.zip /var/www/html/lib/editor/atto/plugins/pumukit.zip
 RUN cd /var/www/html/lib/editor/atto/plugins/ \
     && unzip pumukit.zip \
@@ -115,18 +105,21 @@ RUN cd /var/www/html/filter/ \
 COPY ./knockplop/knockplop.zip /var/www/html/mod/
 RUN cd /var/www/html/mod/ \
     && unzip knockplop.zip \
+    && chown -R www-data:www-data knockplop \
     && rm knockplop.zip
 
 # Install H5P - mod/hvp version 1.6 from https://moodle.org/plugins/mod_hvp
 RUN cd /var/www/html/mod \
     && curl -L https://moodle.org/plugins/download.php/15518/mod_hvp_moodle34_2017112800.zip -o mod_hvp.zip \
     && unzip mod_hvp.zip \
+    && chown -R www-data:www-data hvp \
     && rm mod_hvp.zip
 
 # Install EJSapp pack - mod/ejsapp version 3.0 from https://moodle.org/plugins/mod_ejsapp
 RUN cd /var/www/html/mod \
     && curl -L https://moodle.org/plugins/download.php/14370/mod_ejsapp_moodle34_2017062607.zip -o mod_ejsapp.zip \
     && unzip mod_ejsapp.zip \
+    && chown -R www-data:www-data ejsapp \
     && rm mod_ejsapp.zip
 
 # Install EJSapp repository - repository/osp version 3.0 from https://moodle.org/plugins/repository_osp
@@ -147,7 +140,7 @@ RUN cd /var/www/html/blocks \
     && unzip block_category_enrol.zip \
     && mv moodle-block_category_enrol* category_enrol \
     && rm block_category_enrol.zip
-    
+
 # Install Easy Enrollments - enrol/easy version 1.1 from https://moodle.org/plugins/enrol_easy
 RUN cd /var/www/html/enrol \
     && curl -L https://moodle.org/plugins/download.php/14067/enrol_easy_moodle34_2017052300.zip -o enrol_easy.zip \

moodle/config/moosh-pumukit.sh

@@ -3,3 +3,5 @@ source /envs/pumukit*.env
 set +a
 
 /moosh/moosh.php -n config-set toolbar "$(echo -e ${PUMUKIT_EDITOR_ATTO_TOOLBAR})" editor_atto
+/moosh/moosh.php -n filter-set pumukit 1
+/moosh/moosh.php -n filter-set pumukitpr 1

moodle/config/moosh-theme_fordson-texts.sh

@@ -0,0 +1,8 @@
+set -a
+source /envs/theme_fordson*.env
+set +a
+
+/moosh/moosh.php -n config-set footnote "$(echo -e ${THEME_FORDSON_FOOTNOTE})" theme_fordson
+/moosh/moosh.php -n config-set fptextbox "$(echo -e ${THEME_FORDSON_WELCOME_LOGGED_IN})" theme_fordson
+/moosh/moosh.php -n config-set fptextboxlogout "$(echo -e ${THEME_FORDSON_WELCOME_NOT_LOGGED_IN})" theme_fordson 
+/moosh/moosh.php -n config-set adddrawermenu "$(echo -e ${THEME_FORDSON_DRAWER_MENU})" theme_fordson

moodle/config/moosh-theme_fordson.sh

@@ -5,16 +5,27 @@ if [ -f /moosh-theme_fordson-files.sh ]; then
     rm /moosh-theme_fordson-files.sh
 fi
 
+set -a
+source /envs/theme_fordson*.env
+set +a
+
+for mod in ${THEME_FORDSON_HIDE_MODS}; do 
+    /moosh/moosh.php -n module-manage hide ${mod}
+done
+
 for variable in $(grep 'png\|jpg' ../../../envs/theme_fordson.env | cut -f 1 -d '=') ; do
     set -a
     filename=$(grep ${variable}= ../../../envs/theme_fordson.env | cut -f 2 -d '=' | sed 's%\\/%%g' | sed 's%\\\"%%g' | sed 's%/%%g')
-    component=$(grep ${variable}} /config/template-theme_fordson-settings.scsv | cut -f 1 -d ';' | sed "s/'//g")
-    filearea=$(grep ${variable}} /config/template-theme_fordson-settings.scsv | cut -f 2 -d ';' | sed "s/'//g")
+    component=$(grep ${variable}} /config/template-theme_fordson-settings.scsv | cut -f 1 -d ';' | sed "s/'//g" | sed 's/^[[:space:]]*//g' | sed 's/[[:space:]]*$//g')
+    filearea=$(grep ${variable}} /config/template-theme_fordson-settings.scsv | cut -f 2 -d ';' | sed "s/'//g" | sed 's/^[[:space:]]*//g' | sed 's/[[:space:]]*$//g')
     cat /config/template-moosh-theme_fordson-files.sh | envsubst '${filename},${component},${filearea}' >> /moosh-theme_fordson-files.sh
     set +a
 done
 
 
+
 chmod a+x /moosh-theme_fordson-files.sh
 /moosh-theme_fordson-files.sh
 
+
+

moodle/config/template-pumukit-settings.scsv

@@ -6,7 +6,5 @@
 '';'iframe_multivideo_width'; "592px"
 '';'iframe_multivideo_height'; "333px"
 '';'media_plugins_sortorder'; "videojs,youtube,swf"
-'pmksearch';'enablecourseinstances'; 1
-'pmksearch';'enableuserinstances'; 0
 'atto_pumukit';'pumukiturl'; ${PUMUKIT_URL}
 'atto_pumukitpr';'dialogtitle'; "Add Personal Repository video"

moodle/config/template-theme_fordson-settings.scsv

@@ -15,7 +15,6 @@
 'theme_fordson';'fpstartwrap'; "#ffffff"
 'theme_fordson';'headercolor'; "#000000"
 'theme_fordson';'headerdefaultimage'; ${THEME_FORDSON_HEADER_DEFAULT_IMAGE}
-'theme_fordson';'headerimagepadding'; "600px"
 'theme_fordson';'headerscreen'; "#F1F1F1"
 'theme_fordson';'headingcolor'; "#f26522"
 'theme_fordson';'learningcontentpadding'; "175px"
@@ -27,17 +26,12 @@
 'theme_fordson';'navbarbkg'; "#ffffff"
 'theme_fordson';'navbarurl'; "#000000"
 'theme_fordson';'searchtoggle'; 0
-'theme_fordson';'slide1content'; \'\' 
-'theme_fordson';'slide1title'; "Slideshow test 1"
 'theme_fordson';'titletooltip'; 1
 'theme_fordson';'website'; ${THEME_FORDSON_UP2U_URL}
 'theme_fordson';'shownavclosed';1
 'theme_fordson';'removeprivatefilesnode';1
 'theme_fordson';'removecalendarnode';1
-'theme_fordson';'adddrawermenu';${THEME_FORDSON_DRAWER_MENU}
 'theme_fordson';'catsicon';${THEME_FORDSON_CATSICON}
-'theme_fordson';'fptextbox';${THEME_FORDSON_WELCOME_LOGGED_IN}
-'theme_fordson';'fptextboxlogout';${THEME_FORDSON_WELCOME_NOT_LOGGED_IN}
 'theme_fordson';'backgroundimage';${THEME_FORDSON_BACKGROUND_IMAGE}
 'theme_fordson';'loginimage';${THEME_FORDSON_LOGIN_IMAGE}
 'theme_fordson';'slide1title';${THEME_FORDSON_SLIDESHOW_TITLE_1}
@@ -54,3 +48,41 @@
 'theme_fordson';'showonlycustomactivities';1
 'theme_fordson';'showalltomanager';1
 'theme_fordson';'showslideshow';${THEME_FORDSON_SHOWSLIDESHOW}
+'theme_fordson';'slideshowheight'; "350px"
+'theme_fordson'; 'preset'; "e-Learner"
+'theme_fordson'; 'coursetilestyle'; 2
+'theme_fordson'; 'courseboxheight'; "200px"
+'theme_fordson'; 'headerimagepadding'; "300px"
+'theme_fordson'; 'brandorganization'; ${THEME_FORDSON_BRAND_ORGANIZATION}
+'theme_fordson'; 'brandwebsite'; ${THEME_FORDSON_BRAND_WEBSITE}
+'theme_fordson'; 'brandemail'; ${THEME_FORDSON_BRAND_EMAIL}
+'theme_fordson'; 'iconwidth'; "150px"
+'theme_fordson'; 'nav1icon'; ${THEME_FORDSON_NAV1_ICON}
+'theme_fordson'; 'nav1buttontext'; ${THEME_FORDSON_NAV1_BUTTON_TEXT}
+'theme_fordson'; 'nav2icon'; ${THEME_FORDSON_NAV2_ICON}
+'theme_fordson'; 'nav2buttontext'; ${THEME_FORDSON_NAV2_BUTTON_TEXT}
+'theme_fordson'; 'nav3icon'; ${THEME_FORDSON_NAV3_ICON}
+'theme_fordson'; 'nav3buttontext'; ${THEME_FORDSON_NAV3_BUTTON_TEXT}
+'theme_fordson'; 'togglemarketing'; 1
+'theme_fordson'; 'marketing1'; ${THEME_FORDSON_MARKETING1}
+'theme_fordson'; 'marketing1image'; ${THEME_FORDSON_MARKETING1_IMAGE}
+'theme_fordson'; 'marketing1buttontext'; ${THEME_FORDSON_MARKETING1_BUTTON_TEXT}
+'theme_fordson'; 'marketing1buttonurl'; ${THEME_FORDSON_MARKETING1_BUTTON_URL}
+'theme_fordson'; 'marketing1target'; ${THEME_FORDSON_MARKETING1_TARGET}
+'theme_fordson'; 'marketing2'; ${THEME_FORDSON_MARKETING2}
+'theme_fordson'; 'marketing2image'; ${THEME_FORDSON_MARKETING2_IMAGE}
+'theme_fordson'; 'marketing2buttontext'; ${THEME_FORDSON_MARKETING2_BUTTON_TEXT}
+'theme_fordson'; 'marketing2buttonurl'; ${THEME_FORDSON_MARKETING2_BUTTON_URL}
+'theme_fordson'; 'marketing2target'; ${THEME_FORDSON_MARKETING2_TARGET}
+'theme_fordson'; 'marketing3'; ${THEME_FORDSON_MARKETING3}
+'theme_fordson'; 'marketing3image'; ${THEME_FORDSON_MARKETING3_IMAGE}
+'theme_fordson'; 'marketing3buttontext'; ${THEME_FORDSON_MARKETING3_BUTTON_TEXT}
+'theme_fordson'; 'marketing3buttonurl'; ${THEME_FORDSON_MARKETING3_BUTTON_URL}
+'theme_fordson'; 'marketing3target'; ${THEME_FORDSON_MARKETING3_TARGET}
+'theme_fordson'; 'slide1content'; ${THEME_FORDSON_SLIDESHOW_CONTENT_3}
+'theme_fordson'; 'slide2content'; ${THEME_FORDSON_SLIDESHOW_CONTENT_3}
+'theme_fordson'; 'slide3content'; ${THEME_FORDSON_SLIDESHOW_CONTENT_3}
+'';'frontpage';"0,7,6"
+'';'frontpageloggedin';"0,7,6"
+'';'defaulthomepage';0
+'theme_fordson'; 'scss'; 'footer#page-footer { font-size: 0.8rem}'