extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-03 12:39:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix tutorials json feed and PGP Installation tutorial video

Browse Source
This commit is contained in:
Hadi Nategh 2018-08-23 14:54:37 +02:00
parent 36a6efe837
commit 08b9138ae6
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/js/jsapi/app_base.js
View File

@ -1606,8 +1606,8 @@ var AppJS = (function(){ "use strict"; return Class.extend(
mailvelopeInstallationOffer: function () mailvelopeInstallationOffer: function ()
{ {
var buttons = [ var buttons = [
{"text": 'Install', id: 'install', image: 'check', "default":true}, {"text": egw.lang('Install'), id: 'install', image: 'check', "default":true},
{"text": 'Close', id:'close', image: 'cancelled'} {"text": egw.lang('Close'), id:'close', image: 'cancelled'}
]; ];
var dialog = function(_content, _callback) var dialog = function(_content, _callback)
{ {

2
api/src/Framework/Tutorial.php
View File

@ -120,7 +120,7 @@ class Tutorial
{ {
if (!($json = Api\Cache::getCache(Api\Cache::TREE, __CLASS__, 'egw_tutorial_json'))) if (!($json = Api\Cache::getCache(Api\Cache::TREE, __CLASS__, 'egw_tutorial_json')))
{ {
$json = file_get_contents('https://www.egroupware.de/videos/tutorials.json', $json = file_get_contents('https://www.egroupware.org/videos/tutorials.json',
false, Api\Framework::proxy_context()); false, Api\Framework::proxy_context());
// Fallback tutorials.json // Fallback tutorials.json
if (!$json) $json = file_get_contents('api/setup/tutorials.json'); if (!$json) $json = file_get_contents('api/setup/tutorials.json');

4
api/templates/default/pgp_installation.xet
View File

@ -17,11 +17,11 @@
<description value="Before proceeding further, we do highly recommend you to watch this short video, to see how mailvelope plugin works with EGroupware."/> <description value="Before proceeding further, we do highly recommend you to watch this short video, to see how mailvelope plugin works with EGroupware."/>
</row> </row>
<row> <row>
<video video_src="https://www.egroupware.de/videos/mailvelope_only_EN.mp4" controls="true" height="260" width="60%"/> <video video_src="https://www.egroupware.org/videos/pgp/mailvelope_only_EN.mp4" controls="true" height="260" width="60%"/>
</row> </row>
</rows> </rows>
</grid> </grid>
<styles> <styles>
video { video {
margin-left: 18%; margin-left: 18%;