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

Commit 46b4fff

Browse files
committed
Fix remaining references to vision theme.
Remove specific html files for orbit theme and put them as default ones.
1 parent 793188f commit 46b4fff

File tree

7 files changed

+136
-270
lines changed

7 files changed

+136
-270
lines changed

core/src/plugins/core.notifications/class.NotificationLoader.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ Class.create("NotificationLoader", {
201201
obje.title,
202202
{
203203
body: obje.body,
204-
icon: 'plugins/gui.ajax/res/themes/vision/images/mimes/64/mime_empty.png',
204+
icon: 'plugins/gui.ajax/res/themes/orbit/images/mimes/64/mime_empty.png',
205205
tag: 'ajaxplorer',
206206
dir: 'auto',
207207
lang: ajaxplorer.currentLanguage

core/src/plugins/gui.ajax/manifest.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
editable="true"
4242
uploadAction="store_binary_temp"
4343
loadAction="get_global_binary_param"
44-
defaultImage="plugins/gui.ajax/res/themes/vision/images/white_logo.png"
44+
defaultImage="AJXP_THEME_FOLDER/images/white_logo.png"
4545
expose="true"
4646
/>
4747
<global_param name="CUSTOM_TOP_LOGO_H" group="CONF_MESSAGE[Top Toolbar]" type="integer" label="CONF_MESSAGE[Logo Height]" description="CONF_MESSAGE[Manually set a logo height]" mandatory="false" default="39" expose="true"/>
@@ -58,7 +58,7 @@
5858
editable="true"
5959
uploadAction="store_binary_temp"
6060
loadAction="get_global_binary_param"
61-
defaultImage="plugins/gui.ajax/res/themes/orbit/images/hires-photos/01.jpg"
61+
defaultImage="AJXP_THEME_FOLDER/images/hires-photos/01.jpg"
6262
expose="true"
6363
/>
6464
<global_param name="WELCOME_PAGE_BACKGROUND_ATTRIBUTES_1" group="CONF_MESSAGE[Page Background Images]" type="select"
@@ -70,7 +70,7 @@
7070
editable="true"
7171
uploadAction="store_binary_temp"
7272
loadAction="get_global_binary_param"
73-
defaultImage="plugins/gui.ajax/res/themes/orbit/images/hires-photos/02.jpg"
73+
defaultImage="AJXP_THEME_FOLDER/images/hires-photos/02.jpg"
7474
expose="true"
7575
/>
7676
<global_param name="WELCOME_PAGE_BACKGROUND_ATTRIBUTES_2" group="CONF_MESSAGE[Page Background Images]" type="select"
@@ -82,7 +82,7 @@
8282
editable="true"
8383
uploadAction="store_binary_temp"
8484
loadAction="get_global_binary_param"
85-
defaultImage="plugins/gui.ajax/res/themes/orbit/images/hires-photos/03.jpg"
85+
defaultImage="AJXP_THEME_FOLDER/images/hires-photos/03.jpg"
8686
expose="true"
8787
/>
8888
<global_param name="WELCOME_PAGE_BACKGROUND_ATTRIBUTES_3" group="CONF_MESSAGE[Page Background Images]" type="select"
@@ -94,7 +94,7 @@
9494
editable="true"
9595
uploadAction="store_binary_temp"
9696
loadAction="get_global_binary_param"
97-
defaultImage="plugins/gui.ajax/res/themes/orbit/images/hires-photos/04.jpg"
97+
defaultImage="AJXP_THEME_FOLDER/images/hires-photos/04.jpg"
9898
expose="true"
9999
/>
100100
<global_param name="WELCOME_PAGE_BACKGROUND_ATTRIBUTES_4" group="CONF_MESSAGE[Page Background Images]" type="select"
@@ -106,7 +106,7 @@
106106
editable="true"
107107
uploadAction="store_binary_temp"
108108
loadAction="get_global_binary_param"
109-
defaultImage="plugins/gui.ajax/res/themes/orbit/images/hires-photos/05.jpg"
109+
defaultImage="AJXP_THEME_FOLDER/images/hires-photos/05.jpg"
110110
expose="true"
111111
/>
112112
<global_param name="WELCOME_PAGE_BACKGROUND_ATTRIBUTES_5" group="CONF_MESSAGE[Page Background Images]" type="select"
@@ -130,7 +130,7 @@
130130
editable="true"
131131
uploadAction="store_binary_temp"
132132
loadAction="get_global_binary_param"
133-
defaultImage="plugins/gui.ajax/res/themes/orbit/images/hires-photos/03-mobile.jpg"
133+
defaultImage="AJXP_THEME_FOLDER/images/hires-photos/03-mobile.jpg"
134134
expose="true"
135135
/>
136136

@@ -143,7 +143,7 @@
143143
editable="true"
144144
uploadAction="store_binary_temp"
145145
loadAction="get_global_binary_param"
146-
defaultImage="plugins/gui.ajax/res/themes/orbit/images/hires-photos/02.jpg"
146+
defaultImage="AJXP_THEME_FOLDER/images/hires-photos/02.jpg"
147147
expose="true"
148148
/>
149149
<global_param name="CUSTOM_SHAREPAGE_BACKGROUND_ATTRIBUTES_1" group="CONF_MESSAGE[Minisite]" type="select"
@@ -154,7 +154,7 @@
154154
editable="true"
155155
uploadAction="store_binary_temp"
156156
loadAction="get_global_binary_param"
157-
defaultImage="plugins/gui.ajax/res/themes/orbit/images/hires-photos/03.jpg"
157+
defaultImage="AJXP_THEME_FOLDER/images/hires-photos/03.jpg"
158158
expose="true"
159159
/>
160160
<global_param name="CUSTOM_SHAREPAGE_BACKGROUND_ATTRIBUTES_2" group="CONF_MESSAGE[Minisite]" type="select"
@@ -164,7 +164,7 @@
164164
editable="true"
165165
uploadAction="store_binary_temp"
166166
loadAction="get_global_binary_param"
167-
defaultImage="plugins/gui.ajax/res/themes/orbit/images/hires-photos/05.jpg"
167+
defaultImage="AJXP_THEME_FOLDER/images/hires-photos/05.jpg"
168168
expose="true"
169169
/>
170170
<global_param name="CUSTOM_SHAREPAGE_BACKGROUND_ATTRIBUTES_3" group="CONF_MESSAGE[Minisite]" type="select"
Lines changed: 65 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,67 @@
1+
<!DOCTYPE html>
12
<html xmlns:ajxp>
2-
<head>
3-
<title>AJXP_APPLICATION_TITLE</title>
4-
AJXP_REBASE
5-
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
6-
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
7-
<link rel="icon" type="image/x-png" href="AJXP_THEME_FOLDER/images/html-folder.png">
8-
<link rel="stylesheet" type="text/css" href="AJXP_THEME_FOLDER/css/allz.css?v=AJXP_CURRENT_VERSION">
9-
<!--[if IE 8]>
10-
<script src="AJXP_CLIENT_RESOURCES_FOLDER/js/vendor/es6/es5-shim.min.js"></script>
11-
<script src="AJXP_CLIENT_RESOURCES_FOLDER/js/vendor/es6/es5-sham.min.js"></script>
12-
<![endif]-->
13-
AJXP_ADDITIONAL_JS_FRAMEWORKS
14-
<script language="javascript" type="text/javascript" src="AJXP_CLIENT_RESOURCES_FOLDER/js/ajaxplorer_boot.js?v=AJXP_CURRENT_VERSION"></script>
15-
</head>
16-
<body style="overflow:hidden;">
17-
<script type="text/javascript">
18-
// Initialize booter. Do not remove the commented line AJXP_JSON_START_PARAMETERS, as it is
19-
// dynamically replaced by the application!
20-
var ajaxplorer, startParameters = {}, MessageHash={};
21-
//AJXP_JSON_START_PARAMETERS
22-
window.ajxpBootstrap = new AjxpBootstrap(startParameters);
23-
</script>
24-
<div id="ajxp_desktop" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fitParent":"window","fitMarginBottom":"$(\"optional_bottom_div\").getHeight()"}'></div>
25-
<div id="all_forms">
26-
<div id="generic_dialog_box" class="dialogBox"><div class="dialogTitle"></div><div class="dialogContent"></div></div>
27-
<div id="hidden_frames" style="display:none;"></div>
28-
<div id="hidden_forms" style="position:absolute;left:-1000px;"></div>
29-
30-
<!-- LOGIN SCREEN MUST BE ALREADY IN PAGE TO ENABLE PASSWORD REMEMBERING -->
31-
<form id="login_form" action="login" style="display:none;" box_width="230">
32-
<input type="hidden" name="get_action" value="login">
33-
<input type="hidden" name="login_seed" id="login_seed" value="">
34-
<a style="float:right;" href="javascript:pydio.getController().fireAction('switch_language');" title="AJXP_MESSAGE[190]" alt="AJXP_MESSAGE[190]"><img src="AJXP_THEME_FOLDER/images/actions/16/flag.png" border="0" height="16" width="16"></a>
35-
<div class="dialogLegend" style="margin-bottom: 3px;margin-top: 4px;" ajxp_message_id="180">AJXP_MESSAGE[180]</div>
36-
<div style="width:100%;">
37-
<div class="SF_element">
38-
<div class="SF_label"><ajxp:message ajxp_message_id="181">AJXP_MESSAGE[181]</ajxp:message></div>
39-
<div class="SF_input"><input type="text" name="userid" style="width: 100px; padding:0px;" class="dialogFocus"></div>
40-
</div>
41-
<div class="SF_element">
42-
<div class="SF_label"><ajxp:message ajxp_message_id="182">AJXP_MESSAGE[182]</ajxp:message></div>
43-
<div class="SF_input"><input type="password" name="password" style="width: 100px; padding:0px;"></div>
44-
</div>
45-
<div class="SF_element">
46-
<input type="checkbox" class="radio" name="remember_me" style="border: none; width:20px !important;"/><ajxp:message ajxp_message_id="261">AJXP_MESSAGE[261]</ajxp:message>
47-
</div>
48-
</div>
49-
</form>
50-
</div>
51-
<link rel="stylesheet" href="plugins/gui.ajax/res/js/lib/chosen/chosen.css"/>
52-
</body>
3+
<head>
4+
<title>AJXP_APPLICATION_TITLE</title>
5+
AJXP_REBASE
6+
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
7+
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
8+
<link rel="stylesheet" type="text/css" href="AJXP_THEME_FOLDER/css/allz.css?v=AJXP_CURRENT_VERSION">
9+
<!--[if IE 8]>
10+
<script src="AJXP_CLIENT_RESOURCES_FOLDER/js/vendor/es6/es5-shim.min.js"></script>
11+
<script src="AJXP_CLIENT_RESOURCES_FOLDER/js/vendor/es6/es5-sham.min.js"></script>
12+
<![endif]-->
13+
<!--[if IE 7]>
14+
<script src="AJXP_CLIENT_RESOURCES_FOLDER/js/vendor/es6/json3.min.js"></script>
15+
<![endif]-->
16+
AJXP_ADDITIONAL_JS_FRAMEWORKS
17+
<script language="javascript" type="text/javascript" src="AJXP_CLIENT_RESOURCES_FOLDER/js/ajaxplorer_boot.js?v=AJXP_CURRENT_VERSION"></script>
18+
<link rel="icon" type="image/x-png" href="index.php?get_action=serve_favicon">
19+
</head>
20+
<body style="overflow: hidden;">
21+
<script type="text/javascript">
22+
window.ajxpNoNotifLoader = true;
23+
window.ajxpThemeSkipLoaderProgress = true;
24+
// Initialize booter. Do not remove the commented line AJXP_JSON_START_PARAMETERS, as it is
25+
// dynamically replaced by the application!
26+
var ajaxplorer, startParameters = {}, MessageHash={};
27+
//AJXP_JSON_START_PARAMETERS
28+
document.observe("ajaxplorer:before_gui_load", function(e){
29+
if(window.React){
30+
React.initializeTouchEvents(true);
31+
}
32+
ajaxplorer.currentThemeUsesIconFonts = true;
33+
pydio.Parameters.set('currentThemeUsesIconFonts', true);
34+
document.documentElement.className += " ajxp_theme_orbit";
35+
});
36+
window.ajxpBootstrap = new AjxpBootstrap(startParameters);
37+
//window.onbeforeunload = function(){return "Do you want to quit?";};
38+
</script>
39+
<div id="ajxp_desktop" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fitParent":"window","fitMarginBottom":"$(\"optional_bottom_div\").getHeight()"}'></div>
40+
<div id="all_forms">
41+
<div id="generic_dialog_box" class="dialogBox form-login_form"><div class="dialogTitle"></div><div class="dialogContent"></div></div>
42+
<div id="hidden_frames" style="display:none;"></div>
43+
<div id="hidden_forms" style="position:absolute;left:-1000px;"></div>
44+
45+
<!-- LOGIN SCREEN MUST BE ALREADY IN PAGE TO ENABLE PASSWORD REMEMBERING -->
46+
<form id="login_form" style="display:none;" box_width="320" box_padding="0">
47+
<input type="hidden" name="get_action" value="login">
48+
<input type="hidden" name="login_seed" id="login_seed" value="">
49+
<a href="javascript:pydio.getController().fireAction('switch_language');" title="AJXP_MESSAGE[190]" alt="AJXP_MESSAGE[190]" class="icon-flag">&nbsp;</a>
50+
<div class="dialogLegend" ajxp_message_id="180">AJXP_MESSAGE[180]</div>
51+
<div style="width:100%;">
52+
<div class="SF_element">
53+
<div class="SF_label"><ajxp:message ajxp_message_id="181">AJXP_MESSAGE[181]</ajxp:message></div>
54+
<div class="SF_input"><input type="text" name="userid" class="dialogFocus" placeholder="AJXP_MESSAGE[181]"></div>
55+
</div>
56+
<div class="SF_element">
57+
<div class="SF_label"><ajxp:message ajxp_message_id="182">AJXP_MESSAGE[182]</ajxp:message></div>
58+
<div class="SF_input"><input type="password" name="password" placeholder="AJXP_MESSAGE[182]"></div>
59+
</div>
60+
<div class="SF_element">
61+
<input type="checkbox" class="radio" name="remember_me" id="remember_me"/><label for="remember_me" ajxp_message_id="261">AJXP_MESSAGE[261]</label>
62+
</div>
63+
</div>
64+
</form>
65+
</div>
66+
</body>
5367
</html>

0 commit comments

Comments
 (0)