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

Commit

Permalink
Orbit - Follow up
Browse files Browse the repository at this point in the history
  • Loading branch information
@cdujeu
cdujeu committed Jul 3, 2014
1 parent 84cb12a commit ced5940
Show file tree
Hide file tree
Showing 14 changed files with 361 additions and 72 deletions.
39 changes: 39 additions & 0 deletions core/src/plugins/access.ajxp_conf/manifest.xml
View file
Expand Up @@ -83,6 +83,45 @@
});
</script>
]]></template_part>
<template_part ajxpId="browser" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fitParent":"ajxp_desktop", "fakeOption":"true"}' theme="orbit"><![CDATA[
<div id="vertical_splitter" class="settings_main_pane" ajxpClass="Splitter" ajxpOptions='{"direction": "vertical", "invisibleBar":true, "initA": "20%", "minA":28, "maxA":380, "fit":"height","fitParent":"browser", "minSize":0, "foldingButton":"A"}'>
<div ajxpClass="AjxpTabulator" id="leftTabulator" ajxpOptions='{"defaultTabId": "folders","tabInfos" : [{"id":"folders","label":"ajxp_conf.122","iconClass":"icon-cogs","element":"leftPane"},{"id":"flagged","label":"147","iconClass":"icon-bookmark","element":"flagged_elements"}],"headerToolbarOptions":{"submenuClassName":"panelHeaderMenu","submenuPosition":"bottom right","submenuOffsetTop":12,"toolbarsList":["vertical_splitter-actions"],"skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}}'>
<div id="flagged_elements" ajxpClass="FetchedResultPane" ajxpOptions='{"nodeProviderProperties":{"get_action":"get_bookmarks", "format":"node_list"},"reloadOnServerMessage":"tree/reload_bookmarks"}'></div>
<div id="leftPane" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height"}'>
<div id="search_container_settings" class="settings_search_container" ajxpClass="SearchEngine" ajxpOptions='{"toggleResultsVisibility":"search_results_cont", "fitMarginBottom":10}'></div>
<div id="settings_pane" class="flat_tree_pane" ajxpClass="FoldersTree" ajxpOptions='{"display":"dz","replaceScroller":true}' ></div>
</div>
</div>
<div id="rightPane" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height", "messageBoxReference":true}'>
<div id="editor_tabs" ajxpClass="AjxpTabulator" class="flat_tabulator" ajxpOptions='{"fit":"height", "fitMarginBottom":0, "registerAsEditorOpener":true, "saveState":false,"events":{"ajaxplorer:context_changed":"this.switchTabulator(this.tabulatorData.first().id);"}, "defaultTabId": "info","tabInfos" : [{"id":"info","label":"","iconClass":"icon-list-alt", "element":"files_list_pane"}]}'>
<div id="files_list_pane" ajxpClass="AjxpPane">
<div id="breadcrumb_container"><div id="breadcrumb" ajxpClass="Breadcrumb" ajxpOptions=''></div><div ajxpClass="BookmarksBar" ajxpOptions='{}' id="bm_bar"></div></div>
<div id="actions" class="buttons_bar_container">
<div id="buttons_bar" class="action_bar" ajxpClass="ActionsToolbar" ajxpOptions='{"toolbarsList":["put", "get", "remote"],"skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}'></div>
</div>
<div id="content_pane" ajxpClass="FilesList" ajxpOptions='{"displayMode":"detail","replaceScroller":true, "fit":"height", "fitParent":"editor_tabs", "fitMarginBottom":0, "cellPaddingCorrection":6, "iconBgPosition" : "5px 4px"}'></div>
</div>
</div>
</div>
<style>
#get_my_feed_button{
display:none !important;
}
</style>
</div>
<script>
if($("browser")) $("browser").ajxpPaneObject.resize();
document.observeOnce("ajaxplorer:context_changed", function(){
try{
$A($("settings_pane").ajxpPaneObject.tree.childNodes).each(function(c){
c._webfxtree_expand();
$(c._loadingItem).remove();
})
}catch(e){}
if($("browser")) $("browser").ajxpPaneObject.resize();
});
</script>
]]></template_part>
</client_configs>
<external_file filename="plugins/access.ajxp_conf/ajxp_confActions.xml" include="actions/*"/>
<external_file filename="plugins/access.ajxp_shared/manifest.xml" include='registry_contributions/actions/action[@name="clear_expired"]'/>
Expand Down
11 changes: 7 additions & 4 deletions core/src/plugins/access.ajxp_user/class.UserDashboardHome.js
View file
Expand Up @@ -63,7 +63,10 @@ Class.create("UserDashboardHome", AjxpPane, {
var renderElement = function(repoObject){

var repoId = repoObject.getId();
var repoEl = new Element('li').update("<h3>"+repoObject.getLabel() + "</h3><h4>" + repoObject.getDescription()+"</h4>");
var startLetters;
var label = repoObject.getLabel();
startLetters = label.split(" ").map(function(word){return word.substr(0,1)}).join("");
var repoEl = new Element('li').update("<span class='letter_badge'>"+ startLetters +"</span><h3>"+repoObject.getLabel() + "</h3><h4>" + repoObject.getDescription()+"</h4>");
wsElement.insert(repoEl);
var select = function(e){
var target = Event.findElement(e, "li");
Expand Down Expand Up @@ -115,7 +118,7 @@ Class.create("UserDashboardHome", AjxpPane, {
var notificationElement = oFormObject.down("#notifications_center");
attachMobileScroll(notificationElement, "vertical");

if(notifCenter){
if(false && notifCenter){
notifCenter.ajxpNode.observe("loaded", function(){
notifCenter.pFactory.setThumbSize(64);
var existingItems = notificationElement.select('li');
Expand Down Expand Up @@ -171,7 +174,7 @@ Class.create("UserDashboardHome", AjxpPane, {
clicker(null, true);
}
}else{
oFormObject.down("#workspaces_center").setStyle({marginLeft: '30%'});
//oFormObject.down("#workspaces_center").setStyle({marginLeft: '30%'});
notificationElement.hide();
}

Expand All @@ -194,7 +197,7 @@ Class.create("UserDashboardHome", AjxpPane, {

$super(size);

fitHeightToBottom(this.htmlElement.down('#workspaces_list'), this.htmlElement, 90);
fitHeightToBottom(this.htmlElement.down('#workspaces_center'), this.htmlElement, 0);
}


Expand Down
41 changes: 26 additions & 15 deletions core/src/plugins/access.ajxp_user/dashboard.css
View file
Expand Up @@ -3,23 +3,30 @@
}

#workspaces_center{
width: 40%;
margin: 0 15%;
min-width: 420px;
width: 100%;
transition:margin 0.5s ease;
overflow-y: auto;
}

#workspaces_list{
overflow-y: auto;
max-height: 400px;
min-height: 100px;
margin: 0 30px;
background-color: #2c3e50;
margin: 0 auto;
border-radius: 6px;
list-style: none;
padding-left: 0;
color: #ffffff;
width: 480px;
}

span.letter_badge {
display: inline-block;
float: left;
width: 57px;
background-color: #d5d5d5;
border-radius: 34px;
margin: 2px 17px 2px 0;
color: white;
text-align: center;
padding: 20px 0;
font-size: 1.3em;
}

.dashboard_main_pane > div.tabulatorContainer{
Expand Down Expand Up @@ -64,10 +71,11 @@
font-size: 12px;
opacity: 0.4;
letter-spacing: 1px;
margin-left:60px;
border-bottom: 1px solid #d5d5d5;
}

#workspaces_list li {
border-bottom: 1px solid #263544;
cursor: pointer;
padding: 1px 7px;
}
Expand All @@ -77,7 +85,7 @@
}

#workspaces_list li:hover {
background-color: #4F6275;
background-color: #f5f5f5;
}

#workspaces_list li.ws_selector_title:hover {
Expand Down Expand Up @@ -165,7 +173,7 @@

#home_account_pane h1{
margin-top: 0;
padding-top: 12px;
padding-top: 44px;
font-size: 21px;
text-align: center;
font-weight: normal;
Expand All @@ -181,8 +189,10 @@
}

#workspaces_button {
padding: 15px 30px;
padding: 45px 30px;
font-size: 14px;
width: 480px;
margin: 0 auto;
}

#workspaces_button input[type="button"] {
Expand All @@ -191,7 +201,7 @@
color: white;
border: 0;
cursor: pointer;
margin-top: -5px;
margin-top: 0;
background-color: #e35d52;
}

Expand All @@ -202,6 +212,7 @@
#logo_div{
text-align: center;
padding-top: 20px;
display: none;
}

#get_started_link,
Expand Down Expand Up @@ -263,7 +274,7 @@ and (max-width : 980px){
}
}

@media only screen
@media only screen
and (max-width : 800px){

#workspaces_center{
Expand Down
57 changes: 55 additions & 2 deletions core/src/plugins/access.ajxp_user/manifest.xml
View file
Expand Up @@ -28,7 +28,7 @@
<div id="folderPane" ajxpClass="FoldersTree" ajxpOptions='{"display":"dz","replaceScroller":true}' ajxpPaneHeader="363" ajxpPaneIcon="view_tree.png" style="margin:20px;"></div>
<style>#sidebar_splitter{padding-bottom:20px;background-color:#A0C0A4;}</style>
]]></template_part>
<template_part ajxpClass="AjxpPane" ajxpId="workspace_toolbar" ajxpOptions='{"fit":"none"}'><![CDATA[
<template_part ajxpClass="AjxpPane" ajxpId="workspace_toolbar" ajxpOptions='{"fit":"none"}' theme="vision"><![CDATA[
<div id="search_container_settings" class="settings_search_container" style="display:none;" ajxpClass="SearchEngine" ajxpOptions='{"toggleResultsVisibility":"search_results_cont", "fitMarginBottom":20}'></div>
<style>
#workspace_toolbar, #global_toolbar{display:none;}
Expand Down Expand Up @@ -81,6 +81,59 @@
}
</style>
]]></template_part>
<template_part ajxpClass="AjxpPane" ajxpId="workspace_toolbar" ajxpOptions='{"fit":"none"}' theme="orbit"><![CDATA[
<div id="search_container_settings" class="settings_search_container" style="display:none;" ajxpClass="SearchEngine" ajxpOptions='{"toggleResultsVisibility":"search_results_cont", "fitMarginBottom":20}'></div>
<style>
#workspace_toolbar{display:none;}
#browser{padding:0}
div.flat_tabulator span.toggleHeader{
background-color: #e35d52;
}
.largeButton, .SF_input.SF_inlineButton{
background-color: #e35d52;
}
.action_bar{
background-color: #ebedf0;
padding: 4px;
border-left:1px solid #5C5C5C;
}
#user_profile_form, div.class-FetchedResultPane{
border-left:1px solid #5C5C5C;
}
#account_pane .action_bar{
text-align: right;
}
.action_bar a{
background-color: #e35d52;
margin-top:3px;
cursor: pointer;
}
div.class-FetchedResultPane{
background-color: #f8f8f8;
}
#buttons_bar{
padding-bottom: 2px;
text-align: right;
}
#buttons_bar a {
padding-bottom: 0;
height: 26px;
}
.action_bar span.actionbar_button_label{
font-size: 11px;
}
.flat_tabulator div.panelHeader.tabulatorContainer{
background-color: #30383A;
padding-top: 10px;
}
.flat_tabulator span.toggleHeader:first-of-type {
background-color: #e35d52 !important;
}
.flat_tabulator span.toggleHeader.toggleInactive {
background-color: rgba(119, 119, 119, 0.35) !important;
}
</style>
]]></template_part>
<template_part ajxpId="browser" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fitParent":"ajxp_desktop", "fakeOptionUser":"true", "messageBoxReference":true}' theme="vision"><![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="home_account_pane" ajxpClass="UserDashboardHome">
Expand Down Expand Up @@ -140,7 +193,7 @@
<div id="workspaces_center">
<div id="logo_div"><img src="plugins/gui.ajax/PydioLogo250.png"></div>
<h1>AJXP_MESSAGE[user_dash.39]</h1>
<ul id="workspaces_list" style="height: 100px;"></ul>
<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>
<input type="button" name="go_to_ws" id="go_to_ws" value="AJXP_MESSAGE[user_dash.42]" class="disabled">
Expand Down
5 changes: 5 additions & 0 deletions core/src/plugins/core.notifications/class.AJXP_NotificationCenter.php
View file
Expand Up @@ -116,6 +116,8 @@ public function loadUserFeed($actionName, $httpVars, $fileVars)
$crtRepId = ConfService::getCurrentRepositoryId();
if (isSet($httpVars["repository_id"]) && $u->mergedRole->canRead($httpVars["repository_id"])) {
$authRepos[] = $httpVars["repository_id"];
} else if (isSet($httpVars["current_repository"])){
$authRepos[] = $crtRepId;
} else {
$accessibleRepos = ConfService::getAccessibleRepositories(AuthService::getLoggedUser(), false, true, false);
$authRepos = array_keys($accessibleRepos);
Expand Down Expand Up @@ -180,6 +182,9 @@ public function loadUserFeed($actionName, $httpVars, $fileVars)
// Replace PATH, to make sure they will be distinct children of the loader node
$node->real_path = $node->getPath();
$node->setLabel(basename($node->getPath()));
if(isSet($httpVars["merge_description"])){
$node->setLabel(basename($node->getPath())." <small>".$node->event_description."</small>");
}
$url = parse_url($node->getUrl());
$node->setUrl($url["scheme"]."://".$url["host"]."/notification_".$index);
$index ++;
Expand Down

0 comments on commit ced5940

Please sign in to comment.