Merge branch 'develop' into Eole_Graph

Conflicts:
	client/index.html
	client/js/controllers/home/home.js
	client/partials/home/home.html

1 files changed, 31 insertions, 0 deletions

diff --git a/client/partials/image/upload.html b/client/partials/image/upload.html
new file mode 100644
index 0000000..01c54b2
--- /dev/null
+++ b/client/partials/image/upload.html
@@ -0,0 +1,31 @@
+<div class="modal fade" id="uploadImageModal" ng-controller="uploadImageCtrl">
+    <div class="modal-dialog">
+        <div class="modal-content"></div>
+    </div>
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <!--<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>-->
+                 <h4 class="modal-title">Upload Image</h4>
+
+            </div>
+			
+            <div class="modal-body">
+
+                <form action="../server/index.php" method="post">
+                    <input type="hidden" name="task" value="image" />
+                    <input type="hidden" name="token" value="{{ token }}" />
+                    <input type="hidden" name="action" value="uploadImage" />
+                    <input type="hidden" name="id" value="2564" />
+                    <input name="file" type="file" />
+                    <input type="submit" value="Upload" />
+                </form>
+				
+				<div class="modal-footer"> 
+                <!--<a href="#" data-dismiss="modal" class="btn btn-default">Close</a>-->
+                
+                <a class="btn btn-lg btn-primary btn-block" id="loginButton" ng-click="doUpload()">Upload</a>
+            </div>
+        </div>
+    </div>
+</div>