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

Commit

Permalink
Fix dashboard for Orbit
Browse files Browse the repository at this point in the history
  • Loading branch information
@cdujeu
cdujeu committed Jul 5, 2014
1 parent 312a77c commit 3c4d21a
Show file tree
Hide file tree
Showing 9 changed files with 84 additions and 36 deletions.
12 changes: 6 additions & 6 deletions core/src/plugins/access.ajxp_user/class.UserDashboardHome.js
View file
Expand Up @@ -178,18 +178,18 @@ Class.create("UserDashboardHome", AjxpPane, {
notificationElement.hide();
}

if(ajaxplorer.getPluginConfigs('ajxpdriver[@id=\'access.ajxp_user\']').get("ENABLE_GETTING_STARTED")){
oFormObject.down("#welcome").insert(MessageHash["user_dash.55"].replace("<a>", "<a id='get_started_link' href='#' onclick='javascript:$(\"userdashboard_main_tab\").ajxpPaneObject.switchTabulator(\"tutorials\")'>"));
}

if(ajaxplorer.actionBar.getActionByName("logout")){
oFormObject.down("#welcome").insert(new Element("span", {id:"disconnect_link"}).update(" [<span>"+ajaxplorer.actionBar.getActionByName("logout").options.text.toLowerCase()+"</span>]"));
oFormObject.down("#welcome").insert('<small>'+MessageHash["user_dash.67"].replace("%logout", "<span id='disconnect_link'></span>").replace('%s', ajaxplorer.user.getPreference("USER_DISPLAY_NAME") || ajaxplorer.user.id)+'</small>');
oFormObject.down('#disconnect_link').update("<a>"+ajaxplorer.actionBar.getActionByName("logout").options.text.toLowerCase()+"</a>");
oFormObject.down('#disconnect_link').observe("click", function(e){
ajaxplorer.actionBar.fireAction("logout");
});
}

if(ajaxplorer.getPluginConfigs('ajxpdriver[@id=\'access.ajxp_user\']').get("ENABLE_GETTING_STARTED")){
oFormObject.down("#welcome").insert(". " + MessageHash["user_dash.55"].replace("<a>", "<a id='get_started_link' href='#' onclick='javascript:$(\"userdashboard_main_tab\").ajxpPaneObject.switchTabulator(\"tutorials\")'>"));
}else{
oFormObject.down("#welcome").insert(".");
}

},

Expand Down
16 changes: 15 additions & 1 deletion core/src/plugins/access.ajxp_user/dashboard.css
View file
Expand Up @@ -179,14 +179,28 @@ span.letter_badge {
font-weight: normal;
}

#home_account_pane div.ws_legend{
padding: 10px;
font-size: 0.9em;
text-align: center;
font-style: italic;
}

#home_account_pane #welcome{
text-align: center;
background-color: #ebedf0;
border-bottom: 1px solid #E6E6E6;
font-size: 13px;
padding: 12px;
border-top: 1px solid #FFFFFF;
}
#home_account_pane a{
cursor: pointer;
text-decoration: underline;
}
#home_account_pane #welcome small{
padding-top: 10px;
display: block;
}

#workspaces_button {
padding: 45px 30px;
Expand Down
8 changes: 5 additions & 3 deletions core/src/plugins/access.ajxp_user/i18n/en.php
View file
Expand Up @@ -59,8 +59,8 @@
"36"=> "Parameters",
"37"=> "My profile and application settings",
"38"=> "Notifications",
"39"=> "Select a workspace",
"40"=> "Welcome, %s",
"39"=> "Below is a list of the workspaces you can access to. They can be personal or shared with/by others users.",
"40"=> "Welcome, %s! ",
"41"=> "Use this workspace as default",
"42"=> "Enter",
"43"=> "My Profile",
Expand All @@ -76,7 +76,7 @@
"52"=> "Are you sure you want to delete this team? This will not remove any users.",
"53"=> "Getting Started",
"54"=> "Get started with APPLICATION_TITLE by following How-to videos",
"55"=> "Do you need help <a>to get started?</a>",
"55"=> "New to APPLICATION_TITLE? <a>Watch our tutorials.</a>",
"56"=> "Getting started with APPLICATION_TITLE? Here are some videos for you!",
"57"=> "Download APPLICATION_TITLE for...",
"58"=> "Android device",
Expand Down Expand Up @@ -117,4 +117,6 @@
<li>Keeping files offline and interacting with external applications</li>
<li>Protecting the app with a PIN-code</li>
<li>Using bookmarks and search engine</li></ul>",
"67"=> "You are not %s, %logout",

);
10 changes: 5 additions & 5 deletions core/src/plugins/access.ajxp_user/manifest.xml
View file
Expand Up @@ -183,7 +183,7 @@
</script>
]]></template_part>
<template_part ajxpId="browser" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fitParent":"ajxp_desktop", "fakeOptionUser":"true", "messageBoxReference":true}' theme="orbit"><![CDATA[
<div id="userdashboard_main_tab" ajxpClass="AjxpTabulator" class="dashboard_main_pane flat_tabulator" ajxpOptions='{"fit":"height", "fitMarginBottom":0, "registerAsEditorOpener":false, "saveState":false,"events":{}, "defaultTabId": "home","tabInfos" : [{"id":"home","label":"Home","iconClass":"icon-home", "element":"home_account_pane"},{"id":"parameters","label":"user_dash.43", "title":"user_dash.43t","iconClass":"icon-cog", "element":"parameters_pane"},{"id":"info","label":"user_dash.46", "title":"user_dash.47","iconClass":"icon-book", "element":"files_list_pane"}]}'>
<div id="userdashboard_main_tab" ajxpClass="AjxpTabulator" class="dashboard_main_pane horizontal_tabulator left_tabulator" ajxpOptions='{"fit":"height", "fitMarginBottom":0, "registerAsEditorOpener":false, "saveState":false,"events":{}, "tabsTips":"middle right", "defaultTabId": "home","tabInfos" : [{"id":"home","label":"Home","iconClass":"icon-home", "element":"home_account_pane"},{"id":"parameters","label":"user_dash.43", "title":"user_dash.43t","iconClass":"icon-cog", "element":"parameters_pane"},{"id":"info","label":"user_dash.46", "title":"user_dash.47","iconClass":"icon-book", "element":"files_list_pane"}]}'>
<div id="home_account_pane" ajxpClass="UserDashboardHome">
<div id="welcome"></div>
<div id="notifications_center">
Expand All @@ -192,7 +192,7 @@
</div>
<div id="workspaces_center">
<div id="logo_div"><img src="plugins/gui.ajax/PydioLogo250.png"></div>
<h1>AJXP_MESSAGE[user_dash.39]</h1>
<div class="ws_legend">AJXP_MESSAGE[user_dash.39]</div>
<ul id="workspaces_list"></ul>
<div id="workspaces_button">
<input type="checkbox" name="save_ws_choice" id="save_ws_choice" class="disabled" disabled><label for="save_ws_choice">AJXP_MESSAGE[user_dash.41]</label>
Expand All @@ -201,15 +201,15 @@
</div>
</div>
<div id="files_list_pane" ajxpClass="AjxpPane">
<div id="userdashboard_addressbook_tab" ajxpClass="AjxpTabulator" class="horizontal_tabulator left_tabulator" ajxpOptions='{"fit":"height", "fitMarginBottom":0, "registerAsEditorOpener":false, "saveState":false,"events":{}, "defaultTabId": "my-users","tabInfos" : [{"id":"my-users","label":"user_dash.48", "title":"user_dash.49","iconClass":"icon-user", "element":"my-users-pane"}]}'>
<div id="userdashboard_addressbook_tab" ajxpClass="AjxpTabulator" class="horizontal_tabulator left_tabulator" ajxpOptions='{"fit":"height", "fitMarginBottom":0, "registerAsEditorOpener":false, "tabsTips":"middle right", "saveState":false,"events":{}, "defaultTabId": "my-users","tabInfos" : [{"id":"my-users","label":"user_dash.48", "title":"user_dash.49","iconClass":"icon-user", "element":"my-users-pane"}]}'>
<div id="my-users-pane" ajxpClass="AjxpPane" class="tabbed_editor">
<div id="buttons_bar" class="action_bar" ajxpClass="ActionsToolbar" ajxpOptions='{"toolbarsList":["change","address_book"],"skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}'></div>
<div id="address_book" ajxpClass="FetchedResultPane" ajxpOptions='{"updateGlobalContext":true,"nodeProviderProperties":{"get_action":"ls","dir":"users"}, "displayMode":"detail","replaceScroller":true, "fit":"height", "fitParent":"userdashboard_main_tab", "fitMarginBottom":0, "cellPaddingCorrection":6, "iconBgPosition" : "5px 4px"}'></div>
<div id="address_book" ajxpClass="FetchedResultPane" ajxpOptions='{"updateGlobalContext":true,"nodeProviderProperties":{"get_action":"ls","dir":"users"}, "displayMode":"detail","replaceScroller":true, "fit":"height", "cellPaddingCorrection":6, "iconBgPosition" : "5px 4px"}'></div>
</div>
</div>
</div>
<div id="parameters_pane" ajxpClass="AjxpPane">
<div id="userdashboard_parameters_tab" ajxpClass="AjxpTabulator" class="horizontal_tabulator left_tabulator" ajxpOptions='{"fit":"height", "fitMarginBottom":0, "registerAsEditorOpener":false, "saveState":false,"events":{}, "defaultTabId": "account","tabInfos" : [{"id":"account","label":"user_dash.44", "title":"user_dash.45","iconClass":"icon-reorder", "element":"account_pane"}]}'>
<div id="userdashboard_parameters_tab" ajxpClass="AjxpTabulator" class="horizontal_tabulator left_tabulator" ajxpOptions='{"fit":"height", "fitMarginBottom":0, "registerAsEditorOpener":false, "tabsTips":"middle right", "saveState":false,"events":{}, "defaultTabId": "account","tabInfos" : [{"id":"account","label":"user_dash.44", "title":"user_dash.45","iconClass":"icon-reorder", "element":"account_pane"}]}'>
<div id="account_pane" ajxpClass="UserProfileEditor" class="tabbed_editor">
<div class="action_bar">
<div class="toolbarGroup"></div>
Expand Down
2 changes: 1 addition & 1 deletion core/src/plugins/gui.ajax/res/js/ajaxplorer.js
View file

Large diffs are not rendered by default.

13 changes: 11 additions & 2 deletions core/src/plugins/gui.ajax/res/js/ajaxplorer/class.AjxpTabulator.js
View file
Expand Up @@ -118,7 +118,13 @@ Class.create("AjxpTabulator", AjxpPane, {
if(!this.options.tabsTips){ options.title = title; }
var td = new Element('span', options);
if(this.options.tabsTips){
modal.simpleTooltip(td, title, this.options.tabsTips, "down_arrow_tip", "element");
var horizontal = this.htmlElement.hasClassName('left_tabulator');
modal.simpleTooltip(
td,
horizontal?'<div class="simple_tooltip_title">' + label+'</div>'+title:title,
this.options.tabsTips,
horizontal?"left_arrow_tip":"down_arrow_tip",
"element");
}
if(tabInfo.icon){
td.insert('<img width="16" height="16" align="absmiddle" src="'+resolveImageSource(tabInfo.icon, '/images/actions/ICON_SIZE', 16)+'">');
Expand Down Expand Up @@ -417,7 +423,10 @@ Class.create("AjxpTabulator", AjxpPane, {
resize : function(){
if(!this.selectedTabInfo || !this.htmlElement) return;
if(this.htmlElement.hasClassName('horizontal_tabulator')){
fitHeightToBottom(this.htmlElement.down('div.tabulatorContainer'), null, this.options.fitMarginBottom);
var tabContainer = this.htmlElement.down('div.tabulatorContainer');
fitHeightToBottom(tabContainer, null, this.options.fitMarginBottom);
var pWidth = this.htmlElement.getWidth() - tabContainer.getWidth();
this.htmlElement.select('> div:not(.tabulatorContainer)').invoke('setStyle', {width:pWidth+'px'});
}
var ajxpObject = this.getAndSetAjxpObject(this.selectedTabInfo);
if(ajxpObject){
Expand Down
4 changes: 2 additions & 2 deletions core/src/plugins/gui.ajax/res/js/ajaxplorer/class.Modal.js
View file
Expand Up @@ -575,7 +575,7 @@ Class.create("Modal", {
}
var y = baseY+10;
if(position.indexOf('middle') != -1){
y -= 5 + parseInt(this.tooltip.getHeight())/2;
y -= 10 + parseInt(this.tooltip.getHeight())/2 - parseInt(element.getHeight())/2 ;
}else if(position.indexOf('bottom') != -1){
y -= 13 + parseInt(element.getHeight());
}else if(position.indexOf('top') != -1){
Expand All @@ -590,7 +590,7 @@ Class.create("Modal", {
this.tooltip.addClassName("arrow_tip_arrow_left");
}
}else if(position.indexOf('right') != -1){
x = baseX + 10;
x = baseX + 10 + parseInt(element.getWidth());
}else{
x = (baseX - 10 - parseInt(this.tooltip.getWidth()));
}
Expand Down
53 changes: 38 additions & 15 deletions core/src/plugins/gui.ajax/res/themes/orbit/css/ajaxplorer.css
View file
Expand Up @@ -716,24 +716,20 @@ html.boxshadow div.errorMessage{
.simple_tooltip_title{
padding-top: 2px;
padding-bottom: 1px;
text-transform: uppercase;
font-weight: bold;
font-size: 11px;
font-size: 1.1em;
}
.simple_tooltip
{
position:absolute;
width:150px;
z-index:10000;
border:1px solid #696765;
color : #696765;
background-color: #fff;
font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
font-size: 11px;
position: absolute;
width: 150px;
z-index: 10000;
font-size: 13px;
letter-spacing: 1px;
padding: 4px 5px 5px 5px;
padding: 5px 10px;
}


.down_arrow_tip,
.top_arrow_tip {
background: rgba(69, 77, 85, 0.86);
Expand Down Expand Up @@ -815,6 +811,30 @@ html.boxshadow div.errorMessage{
margin-top: -5px;
}

.left_arrow_tip {
color: #ffffff;
border-radius: 4px;
background-color: rgba(69, 77, 85, 0.86);
border: 0;
}
.left_arrow_tip:after, .left_arrow_tip:before {
left: 100%;
border: solid transparent;
content: " ";
height: 0;
width: 0;
position: absolute;
pointer-events: none;
}

.left_arrow_tip:before {
border-color: rgba(69, 77, 85, 0);
border-right-color: rgba(69, 77, 85, 0.86);
border-width: 5px;
top: 50%;
left:-10px;
margin-top: -5px;
}

div.accordion_toggle,
div.dialogContentMainTitle{
Expand Down Expand Up @@ -4830,21 +4850,25 @@ div.flat_tabulator > div:not(.tabulatorContainer){

.horizontal_tabulator div.tabulatorContainer {
float: left;
width: 22%;
width: 46px;
padding: 0;
background-color: #ebedf0 !important;
}

.horizontal_tabulator span.toggleHeader{
width: 96% !important;
text-align: center;
padding: 33px 0;
padding: 7px 0 7px 3px;
background-color: #e35d52 !important;
color: #ffffff !important;
border: 0;
display: block;
margin: 2%;
border-radius: 2px;
font-size: 30px;
}

.horizontal_tabulator span.toggleHeader span.tab_label{
display: none;
}

.horizontal_tabulator span.toggleInactive{
Expand All @@ -4853,7 +4877,6 @@ div.flat_tabulator > div:not(.tabulatorContainer){
background-color: transparent !important;
color: rgb(111, 123, 136) !important;
text-shadow: none;
padding-bottom: 33px !important;
}

div.horizontal_tabulator > div:not(.tabulatorContainer){
Expand Down
2 changes: 1 addition & 1 deletion core/src/plugins/gui.ajax/res/themes/orbit/css/allz.css
View file

Large diffs are not rendered by default.

0 comments on commit 3c4d21a

Please sign in to comment.