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

Commit

Permalink
Moved last php-based compilation to grunt instead.
Browse files Browse the repository at this point in the history 
Move html templates to top level
  • Loading branch information
@cdujeu
cdujeu committed Feb 28, 2017
1 parent 150aa12 commit 7b780c0
Show file tree
Hide file tree
Showing 11 changed files with 23 additions and 215 deletions.
16 changes: 9 additions & 7 deletions core/src/plugins/gui.ajax/Gruntfile.js
View file
@@ -1,3 +1,10 @@
var gui_ajax_boot = [
'res/js/vendor/es6/browser-polyfill.js',
'res/js/vendor/nodejs/boot.prod.js',
'res/js/core/http/Connexion.js',
'res/js/core/PydioBootstrap.js'
];

var gui_ajax_core = [
'res/js/vendor/modernizr/modernizr.min.js',
'res/js/core/lang/Observable.js',
Expand Down Expand Up @@ -41,12 +48,6 @@ module.exports = function(grunt) {
}
},
copy: {
debug: {
expand: true,
src: 'node_modules/he/he.js',
dest: 'res/js/ui/prototype/util',
flatten:true
},
dndpatch: {
expand: true,
src: 'res/js/vendor/dnd-html5-backend-patch/NativeDragSources.js',
Expand All @@ -63,7 +64,8 @@ module.exports = function(grunt) {
},
js: {
files: {
'res/js/pydio.min.js': gui_ajax_core
'res/js/pydio.min.js': gui_ajax_core,
'res/js/pydio.boot.min.js': gui_ajax_boot
}
},
nodejs: {
Expand Down
46 changes: 6 additions & 40 deletions core/src/plugins/gui.ajax/res/html/gui.html
View file
Expand Up @@ -14,52 +14,18 @@
<script src="AJXP_CLIENT_RESOURCES_FOLDER/js/vendor/es6/json3.min.js"></script>
<![endif]-->
AJXP_ADDITIONAL_JS_FRAMEWORKS
<script language="javascript" type="text/javascript" src="AJXP_CLIENT_RESOURCES_FOLDER/js/ajaxplorer_boot.js?v=AJXP_CURRENT_VERSION"></script>
<script language="javascript" type="text/javascript" src="AJXP_CLIENT_RESOURCES_FOLDER/js/pydio.boot.min.js?v=AJXP_CURRENT_VERSION"></script>
<link rel="icon" type="image/x-png" href="index.php?get_action=serve_favicon">
</head>
<body style="overflow: hidden;">
<body style="overflow: hidden;" class="react-mui-context">
<script type="text/javascript">
window.ajxpNoNotifLoader = true;
window.ajxpThemeSkipLoaderProgress = true;
// Initialize booter. Do not remove the commented line AJXP_JSON_START_PARAMETERS, as it is
// dynamically replaced by the application!
var ajaxplorer, startParameters = {}, MessageHash={};
var pydio, startParameters = {}, MessageHash={};
//AJXP_JSON_START_PARAMETERS
document.observe("ajaxplorer:before_gui_load", function(e){
if(window.React){
React.initializeTouchEvents(true);
}
document.documentElement.className += " ajxp_theme_orbit";
});
window.ajxpBootstrap = new AjxpBootstrap(startParameters);
//window.onbeforeunload = function(){return "Do you want to quit?";};
</script>
<div id="ajxp_desktop" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fitParent":"window","fitMarginBottom":"$(\"optional_bottom_div\").getHeight()"}'></div>
<div id="all_forms">
<div id="generic_dialog_box" class="dialogBox form-login_form"><div class="dialogTitle"></div><div class="dialogContent"></div></div>
<div id="hidden_frames" style="display:none;"></div>
<div id="hidden_forms" style="position:absolute;left:-1000px;"></div>
window.pydioBootstrap = new PydioBootstrap(startParameters);

<!-- LOGIN SCREEN MUST BE ALREADY IN PAGE TO ENABLE PASSWORD REMEMBERING -->
<form id="login_form" style="display:none;" box_width="320" box_padding="0">
<input type="hidden" name="get_action" value="login">
<input type="hidden" name="login_seed" id="login_seed" value="">
<a href="javascript:pydio.getController().fireAction('switch_language');" title="AJXP_MESSAGE[190]" alt="AJXP_MESSAGE[190]" class="icon-flag">&nbsp;</a>
<div class="dialogLegend" ajxp_message_id="180">AJXP_MESSAGE[180]</div>
<div style="width:100%;">
<div class="SF_element">
<div class="SF_label"><ajxp:message ajxp_message_id="181">AJXP_MESSAGE[181]</ajxp:message></div>
<div class="SF_input"><input type="text" name="userid" class="dialogFocus" placeholder="AJXP_MESSAGE[181]"></div>
</div>
<div class="SF_element">
<div class="SF_label"><ajxp:message ajxp_message_id="182">AJXP_MESSAGE[182]</ajxp:message></div>
<div class="SF_input"><input type="password" name="password" placeholder="AJXP_MESSAGE[182]"></div>
</div>
<div class="SF_element">
<input type="checkbox" class="radio" name="remember_me" id="remember_me"/><label for="remember_me" ajxp_message_id="261">AJXP_MESSAGE[261]</label>
</div>
</div>
</form>
</div>
</script>
<div id="ajxp_desktop"></div>
</body>
</html>
46 changes: 5 additions & 41 deletions core/src/plugins/gui.ajax/res/html/gui_debug.html
View file
Expand Up @@ -15,7 +15,6 @@
<!--[if IE 7]>
<script src="plugins/gui.ajax/res/js/vendor/es6/json3.min.js"></script>
<![endif]-->
<script src="plugins/gui.ajax/res/js/ui/prototype/util/he.js"></script>
<?php
print($ADDITIONAL_FRAMEWORKS);

Expand All @@ -27,22 +26,20 @@
?>

<?php
$list = AJXP_INSTALL_PATH."/".CLIENT_RESOURCES_FOLDER."/js/ajaxplorer_boot_list.txt";
$list = AJXP_INSTALL_PATH."/".CLIENT_RESOURCES_FOLDER."/js/ajaxplorer_boot.txt";
$lines = file($list);
foreach ($lines as $line){
print("<script language=\"javascript\" type=\"text/javascript\" src=\"".CLIENT_RESOURCES_FOLDER."/".trim($line)."\"></script>\n");
}
?>
</head>
<body style="overflow:hidden;">
<div id="ajxp_desktop" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fitParent":"window","fitMarginBottom":"$(\"optional_bottom_div\").getHeight()"}'></div>
<body style="overflow:hidden;" class="react-mui-context">
<div id="ajxp_desktop"></div>

<script type="text/javascript">
window.ajxpNoNotifLoader = true;
window.ajxpThemeSkipLoaderProgress = true;
var ajaxplorer, startParameters = {};
var pydio, startParameters = {};
<?php if($JSON_START_PARAMETERS) print "startParameters = ".$JSON_START_PARAMETERS.";"; ?>
window.ajxpBootstrap = new AjxpBootstrap(startParameters);
window.pydioBootstrap = new PydioBootstrap(startParameters);
</script>
<?php
$list = AJXP_INSTALL_PATH."/".CLIENT_RESOURCES_FOLDER."/js/ajaxplorer_core.txt";
Expand All @@ -56,38 +53,5 @@
print("<script language=\"javascript\" type=\"text/javascript\" src=\"".CLIENT_RESOURCES_FOLDER."/".trim($line)."\"></script>\n");
}
?>
<div id="all_forms">
<div id="generic_dialog_box" class="dialogBox form-login_form"><div class="dialogTitle"></div><div class="dialogContent"></div></div>
<div id="hidden_frames" style="display:none;"></div>
<div id="hidden_forms" style="position:absolute;left:-1000px;"></div>

<!-- LOGIN SCREEN MUST BE ALREADY IN PAGE TO ENABLE PASSWORD REMEMBERING -->
<form id="login_form" action="login" style="display:none;" box_width="320" box_padding="0" overlayStyle='{"backgroundColor":"white","opacity":10,"backgroundImage":"url(\"<?php print(AJXP_THEME_FOLDER); ?>/images/grid_t.png\")"}'>
<input type="hidden" name="get_action" value="login">
<input type="hidden" name="login_seed" id="login_seed" value="">
<a href="javascript:pydio.getController().fireAction('switch_language');" title="<?php print($mess[190]);?>" alt="<?php print($mess[190]);?>" class="icon-flag"></a>
<div class="dialogLegend" ajxp_message_id="180"><?php print($mess[180]);?></div>
<div>
<div class="SF_element">
<div class="SF_label"><ajxp:message ajxp_message_id="181"><?php print($mess[181]);?></ajxp:message></div>
<div class="SF_input"><input type="text" name="userid" class="dialogFocus" placeholder="<?php print($mess[181]);?>"></div>
</div>
<div class="SF_element">
<div class="SF_label"><ajxp:message ajxp_message_id="182"><?php print($mess[182]);?></ajxp:message></div>
<div class="SF_input"><input type="password" name="password" placeholder="<?php print($mess[182]);?>"></div>
</div>
<div class="SF_element">
<input type="checkbox" class="radio" name="remember_me" id="remember_me"/><label for="remember_me" ajxp_message_id="261"><?php print($mess[261]);?></label>
</div>
</div>
</form>
</div>
<script type="text/javascript">
if(window.React) React.initializeTouchEvents(true);
document.observe("ajaxplorer:before_gui_load", function(e){
document.documentElement.className += " ajxp_theme_orbit";
});
</script>

</body>
</html>
1 change: 0 additions & 1 deletion core/src/plugins/gui.ajax/res/js/ajaxplorer.js
View file

This file was deleted.

1 change: 0 additions & 1 deletion core/src/plugins/gui.ajax/res/js/ajaxplorer_boot.js
View file

This file was deleted.

1 change: 0 additions & 1 deletion .../gui.ajax/res/js/ajaxplorer_boot_list.txt → ...ugins/gui.ajax/res/js/ajaxplorer_boot.txt
View file
@@ -1,5 +1,4 @@
js/vendor/es6/browser-polyfill.js
js/vendor/nodejs/boot.prod.js
js/core/util/HasherUtils.js
js/core/http/Connexion.js
js/core/PydioBootstrap.js
1 change: 0 additions & 1 deletion core/src/plugins/gui.ajax/res/js/ajaxplorer_core.txt
View file
@@ -1,4 +1,3 @@
js/vendor/prototype/es6compat.js
js/core/lang/Observable.js
js/core/lang/Logger.js
js/core/util/LangUtils.js
Expand Down
6 changes: 3 additions & 3 deletions core/src/plugins/gui.ajax/res/js/es6/PydioBootstrap.es6
View file
Expand Up @@ -229,13 +229,13 @@ class PydioBootstrap{
const scripts = document.getElementsByTagName('script');
for(let i=0; i<scripts.length; i++){
const scriptTag = scripts[i];
if(scriptTag.src.match("/js/ajaxplorer_boot") || scriptTag.src.match("/js/core/PydioBootstrap.js")){
if(scriptTag.src.match("/js/ajaxplorer_boot")){
if(scriptTag.src.match("/js/pydio.boot.min.js") || scriptTag.src.match("/js/core/PydioBootstrap.js")){
if(scriptTag.src.match("/js/pydio.boot.min.js")){
this.parameters.set("debugMode", false);
}else{
this.parameters.set("debugMode", true);
}
var src = scriptTag.src.replace('/js/core/PydioBootstrap.js','').replace('/js/ajaxplorer_boot.js', '').replace('/js/ajaxplorer_boot_protolegacy.js', '');
var src = scriptTag.src.replace('/js/core/PydioBootstrap.js','').replace('/js/pydio.boot.min.js', '');
if(src.indexOf("?")!=-1) src = src.split("?")[0];
this.parameters.set("ajxpResourcesFolder", src);
}
Expand Down
31 changes: 0 additions & 31 deletions core/src/plugins/gui.ajax/res/themes/material/html/404.html
View file

This file was deleted.

31 changes: 0 additions & 31 deletions core/src/plugins/gui.ajax/res/themes/material/html/gui.html
View file

This file was deleted.

58 changes: 0 additions & 58 deletions core/src/plugins/gui.ajax/res/themes/material/html/gui_debug.html
View file

This file was deleted.

0 comments on commit 7b780c0

Please sign in to comment.