Skip to content
This repository was archived by the owner on Nov 25, 2020. It is now read-only.

Commit 1afd08e

Browse files
ghecquetghecquet
committed
Merge branch 'develop' of http://github.com/pydio/pydio-core into develop
* 'develop' of http://github.com/pydio/pydio-core: Add QRCode action for passing user / server name via qrcode to new mobile apps. Disabled by default. Re-implement QRCode feature for shared links fix FR typo Escape quotes and parenthesis before setting backgroundImage style i18n update Reload messages when switching language New plugtype strings
2 parents 5e7a79a + 558aeb1 commit 1afd08e

File tree

226 files changed

+2541
-959
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

226 files changed

+2541
-959
lines changed

‎core/src/core/classes/class.AJXP_Utils.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1138,8 +1138,9 @@ public static function updateAllI18nLibraries($createLanguage = "")
11381138
self::updateI18nFiles($path, false, $createLanguage);
11391139
self::updateI18nFiles($path . "/conf", true, $createLanguage);
11401140
} else {
1141-
self::updateI18nFiles($path, true, $createLanguage);
11421141
self::updateI18nFiles($path . "/conf", true, $createLanguage);
1142+
if($nameSpace == "user_home") continue;
1143+
self::updateI18nFiles($path, true, $createLanguage);
11431144
}
11441145
}
11451146
}

‎core/src/plugins/access.ajxp_home/class.HomePagePlugin.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@ public function parseSpecificContributions(&$contribNode){
5252
$gettingStartedList->item(0)->appendChild($newCData);
5353
$gettingStartedList->item(0)->replaceChild($newCData, $cdata);
5454
}
55+
}else if($contribNode->nodeName == "actions" && $this->getFilteredOption("DISPLAY_SERVER_QRCODE_ACTION") === false){
56+
$actionXpath = new DOMXPath($contribNode->ownerDocument);
57+
$actionList = $actionXpath->query('action[@name="display-server-qrcode"]', $contribNode);
58+
$contribNode->removeChild($actionList->item(0));
5559
}
5660
}
5761

‎core/src/plugins/access.ajxp_home/manifest.xml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,26 @@
2121
label="CONF_MESSAGE[Windows PydioSync URL]" description="CONF_MESSAGE[URL of the windows sync application]" default="https://pydio.com/en/products/downloads/pydiosync-desktop-app/"/>
2222
<global_param name="URL_APP_SYNC_MAC" type="string" expose="true"
2323
label="CONF_MESSAGE[Mac PydioSync URL]" description="CONF_MESSAGE[URL of the mac sync application]" default="https://pydio.com/en/products/downloads/pydiosync-desktop-app/"/>
24-
24+
<global_param name="DISPLAY_SERVER_QRCODE_ACTION" type="boolean" label="CONF_MESSAGE[Display Server QRCode]"
25+
description="CONF_MESSAGE[Let users connect easily to the latest mobile applications by displaying a QRCode]" default="false"/>
2526
</server_settings>
2627
<registry_contributions>
28+
<actions>
29+
<action name="display-server-qrcode">
30+
<gui src="folder.png" iconClass="mdi mdi-qrcode-scan" text="user_home.72" title="user_home.73">
31+
<context actionBarGroup="utils" actionBar="true" dir="true" recycle="true" selection="false" ajxpWidgets="UserWidget::logging_string"/>
32+
</gui>
33+
<processing>
34+
<clientCallback prepareModal="false"><![CDATA[
35+
var dialog = new AjxpReactDialogLoader('WelcomeComponents', 'QRCodeDialogLoader', {});
36+
dialog.openDialog('qrcode_dialog_form', true);
37+
]]></clientCallback>
38+
<clientForm id="qrcode_dialog_form"><![CDATA[
39+
<div id="qrcode_dialog_form" box_width="296" box_padding="0" class="react-mui-context SF_material"></div>
40+
]]></clientForm>
41+
</processing>
42+
</action>
43+
</actions>
2744
<client_configs>
2845
<template_part theme="umbra" ajxpId="sidebar_splitter" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fake":"option"}'><![CDATA[
2946
<div id="folderPane" ajxpClass="FoldersTree" ajxpOptions='{"display":"dz","replaceScroller":true}' ajxpPaneHeader="363" ajxpPaneIcon="view_tree.png" style="margin:20px;"></div>

‎core/src/plugins/access.ajxp_home/res/home.css

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -647,6 +647,22 @@ div#tutorial_dl_apps_pane div#dl_pydio_mac div {
647647
div#tutorial_dl_apps_pane div#dl_pydio_android a.icon-android {
648648
top: 30px;
649649
}
650+
.form-qrcode_dialog_form {
651+
min-width: 296px;
652+
}
653+
.form-qrcode_dialog_form .dialogTitle {
654+
display: none;
655+
}
656+
.form-qrcode_dialog_form .home-qrCode-desc {
657+
padding: 0 20px;
658+
}
659+
.form-qrcode_dialog_form .home-qrCode {
660+
text-align: center;
661+
}
662+
.form-qrcode_dialog_form .button-panel {
663+
text-align: right;
664+
padding: 10px;
665+
}
650666
@media only screen and (max-width: 980px) {
651667
#notifications_center div.notif_event_container {
652668
width: 100px;

‎core/src/plugins/access.ajxp_home/res/home.less

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -680,6 +680,22 @@ div#tutorial_dl_apps_pane{
680680
}
681681

682682

683+
.form-qrcode_dialog_form{
684+
min-width: 296px;
685+
.dialogTitle{
686+
display: none;
687+
}
688+
.home-qrCode-desc{
689+
padding: 0 20px;
690+
}
691+
.home-qrCode{
692+
text-align: center;
693+
}
694+
.button-panel{
695+
text-align: right;
696+
padding: 10px;
697+
}
698+
}
683699

684700
@media only screen
685701
and (max-width : 980px){

‎core/src/plugins/access.ajxp_home/res/i18n/ca.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,5 +87,8 @@
8787
"69"=> "Download Sync Client for Mac OSX",
8888
"70"=> "Native application for iOS devices",
8989
"71"=> "Native application for Android Devices",
90+
"72" => "Server QRCode",
91+
"73" => "Easily connect your mobile applications",
92+
"74" => "Scan this QRCode with your mobile application to easily configure the connection",
9093

9194
);

‎core/src/plugins/access.ajxp_home/res/i18n/de.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,4 +84,7 @@
8484
"69"=> "Sync-Client für Mac OSX herunterladen",
8585
"70"=> "App für iOS-Geräte",
8686
"71"=> "App für Android-Geräte",
87+
"72" => "Server QRCode",
88+
"73" => "Easily connect your mobile applications",
89+
"74" => "Scan this QRCode with your mobile application to easily configure the connection",
8790
);

‎core/src/plugins/access.ajxp_home/res/i18n/en.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,4 +84,7 @@
8484
"69"=> "Download Sync Client for Mac OSX",
8585
"70"=> "Native application for iOS devices",
8686
"71"=> "Native application for Android Devices",
87+
"72" => "Server QRCode",
88+
"73" => "Easily connect your mobile applications",
89+
"74" => "Scan this QRCode with your mobile application to easily configure the connection",
8790
);

‎core/src/plugins/access.ajxp_home/res/i18n/es.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,5 +88,8 @@
8888
"69"=> "Download Sync Client for Mac OSX",
8989
"70"=> "Native application for iOS devices",
9090
"71"=> "Native application for Android Devices",
91+
"72" => "Server QRCode",
92+
"73" => "Easily connect your mobile applications",
93+
"74" => "Scan this QRCode with your mobile application to easily configure the connection",
9194

9295
);

‎core/src/plugins/access.ajxp_home/res/i18n/fr.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,9 @@
8181
"67"=> "Vous n'êtes pas %s, %logout.",
8282
"68"=> "Télécharger l'appli de synchro (Windows)",
8383
"69"=> "Télécharger l'appli de synchro (Mac)",
84-
"70"=> "Application pour smarthpones iOS",
85-
"71"=> "Application pour smarthpones Android",
84+
"70"=> "Application pour smartphones iOS",
85+
"71"=> "Application pour smartphones Android",
86+
"72" => "QRCode du serveur",
87+
"73" => "Connexion aux applications mobiles",
88+
"74" => "Scannez ce QRCode avec votre application mobile pour configurer facilement la connexion.",
8689
);

0 commit comments

Comments
 (0)