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

Commit

Permalink
Rearrange user dashboard
Browse files Browse the repository at this point in the history
  • Loading branch information
@cdujeu
cdujeu committed Jul 19, 2014
1 parent f6cb988 commit d02d7c9
Show file tree
Hide file tree
Showing 8 changed files with 42 additions and 28 deletions.
9 changes: 7 additions & 2 deletions core/src/plugins/access.ajxp_conf/ajxp_conf.css
View file
Expand Up @@ -80,11 +80,16 @@
opacity: 1;
}

.flat_tabulator[data-ajxpTabsCount="1"] span.toggleHeader
#editor_tabs > div.tabulatorContainer{
box-shadow: inset 0px 2px 4px rgba(0,0,0,0.15);
}

#editor_tabs[data-ajxpTabsCount="1"] div.tabulatorContainer
{
/* background-color: white;*/
display: none;
}


.settings_search_container{
display: block;
padding: 0;
Expand Down
29 changes: 12 additions & 17 deletions core/src/plugins/access.ajxp_user/manifest.xml
View file
Expand Up @@ -135,7 +135,7 @@
background-color: #e35d52;
}
.action_bar{
background-color: #ebedf0;
background-color: #cccccc;
padding: 4px;
border-left:1px solid #5C5C5C;
}
Expand All @@ -149,6 +149,7 @@
background-color: #e35d52;
margin-top:3px;
cursor: pointer;
color: white;
}
div.class-FetchedResultPane{
background-color: #f8f8f8;
Expand Down Expand Up @@ -176,26 +177,20 @@
}
#global_toolbar{
background-image: url("plugins/gui.ajax/res/themes/orbit/images/white_logo.png");
background-color: rgba(43, 44, 44, 0.89);
}
</style>
<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": "parameters","tabInfos" : [{"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="files_list_pane" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height"}'>
<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", "cellPaddingCorrection":6, "iconBgPosition" : "5px 4px"}'></div>
</div>
</div>
<div id="userdashboard_myparams_title" ajxp_message_id="user_dash.title">AJXP_MESSAGE[user_dash.title]</div>
<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": "parameters","tabInfos" : [{"id":"parameters","label":"user_dash.43", "title":"user_dash.43t","iconClass":"icon-cog", "element":"account_pane"},{"id":"info","label":"user_dash.46", "title":"user_dash.47","iconClass":"icon-book", "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", "cellPaddingCorrection":6, "iconBgPosition" : "5px 4px"}'></div>
</div>
<div id="parameters_pane" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height"}'>
<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>
</div>
<div id="user_profile_form"></div>
</div>
<div id="account_pane" ajxpClass="UserProfileEditor" class="tabbed_editor" ajxpOptions='{"fit":"height"}'>
<div class="action_bar">
<div class="toolbarGroup"></div>
</div>
<div id="user_profile_form"></div>
</div>
</div>
]]></template_part>
Expand Down
2 changes: 1 addition & 1 deletion core/src/plugins/authfront.keystore/manifest.xml
View file
Expand Up @@ -16,7 +16,7 @@
</server_settings>
<registry_contributions>
<client_configs>
<component_config className="AjxpTabulator::userdashboard_parameters_tab">
<component_config className="AjxpTabulator::userdashboard_main_tab">
<additional_tab id="apikeys_pane"
tabInfo='{"id":"my-api-data","iconClass":"icon-cog","element":"apikeys_pane","closeable":false,"label":"403","title":"403","dontFocus":true,"position":2}'
paneInfo='{"type":"widget"}'><![CDATA[
Expand Down
2 changes: 1 addition & 1 deletion core/src/plugins/conf.sql/manifest.xml
View file
Expand Up @@ -59,7 +59,7 @@
</action>
</actions>
<client_configs>
<component_config className="AjxpTabulator::userdashboard_addressbook_tab">
<component_config className="AjxpTabulator::userdashboard_main_tab">
<additional_tab id="team_pane"
tabInfo='{"id":"team_pane","iconClass":"icon-group","element":"team_pane","closeable":false,"label":"user_dash.50","title":"user_dash.51","dontFocus":true}'
paneInfo='{"type":"widget"}'><![CDATA[
Expand Down
2 changes: 1 addition & 1 deletion core/src/plugins/core.conf/class.AbstractConfDriver.php
View file
Expand Up @@ -61,7 +61,7 @@ protected function parseSpecificContributions(&$contribNode)
parent::parseSpecificContributions($contribNode);
if ($contribNode->nodeName == 'client_configs' && !ConfService::getCoreConf("WEBDAV_ENABLE")) {
$actionXpath=new DOMXPath($contribNode->ownerDocument);
$webdavCompNodeList = $actionXpath->query('component_config[@className="AjxpTabulator::userdashboard_parameters_tab"]', $contribNode);
$webdavCompNodeList = $actionXpath->query('component_config[@className="AjxpTabulator::userdashboard_main_tab"]', $contribNode);
if ($webdavCompNodeList->length) {
$contribNode->removeChild($webdavCompNodeList->item(0));
}
Expand Down
2 changes: 1 addition & 1 deletion core/src/plugins/core.conf/standard_conf_actions.xml
View file
Expand Up @@ -519,7 +519,7 @@
</action>
</actions>
<client_configs>
<component_config className="AjxpTabulator::userdashboard_parameters_tab">
<component_config className="AjxpTabulator::userdashboard_main_tab">
<additional_tab id="webdav_pane"
tabInfo='{"id":"my-webdav-data","iconClass":"icon-cog","element":"webdav_pane","closeable":false,"label":"403","title":"403","dontFocus":true,"position":3}'
paneInfo='{"type":"widget"}'><![CDATA[
Expand Down
22 changes: 18 additions & 4 deletions core/src/plugins/gui.ajax/res/themes/orbit/css/ajaxplorer.css
View file
Expand Up @@ -5442,11 +5442,27 @@ div.flat_tabulator > div:not(.tabulatorContainer){

.horizontal_tabulator div.tabulatorContainer {
float: left;
width: 200px;
width: 300px;
padding: 0;
background-color: rgba(51, 51, 51, 0.75) !important;
}

div#userdashboard_main_tab.horizontal_tabulator div.tabulatorContainer{
padding-top: 77px;
}

div#userdashboard_myparams_title{
position: absolute;
color: white;
font-weight: normal;
padding: 8px 0;
font-size: 30px;
-webkit-font-smoothing: antialiased;
border-bottom: 1px solid #eee;
width: 284px;
left: 7px;
}

div.horizontal_tabulator > div > div.horizontal_tabulator div.tabulatorContainer {
background-color: rgba(51, 51, 51, 0.55) !important;
}
Expand All @@ -5458,8 +5474,6 @@ div.horizontal_tabulator > div > div.horizontal_tabulator div.tabulatorContainer
color: #ffffff !important;
border: 0;
display: block;
margin: 2%;
border-radius: 2px;
font-size: 18px;
font-weight: lighter;
-webkit-font-smoothing: antialiased;
Expand All @@ -5469,7 +5483,7 @@ div.horizontal_tabulator > div > div.horizontal_tabulator div.tabulatorContainer
}

.horizontal_tabulator span.toggleInactive{
width: 200px;
width: auto !important;
border-width: 0 !important;
background-color: transparent !important;
color: #fff !important;
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.

2 comments on commit d02d7c9

@Nanomani
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just to be sure....
There is no way to go directly in a workspace actually with skin orbit in "Dashbord" ???
PS : Also there is no way to go directly in a workspace actually with skin orbit in "Settings" too ???

tested with pydio-lastest (20-Jul-2014 03:06 17M )
all cached file was deleted of course

2014-07-20_125131

2014-07-20_125051

PS 2 : Skin "Orbit" is very great :-) thanks for your hard works

@cdujeu
Copy link
Member Author

@cdujeu cdujeu commented on d02d7c9 Jul 20, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi Nicolas
Glad you like it, we've been working with a UX guy make it more intuitive! If you have remarks we are super open.
About the workspace chooser, here is the trick: enable the new workspace "Home" for everyone ( via root role ) and access it by clicking on the top left Pydio logo! Hope you'll like that one too :)

Please sign in to comment.