Merge pull request #23 from arc12012/Connor's-Branch

Connor's branch
arc12012 · Feb 12, 2017 · b545bb8 · b545bb8
2 parents 9adfdea + a7d9b91
commit b545bb8
Show file tree

Hide file tree

Showing 100 changed files with 2,168 additions and 1 deletion.
diff --git a/CREDITS.md b/CREDITS.md
@@ -0,0 +1,25 @@
+# Credits
+We are using a wonderful set of artistic user icons provided by flaticon.com to customize our user experience!
+
+We would like to directly thank the following artists for their contributions:
+
+## Madebyoliver
+* Octopus
+* Snorkel
+* Like (The heart!)
+* Sweater
+* Aquarium
+* Fruit
+
+## Freepik
+* Gingerbread man
+* Flask
+* Diamond
+* Squirrel
+* Bird (the teal one!)
+
+## Pixel Buddha
+* Moon
+* Doughnut
+* Bird (the red one!)
+* Paint Brush
diff --git a/WebContent/html/css/stylesheet.css b/WebContent/html/css/stylesheet.css
@@ -28,6 +28,17 @@ div.displayDevice{
     left: 300px;
 }
 
+div.profileContainer{
+    display: inline-block; 
+    position: absolute; 
+    padding-left: 30px;
+    width: 100%;
+    height: 100%;
+    overflow: scroll;
+    left: 200px;
+    top: 70px;
+}
+
 div.modal{
     display:none;
     position: fixed;
@@ -65,7 +76,7 @@ input[type=text]{
 
 
 span.close{
-    color: #aaa;
+    color: black;
     float: right;
     font-size: 28px;
     font-weight: bold;

diff --git a/WebContent/html/imgs/my-icons-collection-128px/license/license.pdf b/WebContent/html/imgs/my-icons-collection-128px/license/license.pdf
diff --git a/WebContent/html/imgs/my-icons-collection-128px/png/1.png b/WebContent/html/imgs/my-icons-collection-128px/png/1.png
diff --git a/WebContent/html/imgs/my-icons-collection-128px/png/10.png b/WebContent/html/imgs/my-icons-collection-128px/png/10.png
diff --git a/WebContent/html/imgs/my-icons-collection-128px/png/11.png b/WebContent/html/imgs/my-icons-collection-128px/png/11.png
diff --git a/WebContent/html/imgs/my-icons-collection-128px/png/12.png b/WebContent/html/imgs/my-icons-collection-128px/png/12.png
diff --git a/WebContent/html/imgs/my-icons-collection-128px/png/13.png b/WebContent/html/imgs/my-icons-collection-128px/png/13.png
diff --git a/WebContent/html/imgs/my-icons-collection-128px/png/14.png b/WebContent/html/imgs/my-icons-collection-128px/png/14.png
diff --git a/WebContent/html/imgs/my-icons-collection-128px/png/15.png b/WebContent/html/imgs/my-icons-collection-128px/png/15.png
diff --git a/WebContent/html/imgs/my-icons-collection-128px/png/2.png b/WebContent/html/imgs/my-icons-collection-128px/png/2.png
diff --git a/WebContent/html/imgs/my-icons-collection-128px/png/3.png b/WebContent/html/imgs/my-icons-collection-128px/png/3.png
diff --git a/WebContent/html/imgs/my-icons-collection-128px/png/4.png b/WebContent/html/imgs/my-icons-collection-128px/png/4.png
diff --git a/WebContent/html/imgs/my-icons-collection-128px/png/5.png b/WebContent/html/imgs/my-icons-collection-128px/png/5.png
diff --git a/WebContent/html/imgs/my-icons-collection-128px/png/6.png b/WebContent/html/imgs/my-icons-collection-128px/png/6.png
diff --git a/WebContent/html/imgs/my-icons-collection-128px/png/7.png b/WebContent/html/imgs/my-icons-collection-128px/png/7.png
diff --git a/WebContent/html/imgs/my-icons-collection-128px/png/8.png b/WebContent/html/imgs/my-icons-collection-128px/png/8.png
diff --git a/WebContent/html/imgs/my-icons-collection-128px/png/9.png b/WebContent/html/imgs/my-icons-collection-128px/png/9.png
diff --git a/WebContent/html/imgs/my-icons-collection-32px/license/license.pdf b/WebContent/html/imgs/my-icons-collection-32px/license/license.pdf
diff --git a/WebContent/html/imgs/my-icons-collection-32px/png/1.png b/WebContent/html/imgs/my-icons-collection-32px/png/1.png
diff --git a/WebContent/html/imgs/my-icons-collection-32px/png/10.png b/WebContent/html/imgs/my-icons-collection-32px/png/10.png
diff --git a/WebContent/html/imgs/my-icons-collection-32px/png/11.png b/WebContent/html/imgs/my-icons-collection-32px/png/11.png
diff --git a/WebContent/html/imgs/my-icons-collection-32px/png/12.png b/WebContent/html/imgs/my-icons-collection-32px/png/12.png
diff --git a/WebContent/html/imgs/my-icons-collection-32px/png/13.png b/WebContent/html/imgs/my-icons-collection-32px/png/13.png
diff --git a/WebContent/html/imgs/my-icons-collection-32px/png/14.png b/WebContent/html/imgs/my-icons-collection-32px/png/14.png
diff --git a/WebContent/html/imgs/my-icons-collection-32px/png/15.png b/WebContent/html/imgs/my-icons-collection-32px/png/15.png
diff --git a/WebContent/html/imgs/my-icons-collection-32px/png/2.png b/WebContent/html/imgs/my-icons-collection-32px/png/2.png
diff --git a/WebContent/html/imgs/my-icons-collection-32px/png/3.png b/WebContent/html/imgs/my-icons-collection-32px/png/3.png
diff --git a/WebContent/html/imgs/my-icons-collection-32px/png/4.png b/WebContent/html/imgs/my-icons-collection-32px/png/4.png
diff --git a/WebContent/html/imgs/my-icons-collection-32px/png/5.png b/WebContent/html/imgs/my-icons-collection-32px/png/5.png
diff --git a/WebContent/html/imgs/my-icons-collection-32px/png/6.png b/WebContent/html/imgs/my-icons-collection-32px/png/6.png
diff --git a/WebContent/html/imgs/my-icons-collection-32px/png/7.png b/WebContent/html/imgs/my-icons-collection-32px/png/7.png
diff --git a/WebContent/html/imgs/my-icons-collection-32px/png/8.png b/WebContent/html/imgs/my-icons-collection-32px/png/8.png
diff --git a/WebContent/html/imgs/my-icons-collection-32px/png/9.png b/WebContent/html/imgs/my-icons-collection-32px/png/9.png
diff --git a/WebContent/html/javascript/iconselect.js-1.0/__MACOSX/._readme.txt b/WebContent/html/javascript/iconselect.js-1.0/__MACOSX/._readme.txt
diff --git a/WebContent/html/javascript/iconselect.js-1.0/__MACOSX/css/._.DS_Store b/WebContent/html/javascript/iconselect.js-1.0/__MACOSX/css/._.DS_Store
diff --git a/WebContent/html/javascript/iconselect.js-1.0/__MACOSX/css/lib/._.DS_Store b/WebContent/html/javascript/iconselect.js-1.0/__MACOSX/css/lib/._.DS_Store
diff --git a/WebContent/html/javascript/iconselect.js-1.0/__MACOSX/images/._.DS_Store b/WebContent/html/javascript/iconselect.js-1.0/__MACOSX/images/._.DS_Store
diff --git a/WebContent/html/javascript/iconselect.js-1.0/__MACOSX/images/control/._.DS_Store b/WebContent/html/javascript/iconselect.js-1.0/__MACOSX/images/control/._.DS_Store
diff --git a/WebContent/html/javascript/iconselect.js-1.0/__MACOSX/images/control/icon-select/._.DS_Store b/WebContent/html/javascript/iconselect.js-1.0/__MACOSX/images/control/icon-select/._.DS_Store
diff --git a/...ml/javascript/iconselect.js-1.0/__MACOSX/images/control/icon-select/._arrow.png b/...ml/javascript/iconselect.js-1.0/__MACOSX/images/control/icon-select/._arrow.png
diff --git a/WebContent/html/javascript/iconselect.js-1.0/__MACOSX/images/icons/._.DS_Store b/WebContent/html/javascript/iconselect.js-1.0/__MACOSX/images/icons/._.DS_Store
diff --git a/WebContent/html/javascript/iconselect.js-1.0/__MACOSX/images/icons/._1.png b/WebContent/html/javascript/iconselect.js-1.0/__MACOSX/images/icons/._1.png
diff --git a/WebContent/html/javascript/iconselect.js-1.0/__MACOSX/images/icons/._10.png b/WebContent/html/javascript/iconselect.js-1.0/__MACOSX/images/icons/._10.png
diff --git a/WebContent/html/javascript/iconselect.js-1.0/__MACOSX/images/icons/._11.png b/WebContent/html/javascript/iconselect.js-1.0/__MACOSX/images/icons/._11.png
diff --git a/WebContent/html/javascript/iconselect.js-1.0/__MACOSX/images/icons/._12.png b/WebContent/html/javascript/iconselect.js-1.0/__MACOSX/images/icons/._12.png
diff --git a/WebContent/html/javascript/iconselect.js-1.0/__MACOSX/images/icons/._13.png b/WebContent/html/javascript/iconselect.js-1.0/__MACOSX/images/icons/._13.png
diff --git a/WebContent/html/javascript/iconselect.js-1.0/__MACOSX/images/icons/._14.png b/WebContent/html/javascript/iconselect.js-1.0/__MACOSX/images/icons/._14.png
diff --git a/WebContent/html/javascript/iconselect.js-1.0/__MACOSX/images/icons/._2.png b/WebContent/html/javascript/iconselect.js-1.0/__MACOSX/images/icons/._2.png
diff --git a/WebContent/html/javascript/iconselect.js-1.0/__MACOSX/images/icons/._3.png b/WebContent/html/javascript/iconselect.js-1.0/__MACOSX/images/icons/._3.png
diff --git a/WebContent/html/javascript/iconselect.js-1.0/__MACOSX/images/icons/._4.png b/WebContent/html/javascript/iconselect.js-1.0/__MACOSX/images/icons/._4.png
diff --git a/WebContent/html/javascript/iconselect.js-1.0/__MACOSX/images/icons/._5.png b/WebContent/html/javascript/iconselect.js-1.0/__MACOSX/images/icons/._5.png
diff --git a/WebContent/html/javascript/iconselect.js-1.0/__MACOSX/images/icons/._6.png b/WebContent/html/javascript/iconselect.js-1.0/__MACOSX/images/icons/._6.png
diff --git a/WebContent/html/javascript/iconselect.js-1.0/__MACOSX/images/icons/._7.png b/WebContent/html/javascript/iconselect.js-1.0/__MACOSX/images/icons/._7.png
diff --git a/WebContent/html/javascript/iconselect.js-1.0/__MACOSX/images/icons/._8.png b/WebContent/html/javascript/iconselect.js-1.0/__MACOSX/images/icons/._8.png
diff --git a/WebContent/html/javascript/iconselect.js-1.0/__MACOSX/images/icons/._9.png b/WebContent/html/javascript/iconselect.js-1.0/__MACOSX/images/icons/._9.png
diff --git a/WebContent/html/javascript/iconselect.js-1.0/__MACOSX/lib/._.DS_Store b/WebContent/html/javascript/iconselect.js-1.0/__MACOSX/lib/._.DS_Store
diff --git a/WebContent/html/javascript/iconselect.js-1.0/__MACOSX/lib/._iscroll.js b/WebContent/html/javascript/iconselect.js-1.0/__MACOSX/lib/._iscroll.js
diff --git a/WebContent/html/javascript/iconselect.js-1.0/__MACOSX/lib/control/._.DS_Store b/WebContent/html/javascript/iconselect.js-1.0/__MACOSX/lib/control/._.DS_Store
diff --git a/WebContent/html/javascript/iconselect.js-1.0/css/.DS_Store b/WebContent/html/javascript/iconselect.js-1.0/css/.DS_Store
diff --git a/WebContent/html/javascript/iconselect.js-1.0/css/lib/.DS_Store b/WebContent/html/javascript/iconselect.js-1.0/css/lib/.DS_Store
diff --git a/WebContent/html/javascript/iconselect.js-1.0/css/lib/control/iconselect.css b/WebContent/html/javascript/iconselect.js-1.0/css/lib/control/iconselect.css
@@ -0,0 +1,129 @@
+/*
+To change this license header, choose License Headers in Project Properties.
+To change this template file, choose Tools | Templates
+and open the template in the editor.
+*/
+/* 
+    Created on : Nov 28, 2013, 7:09:35 AM
+    Author     : bugraozden
+*/
+
+.icon-select{
+    width:0px;
+ }
+
+ .icon-select .selected-box {
+
+     position: relative;
+     margin: 0px;
+     padding: 0px;
+     width: 70px; /* sil */
+     height: 60px; /* sil */
+     border: 1px solid #999999;
+	 /*background-color: #FFFFFF;*/
+
+     -webkit-border-radius: 3px;
+     -moz-border-radius: 3px;
+     border-radius: 3px;
+
+ }
+
+ .icon-select .selected-box:hover {
+
+     position: relative;
+     margin: 0px;
+     padding: 0px;
+     width: 70px; /* sil */
+     height: 60px; /* sil */
+     border: 1px solid #000000;
+     background-color: #FFFFFF;
+
+     -webkit-border-radius: 3px;
+     -moz-border-radius: 3px;
+     border-radius: 3px;
+
+ }
+
+ .icon-select .selected-icon {
+
+     position: absolute;
+     margin: 0px;
+     padding: 0px;
+     top:5px;
+     left:5px;
+     width: 48px; /* sil */
+     height: 48px; /* sil */
+
+     -webkit-border-radius: 3px;
+     -moz-border-radius: 3px;
+     border-radius: 3px;
+
+ }
+
+ .icon-select .component-icon{
+     position: absolute;
+     bottom:5px;
+     right:4px;
+ }
+
+ .icon-select .box {
+
+     position: absolute;
+     top:0px;
+     left:71px;
+     margin: 0px;
+     padding: 0px;
+     width: 170px; /* sil */
+     height: 170px; /* sil */
+     border: 1px solid #EEEEEE;
+     background-color: #EEEEEE;
+
+     -webkit-border-radius: 3px;
+     -moz-border-radius: 3px;
+     border-radius: 3px;
+
+
+     overflow:auto;
+     /*
+     -webkit-overflow-scrolling: touch;
+     */
+
+ }
+
+ .icon-select .icon {
+     position: relative;
+     margin: 5px 0px 0px 5px;
+     padding: 0px;
+     width: 48px; /* sil */
+     height: 48px; /* sil */
+     border: 1px solid #CCCCCC;
+     background-color: #FFFFFF;
+
+     -webkit-border-radius: 3px;
+     -moz-border-radius: 3px;
+     border-radius: 3px;
+
+     overflow:hidden;
+     float: left;
+ }
+
+ .icon-select .icon:hover {
+     border: 1px solid #000000;
+ }
+
+ .icon-select .icon.selected {
+     position: relative;
+     margin: 5px 0px 0px 5px;
+     padding: 0px;
+     width: 48px; /* sil */
+     height: 48px; /* sil */
+     border: 1px solid #EEEEEE;
+     background-color: #EEEEEE;
+
+     -webkit-border-radius: 3px;
+     -moz-border-radius: 3px;
+     border-radius: 3px;
+
+     overflow:hidden;
+     float: left;
+ }
diff --git a/WebContent/html/javascript/iconselect.js-1.0/icon-select-example.html b/WebContent/html/javascript/iconselect.js-1.0/icon-select-example.html
@@ -0,0 +1,60 @@
+<html>
+    <head>
+        <meta charset="UTF-8">
+        <title>Icon/Image Select: Basic Example (Javascript)</title>
+
+        <link rel="stylesheet" type="text/css" href="css/lib/control/iconselect.css" >
+        <script type="text/javascript" src="lib/control/iconselect.js"></script>
+
+        <script type="text/javascript" src="lib/iscroll.js"></script>
+
+        <script>
+
+        var iconSelect;
+        var selectedText;
+
+        window.onload = function(){
+
+            selectedText = document.getElementById('selected-text');
+
+            document.getElementById('my-icon-select').addEventListener('changed', function(e){
+               selectedText.value = iconSelect.getSelectedValue();
+            });
+
+            iconSelect = new IconSelect("my-icon-select");
+
+            var icons = [];
+            icons.push({'iconFilePath':'images/icons/1.png', 'iconValue':'1'});
+            icons.push({'iconFilePath':'images/icons/2.png', 'iconValue':'2'});
+            icons.push({'iconFilePath':'images/icons/3.png', 'iconValue':'3'});
+            icons.push({'iconFilePath':'images/icons/4.png', 'iconValue':'4'});
+            icons.push({'iconFilePath':'images/icons/5.png', 'iconValue':'5'});
+            icons.push({'iconFilePath':'images/icons/6.png', 'iconValue':'6'});
+            icons.push({'iconFilePath':'images/icons/7.png', 'iconValue':'7'});
+            icons.push({'iconFilePath':'images/icons/8.png', 'iconValue':'8'});
+            icons.push({'iconFilePath':'images/icons/9.png', 'iconValue':'9'});
+            icons.push({'iconFilePath':'images/icons/10.png', 'iconValue':'10'});
+            icons.push({'iconFilePath':'images/icons/11.png', 'iconValue':'11'});
+            icons.push({'iconFilePath':'images/icons/12.png', 'iconValue':'12'});
+            icons.push({'iconFilePath':'images/icons/13.png', 'iconValue':'13'});
+            icons.push({'iconFilePath':'images/icons/14.png', 'iconValue':'14'});
+
+            iconSelect.refresh(icons);
+
+
+
+        };
+
+        </script>
+
+    </head>
+    <body>
+
+        <h2>Icon/Image Select: Basic Example (Javascript)</h2>
+
+        <div id="my-icon-select"></div>
+
+        <input type="text" id="selected-text" name="selected-text" style="width:65px;">
+
+    </body>
+</html>
diff --git a/WebContent/html/javascript/iconselect.js-1.0/icon-select-example2.html b/WebContent/html/javascript/iconselect.js-1.0/icon-select-example2.html
@@ -0,0 +1,57 @@
+<html>
+    <head>
+        <meta charset="UTF-8">
+        <title>Icon/Image Select: Nano Example (Javascript)</title>
+
+        <link rel="stylesheet" type="text/css" href="css/lib/control/iconselect.css" >
+        <script type="text/javascript" src="lib/control/iconselect.js"></script>
+
+        <script type="text/javascript" src="lib/iscroll.js"></script>
+
+        <script>
+
+        var iconSelect;
+
+        window.onload = function(){
+
+            iconSelect = new IconSelect("my-icon-select", 
+                {'selectedIconWidth':48,
+                'selectedIconHeight':48,
+                'selectedBoxPadding':1,
+                'iconsWidth':23,
+                'iconsHeight':23,
+                'boxIconSpace':1,
+                'vectoralIconNumber':4,
+                'horizontalIconNumber':4});
+
+            var icons = [];
+            icons.push({'iconFilePath':'images/icons/1.png', 'iconValue':'1'});
+            icons.push({'iconFilePath':'images/icons/2.png', 'iconValue':'2'});
+            icons.push({'iconFilePath':'images/icons/3.png', 'iconValue':'3'});
+            icons.push({'iconFilePath':'images/icons/4.png', 'iconValue':'4'});
+            icons.push({'iconFilePath':'images/icons/5.png', 'iconValue':'5'});
+            icons.push({'iconFilePath':'images/icons/6.png', 'iconValue':'6'});
+            icons.push({'iconFilePath':'images/icons/7.png', 'iconValue':'7'});
+            icons.push({'iconFilePath':'images/icons/8.png', 'iconValue':'8'});
+            icons.push({'iconFilePath':'images/icons/9.png', 'iconValue':'9'});
+            icons.push({'iconFilePath':'images/icons/10.png', 'iconValue':'10'});
+            icons.push({'iconFilePath':'images/icons/11.png', 'iconValue':'11'});
+            icons.push({'iconFilePath':'images/icons/12.png', 'iconValue':'12'});
+            icons.push({'iconFilePath':'images/icons/13.png', 'iconValue':'13'});
+            icons.push({'iconFilePath':'images/icons/14.png', 'iconValue':'14'});
+
+            iconSelect.refresh(icons);
+
+        };
+
+        </script>
+
+    </head>
+    <body>
+
+        <h2>Icon/Image Select: Nano Example (Javascript)</h2>
+
+        <div id="my-icon-select"></div>
+
+    </body>
+</html>
diff --git a/WebContent/html/javascript/iconselect.js-1.0/icon-select-example3.html b/WebContent/html/javascript/iconselect.js-1.0/icon-select-example3.html
@@ -0,0 +1,57 @@
+<html>
+    <head>
+        <meta charset="UTF-8">
+        <title>Icon/Image Select: Vectoral Example (Javascript)</title>
+
+        <link rel="stylesheet" type="text/css" href="css/lib/control/iconselect.css" >
+        <script type="text/javascript" src="lib/control/iconselect.js"></script>
+
+        <script type="text/javascript" src="lib/iscroll.js"></script>
+
+        <script>
+
+        var iconSelect;
+
+        window.onload = function(){
+
+            iconSelect = new IconSelect("my-icon-select", 
+                {'selectedIconWidth':23,
+                'selectedIconHeight':23,
+                'selectedBoxPadding':1,
+                'iconsWidth':48,
+                'iconsHeight':48,
+                'boxIconSpace':1,
+                'vectoralIconNumber':2,
+                'horizontalIconNumber':6});
+
+            var icons = [];
+            icons.push({'iconFilePath':'images/icons/1.png', 'iconValue':'1'});
+            icons.push({'iconFilePath':'images/icons/2.png', 'iconValue':'2'});
+            icons.push({'iconFilePath':'images/icons/3.png', 'iconValue':'3'});
+            icons.push({'iconFilePath':'images/icons/4.png', 'iconValue':'4'});
+            icons.push({'iconFilePath':'images/icons/5.png', 'iconValue':'5'});
+            icons.push({'iconFilePath':'images/icons/6.png', 'iconValue':'6'});
+            icons.push({'iconFilePath':'images/icons/7.png', 'iconValue':'7'});
+            icons.push({'iconFilePath':'images/icons/8.png', 'iconValue':'8'});
+            icons.push({'iconFilePath':'images/icons/9.png', 'iconValue':'9'});
+            icons.push({'iconFilePath':'images/icons/10.png', 'iconValue':'10'});
+            icons.push({'iconFilePath':'images/icons/11.png', 'iconValue':'11'});
+            icons.push({'iconFilePath':'images/icons/12.png', 'iconValue':'12'});
+            icons.push({'iconFilePath':'images/icons/13.png', 'iconValue':'13'});
+            icons.push({'iconFilePath':'images/icons/14.png', 'iconValue':'14'});
+
+            iconSelect.refresh(icons);
+
+        };
+
+        </script>
+
+    </head>
+    <body>
+
+        <h2>Icon/Image Select: Vectoral Example (Javascript)</h2>
+
+        <div id="my-icon-select"></div>
+
+    </body>
+</html>