Fix notifications actions in left panel

pydio · Mar 10, 2016 · 5d72fae · 5d72fae
1 parent f1019bc
commit 5d72fae
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 8 deletions.
diff --git a/core/src/plugins/core.notifications/manifest.xml b/core/src/plugins/core.notifications/manifest.xml
@@ -71,27 +71,26 @@
             </action>
             <action name="dismiss_user_alert">
                 <gui text="notification_center.7" title="notification_center.7" iconClass="icon-remove-sign" src="notification_center/ICON_SIZE/feed.png" accessKey="" hasAccessKey="false">
-                    <context selection="false" dir="" recycle="true" actionBar="true" actionBarGroup="inline-notifications" contextMenu="false" infoPanel="false"/>
+                    <context selection="true" dir="" recycle="true" actionBar="true" actionBarGroup="inline-notifications" contextMenu="false" infoPanel="false"/>
+                    <selectionContext dir="true" file="true" recycle="false" unique="true"/>
                 </gui>
                 <rightsContext adminOnly="false" noUser="true" read="false" userLogged="only" write="false"/>
                 <processing>
                     <clientCallback><![CDATA[
                     var selection = window.actionArguments[0];
+                    if(selection.getUniqueNode) selection = selection.getUniqueNode();
                     if(selection && selection.getMetadata && selection.getMetadata().get("alert_id")){
                         var elMeta = selection.getMetadata();
-                        var conn = new Connexion();
-                        conn.onComplete = function(){
-                            ajaxplorer.notify("server_message:tree/reload_user_feed");
-                        };
                         var params = {
                             get_action:'dismiss_user_alert',
                             alert_id:elMeta.get('alert_id')
                         };
                         if(elMeta.get("event_occurence")){
-                            params.occurrences = elMeta.get("event_occurence");
+                            params['occurrences'] = elMeta.get("event_occurence");
                         }
-                        conn.setParameters(params);
-                        conn.sendAsync();
+                        PydioApi.getClient().request(params, function(){
+                            ajaxplorer.notify("server_message:tree/reload_user_feed");
+                        });
                     }
                     ]]></clientCallback>
                     <serverCallback methodName="dismissUserAlert" restParams="/alert_id/occurences" developerComment="Dismiss one or more occurences of alerts">

diff --git a/core/src/plugins/gui.ajax/res/js/ui/reactjs/jsx/LeftNavigation.js b/core/src/plugins/gui.ajax/res/js/ui/reactjs/jsx/LeftNavigation.js
@@ -324,6 +324,7 @@
                         <div className="workspace-entry" onClick={createClick} title={messages[418]}>
                             <span className="workspace-badge">+</span>
                             <span className="workspace-label">{messages[417]}</span>
+                            <span className="workspace-description">{messages[418]}</span>
                         </div>
                     </div>
                 );

diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/css/components/leftpanel.less b/core/src/plugins/gui.ajax/res/themes/orbit/css/components/leftpanel.less
@@ -130,6 +130,14 @@
       .material-list-text{
         .nav-list-entry-label();
       }
+      .material-list-actions{
+        position:absolute;
+        right: 16px;
+        opacity: 0.5;
+        &:hover{
+          opacity: 1;
+        }
+      }
     }
     .mui-toolbar{
       position: absolute;
@@ -156,6 +164,13 @@
       display: inline-block;
       padding: 0 3px;
     }
+    .icon-refresh{
+      cursor: pointer;
+      transition: @bezier_transition;
+      &.rotating{
+        opacity: 0.2;
+      }
+    }
     .emptyMessage{
       display: inline-block;
       padding: 0 16px 8px;

diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/css/pydio.css b/core/src/plugins/gui.ajax/res/themes/orbit/css/pydio.css
@@ -4188,6 +4188,14 @@ div.menu.rootDirChooser span.rootDirTitle {
   overflow: hidden;
   text-overflow: ellipsis;
 }
+.left-panel .simple-provider .material-list-entry .material-list-actions {
+  position: absolute;
+  right: 16px;
+  opacity: 0.5;
+}
+.left-panel .simple-provider .material-list-entry .material-list-actions:hover {
+  opacity: 1;
+}
 .left-panel .simple-provider .mui-toolbar {
   position: absolute;
   top: 16px;
@@ -4213,6 +4221,14 @@ div.menu.rootDirChooser span.rootDirTitle {
   display: inline-block;
   padding: 0 3px;
 }
+.left-panel .simple-provider .icon-refresh {
+  cursor: pointer;
+  -webkit-transition: all 550ms cubic-bezier(0.23, 1, 0.32, 1) 0ms;
+          transition: all 550ms cubic-bezier(0.23, 1, 0.32, 1) 0ms;
+}
+.left-panel .simple-provider .icon-refresh.rotating {
+  opacity: 0.2;
+}
 .left-panel .simple-provider .emptyMessage {
   display: inline-block;
   padding: 0 16px 8px;