Merge branch 'master' of http://service.routetopa.eu:7480/WebCompDev/COMPONENTS

Renato De Donato
2 parents 3c812cc9 e4d4d425
Showing 4 changed files with 114 additions and 12 deletions
controllets/animated-button-container-controllet/animated-button-container-controllet.html
controllets/create-card-controllet/create-card-controllet.html
controllets/opinion-controllet/opinion-controllet.html
datalets/graph-datalet/graph-datalet.html
@@ -87,7 +87,7 @@
             height: 45px;
         }
  
-        search-panel-controllet{
+        #search_from_animated_button_container{
             position: absolute;
             top: 0px;
             left: 0px;
@@ -183,7 +183,7 @@
                         <paper-textarea class="custom_textarea" id="text"
                                                                 label=""
                                                                 char-counter
-                                                                max-rows="6"
+                                                                max-rows="50"
                                                                 maxlength="1024"
                                                                 value="{{text}}">
  
+<!--
+@license
+    The MIT License (MIT)
+
+    Copyright (c) 2015 Dipartimento di Informatica - Università di Salerno - Italy
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+    THE SOFTWARE.
+-->
+
+<!--
+* Developed by :
+* ROUTE-TO-PA Project - grant No 645860. - www.routetopa.eu
+*
+-->
+
+<link rel="import" href="../../bower_components/polymer/polymer.html">
+<link rel="import" href="../../bower_components/paper-styles/color.html">
+<link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout.html">
+
+<!--
+`text-element-controllet` is a text area with heading. It fires an event when the text value is modified. This event can be useful when you have to monitor many af this elements.
+
+
+Example:
+
+    <text-element-controllet heading="myField"
+                             description="myFieldDescription"
+                             number="1">
+    </text-element-controllet>
+
+
+@element text-element-controllet
+@status beta
+@homepage
+@group controllets
+-->
+
+
+<dom-module id="opinion-controllet">
+    <template>
+
+        <style is="custom-style">
+
+        </style>
+
+        <div class="horizontal layout">
+
+        </div>
+
+    </template>
+
+    <script>
+
+        Polymer({
+
+            is: 'opinion-controllet',
+
+            properties: {
+            }
+        });
+
+    </script>
+
+</dom-module>
 \ No newline at end of file
@@ -32,6 +32,7 @@
 <link rel="import" href="../base-datalet/base-datalet.html">
 <link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout.html">
 <link rel="import" href="../../bower_components/paper-dialog/paper-dialog.html">
+<link rel="import" href="../../bower_components/paper-fab/paper-fab.html">
  
 <!--
 `preview-datalet` is a datalet that allow user to preview the content of a web page. It creates a thumbnail of the site using the data-url attribute passed as input.
@@ -56,8 +57,21 @@ Example:
         <style is="custom-style">
  
             #dialog{
-                position: absolute;
+                position: relative;
                 padding: 20px;
+                right:5%;
+            }
+
+            #close{
+                position: absolute;
+                top: -20px;
+                right: 3px;
+                --iron-icon-height: 20px;
+                --iron-icon-width: 20px;
+                width: 24px;
+                height: 24px;
+                --paper-fab-background:#9e9e9e;
+                z-index: 1001;
             }
  
         </style>
@@ -67,9 +81,9 @@ Example:
         </div>
  
         <paper-dialog id="dialog">
+            <paper-fab id="close" mini icon="close" on-click="_onCloseClick"></paper-fab>
             <h2 id="dialog_title"></h2>
-            <paper-dialog-scrollable id="dialog_content">
-            </paper-dialog-scrollable>
+            <paper-dialog-scrollable id="dialog_content">cos</paper-dialog-scrollable>
         </paper-dialog>
  
     </template>
@@ -116,6 +130,10 @@ Example:
                 svg: {
                     type: Object,
                     value: undefined
+                },
+                feelings:{
+                    type: Array,
+                    values: ["Agree", "Neutral", "Not agree"]
                 }
             },
  
@@ -248,13 +266,12 @@ Example:
                     //return 1 == t.fixed ? 1.4 * t.r : 15
                     return 1 == t.fixed ? 1.4 * t.r : t.r + 10;
                 });
-
             },
  
             mouseout : function () {
                 d3.select(this).selectAll("text").style("visibility", "hidden"), d3.select(this).selectAll("circle").transition().duration(400).attr("r", function (t) {
                     return t.r ? t.r : 15
-                })
+                });
             },
  
             active : function (t) {
@@ -269,12 +286,17 @@ Example:
                 prev_selected_node.style.fill   = prev_selected_node.style.stroke;
                 prev_selected_node.style.stroke = "#000000";
  
-               /* _this.$.dialog_title.innerHTML   = "Comment";
-                _this.$.dialog_content.innerHTML = t.name;
-                _this.$.dialog.style.top         = t.y + "px";
-                _this.$.dialog.style.left        = t.x + "px";
+                _this.$.dialog.close();
+                _this.$.dialog_title.innerHTML   = t.name;
+                _this.$.dialog_content.innerHTML = t.content;
+                /*_this.$.dialog.style.top         = t.y + "px";
+                _this.$.dialog.style.left        = t.x + "px";*/
+
+               _this.$.dialog.open();
+            },
  
-               _this.$.dialog.open();*/
+            _onCloseClick : function(){
+                _this.$.dialog.close();
             },
  
             /**