From ced5940c784376bbbe9d38fcb7a37eb4a479831c Mon Sep 17 00:00:00 2001 From: cdujeu Date: Thu, 3 Jul 2014 23:09:57 +0200 Subject: [PATCH] Orbit - Follow up --- .../src/plugins/access.ajxp_conf/manifest.xml | 39 ++++++ .../class.UserDashboardHome.js | 11 +- .../plugins/access.ajxp_user/dashboard.css | 41 +++--- .../src/plugins/access.ajxp_user/manifest.xml | 57 +++++++- .../class.AJXP_NotificationCenter.php | 5 + core/src/plugins/gui.ajax/manifest.xml | 18 +-- .../res/js/ajaxplorer/class.Breadcrumb.js | 47 +++++++ .../res/js/ajaxplorer/class.SearchEngine.js | 37 ++++- .../js/ajaxplorer/class.VisibilityToggler.js | 49 +++++++ .../gui.ajax/res/js/ajaxplorer_list.txt | 1 + .../res/themes/orbit/css/ajaxplorer.css | 127 ++++++++++++------ .../orbit/images/mimes/16/mime_empty.png | Bin 2900 -> 2976 bytes .../orbit/images/mimes/64/mime_empty.png | Bin 3065 -> 3325 bytes core/src/plugins/meta.user/manifest.xml | 1 + 14 files changed, 361 insertions(+), 72 deletions(-) create mode 100644 core/src/plugins/gui.ajax/res/js/ajaxplorer/class.VisibilityToggler.js diff --git a/core/src/plugins/access.ajxp_conf/manifest.xml b/core/src/plugins/access.ajxp_conf/manifest.xml index e478cc7634..e97912ccd0 100644 --- a/core/src/plugins/access.ajxp_conf/manifest.xml +++ b/core/src/plugins/access.ajxp_conf/manifest.xml @@ -83,6 +83,45 @@ }); ]]> + +
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+ + + + ]]> diff --git a/core/src/plugins/access.ajxp_user/class.UserDashboardHome.js b/core/src/plugins/access.ajxp_user/class.UserDashboardHome.js index 72f0c991bd..da8136ad27 100644 --- a/core/src/plugins/access.ajxp_user/class.UserDashboardHome.js +++ b/core/src/plugins/access.ajxp_user/class.UserDashboardHome.js @@ -63,7 +63,10 @@ Class.create("UserDashboardHome", AjxpPane, { var renderElement = function(repoObject){ var repoId = repoObject.getId(); - var repoEl = new Element('li').update("

"+repoObject.getLabel() + "

" + repoObject.getDescription()+"

"); + var startLetters; + var label = repoObject.getLabel(); + startLetters = label.split(" ").map(function(word){return word.substr(0,1)}).join(""); + var repoEl = new Element('li').update(""+ startLetters +"

"+repoObject.getLabel() + "

" + repoObject.getDescription()+"

"); wsElement.insert(repoEl); var select = function(e){ var target = Event.findElement(e, "li"); @@ -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'); @@ -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(); } @@ -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); } diff --git a/core/src/plugins/access.ajxp_user/dashboard.css b/core/src/plugins/access.ajxp_user/dashboard.css index c2354c9a85..08048cc47f 100644 --- a/core/src/plugins/access.ajxp_user/dashboard.css +++ b/core/src/plugins/access.ajxp_user/dashboard.css @@ -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{ @@ -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; } @@ -77,7 +85,7 @@ } #workspaces_list li:hover { - background-color: #4F6275; + background-color: #f5f5f5; } #workspaces_list li.ws_selector_title:hover { @@ -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; @@ -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"] { @@ -191,7 +201,7 @@ color: white; border: 0; cursor: pointer; - margin-top: -5px; + margin-top: 0; background-color: #e35d52; } @@ -202,6 +212,7 @@ #logo_div{ text-align: center; padding-top: 20px; + display: none; } #get_started_link, @@ -263,7 +274,7 @@ and (max-width : 980px){ } } - @media only screen +@media only screen and (max-width : 800px){ #workspaces_center{ diff --git a/core/src/plugins/access.ajxp_user/manifest.xml b/core/src/plugins/access.ajxp_user/manifest.xml index bfe3fc07f7..cd67d14bdf 100644 --- a/core/src/plugins/access.ajxp_user/manifest.xml +++ b/core/src/plugins/access.ajxp_user/manifest.xml @@ -28,7 +28,7 @@
]]> - ]]> + + + ]]>
@@ -140,7 +193,7 @@

AJXP_MESSAGE[user_dash.39]

-
    +
      diff --git a/core/src/plugins/core.notifications/class.AJXP_NotificationCenter.php b/core/src/plugins/core.notifications/class.AJXP_NotificationCenter.php index 4cb1649aa6..523ce2bd23 100755 --- a/core/src/plugins/core.notifications/class.AJXP_NotificationCenter.php +++ b/core/src/plugins/core.notifications/class.AJXP_NotificationCenter.php @@ -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); @@ -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())." ".$node->event_description.""); + } $url = parse_url($node->getUrl()); $node->setUrl($url["scheme"]."://".$url["host"]."/notification_".$index); $index ++; diff --git a/core/src/plugins/gui.ajax/manifest.xml b/core/src/plugins/gui.ajax/manifest.xml index e366445087..0d9cde6633 100644 --- a/core/src/plugins/gui.ajax/manifest.xml +++ b/core/src/plugins/gui.ajax/manifest.xml @@ -164,15 +164,14 @@
      -
      - -
      + +
      -
      +
      @@ -180,15 +179,16 @@

      My Alerts

      -
      +
      diff --git a/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.Breadcrumb.js b/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.Breadcrumb.js index e518b139e7..445f5888cf 100644 --- a/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.Breadcrumb.js +++ b/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.Breadcrumb.js @@ -141,6 +141,7 @@ Class.create("Breadcrumb", { buttonsWidth += el.getWidth(); }); var newWidth = (parentWidth-siblingWidth-30); + if(this.options.flexToMargin) newWidth = newWidth - this.options.flexToMargin; if(newWidth < 5){ this.element.hide(); }else{ @@ -148,6 +149,52 @@ Class.create("Breadcrumb", { this.element.setStyle({width:newWidth + 'px'}); } } + if(this.options["use_ul"]){ + /* + var lastOverlaps = function(){ + var last = this.element.down('li:last'); + return (last && last.positionedOffset()['left'] + last.getWidth() ) > parseInt(this.element.getWidth()) + }.bind(this); + var i=0; + var spans = this.element.select('li'); + var available = parseInt(this.element.getWidth()); + if(spans.length){ + var base = 0; + var foldedSize = 38; + var allsizes = []; + var sumsizes = function(array){ + var r=0; + for(n=0;n available && p + * This file is part of Pydio. + * + * Pydio is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Pydio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with Pydio. If not, see . + * + * The latest code can be found at . + */ + +Class.create("VisibilityToggler", AjxpPane, { + + /** + * Constructor + * @param $super klass Superclass reference + * @param htmlElement HTMLElement Anchor of this pane + * @param options Object Widget options + */ + initialize : function($super, htmlElement, options){ + + var togId = options['widget_id']; + var detectionId= options['detection_id'] ? options['detection_id'] : options['widget_id']; + htmlElement.observe("click", function(){ + if(!$(togId) || !$(detectionId)) return; + if($(togId).ajxpPaneObject){ + $(togId).ajxpPaneObject.showElement(!$(detectionId).visible()); + }else{ + var show = !$(detectionId).visible(); + if(show) $(togId).show(); + else $(togId).hide(); + } + htmlElement.removeClassName('simple-toggler-show').removeClassName('simple-toggler-hide'); + htmlElement.addClassName($(detectionId).visible()?'simple-toggler-hide':'simple-toggler-show'); + htmlElement.update($(detectionId).visible()?"Hide":"Show"); + }); + + } + +}); \ No newline at end of file diff --git a/core/src/plugins/gui.ajax/res/js/ajaxplorer_list.txt b/core/src/plugins/gui.ajax/res/js/ajaxplorer_list.txt index d6abc4c4ea..45c940164a 100644 --- a/core/src/plugins/gui.ajax/res/js/ajaxplorer_list.txt +++ b/core/src/plugins/gui.ajax/res/js/ajaxplorer_list.txt @@ -32,6 +32,7 @@ js/ajaxplorer/class.Repository.js js/ajaxplorer/class.AjxpDraggable.js js/ajaxplorer/class.AjxpSortable.js js/ajaxplorer/class.AjxpTabulator.js +js/ajaxplorer/class.VisibilityToggler.js js/ajaxplorer/class.AjxpSimpleTabs.js js/ajaxplorer/class.RepositorySelect.js js/ajaxplorer/class.RepositorySimpleLabel.js diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/css/ajaxplorer.css b/core/src/plugins/gui.ajax/res/themes/orbit/css/ajaxplorer.css index 8a39a287b4..10343f2c46 100644 --- a/core/src/plugins/gui.ajax/res/themes/orbit/css/ajaxplorer.css +++ b/core/src/plugins/gui.ajax/res/themes/orbit/css/ajaxplorer.css @@ -228,6 +228,7 @@ div.thumbnail_cell_metadata span.metadata_chunk{ .selectable_div.detailed{ padding: 0 !important; + overflow: hidden !important; } .thumbnail_iconlike_shadow{ @@ -1159,12 +1160,11 @@ input.SF_input.SF_number{ } #global_toolbar{ - background-color: #474E50; - height: 30px; + background-color: #145170; + height: 33px; padding: 9px 0 0 5px; background-image: url("../images/white_logo.png"); background-repeat: no-repeat; - box-shadow: 0 0 8px rgba(0,0,0,0.4); } #top_toolbar{ @@ -1246,6 +1246,8 @@ input.SF_input.SF_number{ #sidebar_splitter div.panelHeader, #search_panel div.panelHeader{ + color: #555; + padding: 8px; } #search_panel div.panelHeader{ @@ -1578,7 +1580,12 @@ div.class-FetchedResultPane > div.panelHeader #navigation_pane{ background-color: #f7f7f7; - overflow: hidden; + overflow: auto; +} + +#notif_pane div.thumbLabel small { + font-style: italic; + opacity: 0.7; } #topPane h3{ @@ -1594,6 +1601,25 @@ div.class-FetchedResultPane > div.panelHeader display: block; } +#topPane h3 small{ + cursor: pointer; + display: none; + float: right; + color: white; + background-color: #c5c5c5; + border-radius: 5px; + text-transform: lowercase; + padding: 0 8px; + font-weight: normal; + font-size: 0.7em; +} + +#topPane h3:hover small, +#topPane h3 small.simple-toggler-show +{ + display: inline-block; +} + #locationbar_cont { /*background-image:url(../images/ToolbarBg.gif);*/ @@ -1685,6 +1711,7 @@ div.class-FetchedResultPane > div.panelHeader font-weight: normal; letter-spacing: 1px; margin: 0; + margin-top:1px; cursor: pointer; padding: 0.4em; border-radius: 3px 0 0 3px; @@ -1902,7 +1929,6 @@ img.user_widget_mini{ /* HEADER RESIZER WIDGET /******************************/ div#search_meta{ - display: none; } div.header_resizer, div#search_meta{ overflow:hidden; @@ -2308,14 +2334,13 @@ div#upload_files_list, div#multiple_download_container list-style: none; display: block; position: relative; - border-bottom: 1px solid #4DC5C2; - background-color: #d5d5d5; + border-bottom: 1px solid #77b8e2; + background-color: #ffffff; } #uploader_chooser li { display: inline-block; - background-color: white; - padding: 7px 14px; + padding: 12px 14px; border-radius: 4px 4px 0 0; margin: 8px 2px; margin-bottom: 0; @@ -2325,15 +2350,15 @@ div#upload_files_list, div#multiple_download_container } #uploader_chooser li:hover { - background-color: #f7f7f7; + background-color: #f5f5f5; + border-bottom: 2px solid #f5f5f5; } #uploader_chooser li.current:hover { - background-color: #4DC5C2; } #uploader_chooser li.current { - background-color: #4DC5C2; - color: white; + font-weight: bold; cursor: default; + border-bottom: 2px solid #77b8e2; } div#uploader_options_pane { @@ -2595,10 +2620,18 @@ div.tabulatorContainer{ border-radius: 0; } +div#topPane div.overlay_icon_div { + display: none; +} + #cpane_tabs > div.tabulatorContainer{ border-bottom: 0; } +div#cpane_tabs[data-ajxptabscount="1"] span.toggleHeader { + visibility: hidden; +} + div.tabulatorContainer div#display_toolbar{ min-width: 0; padding-top: 6px; @@ -2706,6 +2739,7 @@ div.tabulatorContainer span.toggleInactive span.tab_close_button:hover { } #search_panel{ + overflow: visible; } #search_div @@ -2717,32 +2751,33 @@ div.tabulatorContainer span.toggleInactive span.tab_close_button:hover { #search_container { float: right; - padding-top: 3px; + text-align: right; + overflow: visible; + position: relative; } #search_form, #search_state { - padding-left: 10px; + padding-left: 7px; + padding-top: 1px; } #search_form { - float: right; - text-align: right; padding-right: 11px; height: 35px; - overflow: hidden; + overflow: visible; } #search_form a { display: inline-block; - width:18px; + width: 18px; cursor: pointer; - margin-right: 0; - margin-left: 5px; - padding: 1px; - font-size: 1.4em; + font-size: 1em; padding-top: 3px; - color: rgb(138, 149, 160); + color: #555; + position: absolute; + right: 18px; + top: 6px; } #search_form a.disabled { @@ -2757,17 +2792,24 @@ div.tabulatorContainer span.toggleInactive span.tab_close_button:hover { #search_form input { - display: none; - float: none !important; + float: right !important; margin: 0; - height: 21px; - border-color: rgb(138, 149, 160); + height: 28px; background: #fff; - font-size: 1.2em; + border-color: #fff ; + font-size: 1em; color: rgb(138, 149, 160); padding-left: 6px; + width: 73px; + border-radius: 4px; + border-width: 0; + transition:border-color 1s ease, width 1s ease; +} + +#search_container.search_active #search_form input{ + width: 100%; border-width: 1px; - width: 43%; + border-color: rgb(138, 149, 160); } #search_meta { @@ -2780,7 +2822,7 @@ div.tabulatorContainer span.toggleInactive span.tab_close_button:hover { border-bottom: 1px solid rgb(194, 196, 199); max-height: 200px !important; box-shadow: none !important; - height: 25px !important; + height: 32px !important; -webkit-transition-property: height; -webkit-transition-duration: 0.1s; -webkit-transition-timing-function: ease-in-out; @@ -2847,9 +2889,7 @@ div.tabulatorContainer span.toggleInactive span.tab_close_button:hover { } #basic_search{ - padding: 4px; - height: 17px; - width: 350px; + padding: 7px; } #search_meta.toggle_open #basic_search{ @@ -2957,14 +2997,14 @@ span.search_meta_opt.checked > span { border-radius: 4px; box-shadow: 1px 10px 40px rgba(0,0,0,0.5); background-color: #ebedf0; + text-align: left; } #search_results { - display: none; margin-left: 0; - width: 350px; - font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif; + width: 100%; + background-color: white; } .close_results.icon-remove-sign { @@ -2999,12 +3039,12 @@ div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed{ div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed div.thumbnail_selectable_cell img{ width: 16px !important; height: 16px !important; - margin-top: 5px !important; + margin-top: 4px !important; } div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed div.thumbnail_selectable_cell{ margin: 0; - padding: 0 4px 0 9px; + padding: 1px 7px 6px 6px; height: 22px !important; } @@ -3021,7 +3061,7 @@ div.class-FetchedResultPane div.ajxpNodeProvider:hover div.class-FetchedResultPane div.ajxpNodeProvider.selected-focus, #search_results div.ajxpNodeProvider.selected-focus { - background-color: #59F !important; + background-color: #77b8e2 !important; } div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed div.thumbLabel, @@ -4386,7 +4426,7 @@ div.menuActions img{ font-weight: bold; color: #fff; font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif , sans-serif; - background-color: #59f; + background-color: #77b8e2; z-index: 10000; border-radius: 3px 3px 0 0; width: 15%; @@ -4841,6 +4881,7 @@ div.horizontal_tabulator > div:not(.tabulatorContainer){ display: inline-block; overflow: hidden; color: rgb(111, 121, 131); + margin-top: 1px; } #breadcrumb div.inner_bread{ @@ -5016,6 +5057,10 @@ div.horizontal_tabulator > div:not(.tabulatorContainer){ color: #555; } +div#buttons_bar_top { + padding-top: 1px; +} + #workspace_toolbar a#ls_button{ display: none; diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/mimes/16/mime_empty.png b/core/src/plugins/gui.ajax/res/themes/orbit/images/mimes/16/mime_empty.png index a8abfbe7756f1a7934cbf006569e918cd416a32e..59e86a40212e9b570edce3ba433f4fbc1d821cbd 100644 GIT binary patch delta 233 zcmV9U4Zsn=w`#AHSpJ7tdG`d7T7b&GV)_BE!*gc%%4hz(I z(S8AZ!BZqA9N-3zxWol+^9y?g;0y2g#7CSHR(ObRW^I5T2AN?VL>JdM3)oc~po}e^ zafnk?0r_u>D5#P0zBHNPe7oqMqr00000NkvXXu0mjfgFI*G delta 157 zcmV;O0Al~37t|K8zzTnVNkl@T3^G<&zMa8~Hg*rCD+gF~vQ+@u<%wik=xkumD-2GlY?|bdN zVyopEr!UpZrbcetyC9}1Rixb@AoX|Hl^0RDhZW4iD=%0vt~r=lFLQX;D!yCSpZ;6C zLr8PijE&;$8|@gp?i~0M)X(T&Rq}N^`f0O3rmOT)PJ6`s_ka4$l zX8e7l(+!d}N26+Hq|Y{t={{C3&pDxZnRkvj*L1!s5K_N2SL5qd zkq72#1^RXTiP~^Xd1t*mk9)rVGc4~4_rQziOd z7B4nts7n+oSN`jsbgsbUoow6ed5oJs3T;>VYVTGqk(DJnL;v0p+e0bBrygwgtAAGd zL+0+HZ>a?Zikf$V#O5DY$xvA3kjt3%|BszbM)H1U#(>xCN~<3obYK4a+n+{{tA=9c zR)1yB@VL)rFzEZd*Cz4usRSk!2hvao?}u3F_fNiRIH~=qt*mmq_}1Dfx}adDV$PLg z>L#x0^UsO72F`w;dwP>j5sybh*KUV2hvrA;85+V`*Q{A%*u?+@p00i_>zopr07|z7 A6aWAK delta 324 zcmew>`BQwuey(~(6;Bt(kcwMxZu|NjHV|-lXuc(>^UCT2ZOjD$3BgxbPv`A)><>C3 zrLwtm>8eHclVT^9-1CT2^;_frIOUB-pqFCtoe4H90uBs}ECLFJXR2d0l&Zo*<{uE= zU|ANFt!Vy?CxSu#z~d{+97-~_AFwW9U(@)zn{!IgE|Ud3Ys1gfH(Y->E56-mVdWiV zrXQ>Sd$we=ui(&c7cgSDvi)k7#XeTKO^jE3D(; +