From: indresh singh bhadoria <indreshbhadouriya@gmail.com>
Date: Wed, 28 Jun 2017 10:01:46 +0530
Subject: Merge branch 'feature/apidemoapp' into develop
---
Merge branch 'feature/apidemoapp' into develop
---


Binary files 'a/css/loading.gif' and b/css/loading.gif differ

--- 'a/css/styles.css'
+++ b/css/styles.css
@@ -782,14 +782,14 @@ select:not([multiple]) {
     color: #FFFFFF;
     /* border-color: #000000;*/ }
 .btn.btn-blue-b {
-    border: 2px solid #f15d35;
-    background: #f15d35;
+    border: 2px solid blueviolet;
+    background: blueviolet;
     font-family: "Karla", arial, sans-serif;
     font-weight: normal;
     color: #FFFFFF; }
 .btn.btn-blue-b:hover {
-    border: 2px solid #f15d35;
-    background: #FFFFFF;
+    border: 2px solid cornflowerblue;
+    background: cornflowerblue;
     color: #000000; }
 
 .rev-btn {
@@ -4577,7 +4577,7 @@ table.compare tr td .add_to_cart_button
 }
 
 .box:hover {
-    border:1px solid #f15d35;
+    border:1px solid blueviolet !important;
     background: #fefefe;
 }
 
@@ -5319,4 +5319,13 @@ if it's not present, don't show loader *
 	z-index: 9999;
 	opacity: 0.4;
 	background: url(loading.gif) center no-repeat transparent;
+}
+.btn-default:hover{
+	border:1px solid blueviolet;
+}
+.navbar-nav >
+ li  > a:hover
+ {
+	background-color: green;
+	color: #000;
 }
\ No newline at end of file

--- 'a/doc.php'
+++ b/doc.php
@@ -125,7 +125,7 @@ include 'header.php';
                                 <section class="content">
                                     <div class="row">
                                         <div class="col-md-12">
-                                            <div class="box box-body col-sm-12" >
+                                            <div class="box box-body" style="min-height: 385px;">
                                                 <div class="table-responsive">
                                                     <table class="table">
                                                         <thead style="color:blueviolet;">
@@ -136,8 +136,8 @@ include 'header.php';
                                                                 <td id="tdUri" style="display:none;">URI</td>
                                                             </tr>
                                                         <div>
-                                                            <b onclick="uriData(null, null)" class="fa fa-home fa-2x" style="color:blueviolet; cursor:pointer; cursor:hand"></b>
-                                                            <b id="parent" style="color:blueviolet; cursor:pointer; cursor:hand"></b>
+                                                            <span onclick="uriData(null, null)" class="fa fa-home fa-2x" style="color:blueviolet; cursor:pointer; cursor:hand"></span>
+                                                            <span id="parent" style="color:blueviolet; font-size: 16px; cursor:pointer; cursor:hand"></span>
                                                         </div>
                                                         </thead>
                                                         <tbody  id="folderPath">
@@ -156,22 +156,24 @@ include 'header.php';
                                                                         echo '<td onclick="uriData(' . $api_detail['id'] . ',' . $api_detail['parent'] . ')">';
                                                                         echo '<img src="images/folder.svg"></img>';
                                                                         echo($api_detail['name']);
+                                                                        echo "</td>";
                                                                     }
                                                                     if ($api_detail['type'] == "file") {
-                                                                        echo "<td onclick='thisIsNotAFolder()'>";
+                                                                        echo "<td>";
                                                                         echo '<img src="images/file.svg"></img>';
                                                                         echo($api_detail['name']);
+                                                                        echo "</td>";
                                                                     }
-                                                                    echo "</td>";
                                                                     ?>
                                                                     <td><?php echo($api_detail['size']); ?></td>
                                                                     <td><?php echo($api_detail['date']); ?></td>
                                                                     <?php if ($api_detail['type'] == "file") { ?>
                                                                         <td>
-                                                                            <button onclick="download('<?php echo($api_detail['uri'] . ',' . $api_detail['name']); ?>')"><i  class="fa fa-download"> </i></button>
-
+                                                                            <i onclick="download('<?php echo($api_detail['uri'] . ',' . $api_detail['name']); ?>')" class="fa fa-download"> </i>
                                                                         </td>
-                                                                    <?php }
+                                                                    <?php }else{
+                                                                        echo "<td></td>";
+                                                                    }
                                                                     ?>
                                                                 </tr>
                                                             <?php }
@@ -192,9 +194,8 @@ include 'header.php';
                                 <section class="content">
                                     <div class="row">
                                         <div class="col-md-12">
-                                            <div class="box box-body col-sm-12">
-                                                <div class="table-responsive">
-                                                    <table class="table">
+                                            <div class="box box-body" style="min-height: 385px;">
+                                                    <table class="table table-responsive">
                                                         <thead style="color:#1569C7">
                                                             <tr>
                                                                 <td>Name</td>
@@ -215,7 +216,7 @@ include 'header.php';
                                                                 <td><?php echo($issued_detail['date']); ?></td>
                                                                 <td><?php if ($api_detail['type'] == "file") { ?>
                                                                     <td>
-                                                                        <button onclick="download('<?php echo($issued_detail['uri'] . ',' . $issued_detail['name']); ?>')"><i  class="fa fa-download"> </i></button>
+                                                                        <i onclick="download('<?php echo($issued_detail['uri'] . ',' . $issued_detail['name']); ?>')" class="fa fa-download"> </i>
                                                                     </td>
                                                                 <?php } ?>
                                                             </tr>
@@ -227,7 +228,6 @@ include 'header.php';
                                                         <a class="btn btn-default" style="float: right; margin-left: 10px; border-radius:5px;" href="payment.php">Complete Payment</a>
                                                         <a class="btn btn-default" style="float: right; border-radius:5px;" href="index.php">Cancel</a>
                                                     </div>
-                                                </div>
                                             </div>
                                         </div>                
                                     </div>
@@ -264,7 +264,7 @@ function uriData(id, parent) {
                 console.log(result.items);
                 fileOrFolder = '<img src="images/file.svg"></img>';
                 onclickFnc = "onclick='thisIsNotAFolder()'";
-                dwnldTd = "<td onclick = 'download(\"" + result.items[i].uri + "\",\"" + result.items[i].name + "\");';><button><i  class='fa fa-download'> </i></button></td>";
+                dwnldTd = "<td><i onclick = 'download(\"" + result.items[i].uri + "\",\"" + result.items[i].name + "\");'; class='fa fa-download'> </i></td>";
             } else {
                 fileOrFolder = '<img src="images/folder.svg"></img>';
                 onclickFnc = "onclick='uriData(" + result.items[i].id + "," + result.items[i].parent + ")'";
@@ -274,7 +274,7 @@ function uriData(id, parent) {
             <td>" + result.items[i].uri + "</td>" + dwnldTd + "</tr>";
             $("#folderPath").html(uriDataHtml);
         });
-        $("#parent").html("<b onclick=uriData(" + parent + ",null) >" + result.directory + "</b>");
+        $("#parent").html("<span onclick=uriData(" + parent + ",null) >" + result.directory + "</span>");
         $(".se-pre-con").hide();
     }, "json")
             .fail(function () {

--- 'a/header.php'
+++ b/header.php
@@ -67,7 +67,7 @@
                     <img src="images/digitalindialogo.png"></a>
             </div>
         </div>
-        <nav role="navigation" style="background-color: blueviolet; margin-bottom: 15px;height: 35px; position: relative;" >
+        <nav role="navigation" style="background-color: blueviolet; margin-bottom: 15px;height: 40px; position: relative;" >
             <div class="container" style="padding-left:0px !important;">
                 <!-- Brand and toggle get grouped for better mobile display -->
                 <!-- Collect the nav links, forms, and other content for toggling -->
@@ -135,7 +135,7 @@
                                                     <label class="control-label" for="inputSuccess">State</label>
                                                     <input type="text" class="form-control" name = "state"  value="123456">
                                                 </div>
-                                                <button type="submit" class="btn" >Download</button>
+                                                <button type="submit" class="btn">Download</button>
                                             </form>
                                         </span>
                                     </li><hr>

Binary files /dev/null and b/images/loading3.gif differ

--- 'a/payment.php'
+++ b/payment.php
@@ -41,7 +41,7 @@
                         </div>
                         <div class='form-row'>
                             <div class='col-md-12'>
-                                <div class='form-control total btn btn-info'>
+                                <div class='form-control total btn btn-default'>
                                     Ammount:
                                     <span class='amount'>Rs.10</span>
                                 </div>

--- 'a/uploaddoc.php'
+++ b/uploaddoc.php
@@ -122,11 +122,11 @@ include 'header.php';
                                 <section class="content">
                                     <div class="row">
                                         <div class="col-md-12">
-                                            <div class="box box-body col-sm-12" >
+                                            <div class="box box-body" style="min-height: 385px;" >
                                                 <div class="row" style="margin-top:7px;">
                                                     <div class="col-md-3">
-                                                        <b onclick="uriData(null, null)" class="fa fa-home fa-2x" style="color:blueviolet; cursor:pointer; cursor:hand;"></b>
-                                                        <b id="parent" style="color:blueviolet; cursor:pointer; cursor:hand;"></b>
+                                                        <span onclick="uriData(null, null)" class="fa fa-home fa-2x" style="color:blueviolet; cursor:pointer; cursor:hand;"></span>
+                                                        <span id="parent" style="color:blueviolet; font-size: 16px; cursor:pointer; cursor:hand;"></span>
                                                     </div>
                                                     <div class="col-md-9 pull-left">
                                                         <form action="browse.php" method="post" enctype="multipart/form-data" >
@@ -135,13 +135,14 @@ include 'header.php';
                                                             <input type="text" value="<?php echo $state; ?>" name="state" class="hidden"/>
                                                             <input type="text" name="filePath"  class="hidden"  value="" id="filePath"/>
                                                             <input type="file" class="inputfile" id="fileUpload" name="fileUpload"/>
-                                                            <label for="fileUpload">
+                                                            <label for="fileUpload"  style="border-radius:5px;">
                                                                 <i class="fa fa-upload"></i> 
                                                                 <span>Upload Here</span>
                                                             </label>  
                                                         </form>
                                                     </div>
                                                 </div>
+                                                <div class="table-responsive">
                                                 <table class="table">
                                                     <thead style="color:blueviolet;">
                                                         <tr>
@@ -169,7 +170,7 @@ include 'header.php';
                                                                     echo($api_detail['name']);
                                                                 }
                                                                 if ($api_detail['type'] == "file") {
-                                                                    echo "<td onclick='thisIsNotAFolder()'>";
+                                                                    echo "<td>";
                                                                     echo '<img src="images/file.svg"></img>';
                                                                     echo($api_detail['name']);
                                                                 }
@@ -178,9 +179,6 @@ include 'header.php';
                                                                 <td><?php echo($api_detail['size']); ?></td>
                                                                 <td><?php echo($api_detail['date']); ?></td>
                                                                 <?php if ($api_detail['type'] == "file") { ?>
-                                                                    <td>
-                                                                        <button onclick="download('<?php echo($api_detail['uri'] . ',' . $api_detail['name']); ?>')"><i  class="fa fa-download"> </i></button>
-                                                                    </td>
                                                                 <?php }
                                                                 ?>
                                                             </tr>
@@ -193,6 +191,7 @@ include 'header.php';
                                                     <a class="btn btn-default" style="float: right; border-radius:5px;" href="index.php">Cancel</a>
                                                 </div>
                                             </div>
+                                            </div>
                                         </div>                
                                     </div>
                                 </section>
@@ -223,54 +222,33 @@ function uriData(id, parent) {
     var uriDataHtml = "";
     var fileOrFolder = "";
     var onclickFnc = "";
-    var dwnldTd = "";
+    //var dwnldTd = "";
     var accessToken = "<?php echo $access_token; ?>";
     var urifnc = "<?php echo $config['uri_path']; ?>";
     $.post(urifnc, {access_token: accessTocken, id: id}, function (result) {
         $.each(result.items, function (i, l) {
-
             if (result.items[i].type == "file") {
                 console.log(result.items);
                 fileOrFolder = '<img src="images/file.svg"></img>';
                 onclickFnc = "onclick='thisIsNotAFolder()'";
-                dwnldTd = "<td onclick = 'download(\"" + result.items[i].uri + "\",\"" + result.items[i].name + "\");';><button><i  class='fa fa-download'> </i></button></td>";
+                //dwnldTd = "<td onclick = 'download(\"" + result.items[i].uri + "\",\"" + result.items[i].name + "\");';><button><i  class='fa fa-download'> </i></button></td>";
             } else {
                 fileOrFolder = '<img src="images/folder.svg"></img>';
                 onclickFnc = "onclick='uriData(" + result.items[i].id + "," + result.items[i].parent + ")'";
                 dwnldTd = "<td></td>";
             }
             uriDataHtml += "<tr><td " + onclickFnc + ">" + fileOrFolder + result.items[i].name + "</td><td>" + result.items[i].size + "</td><td>" + result.items[i].date + "</td>\n\
-<td>" + result.items[i].uri + "</td>" + dwnldTd + "</tr>";
+            <td>" + result.items[i].uri + "</td>" + dwnldTd + "</tr>";
             $("#folderPath").html(uriDataHtml);
         });
         $("#filePath").val(result.directory);
-        $("#parent").html("<b onclick=uriData(" + parent + ",null)>" + result.directory + "</b>");
+        $("#parent").html("<span onclick=uriData(" + parent + ",null)>" + result.directory + "</span>");
         $(".se-pre-con").hide();
     }, "json")
             .fail(function () {
                 $("#folderPath").html("Some error found");
             });
 }
-function download(uris, filename) {
-    $(".se-pre-con").show();
-    var getdata = uris.split(",");
-    var uri = getdata[0];
-    var filename = getdata[1];
-    var accessTocken = "<?php echo $access_token; ?>";
-    var dlscfnc = "<?php echo $config['dlsc_path']; ?>"
-    var arraydata = {uri: uri, accesstoken: accessTocken, filename: filename}
-    $.ajax({
-        url: dlscfnc + 'download.php',
-        type: 'POST',
-        data: arraydata
-    }).done(function (response)
-    {
-        $(".se-pre-con").hide();
-        var getdata = JSON.parse(response);
-        console.log(getdata[1]);
-        window.open("data:" + getdata[0] + ";base64," + getdata[1], '', 'height=650,width=840');
-    });
-}
 $(".se-pre-con").fadeOut("slow");
 </script>
 </html>
\ No newline at end of file