From: Testelocker Server Date: Thu, 22 Jun 2017 14:55:06 +0530 Subject: Merge branch 'develop' --- Merge branch 'develop' Conflicts: xml/hashKey.xml xml/hashhkey.xml --- --- 'a/.gitignore' +++ b/.gitignore @@ -69,4 +69,7 @@ user_guide_src/cilexer/pycilexer.egg-inf .DS_Store config.php -xml/* \ No newline at end of file +xml/* +/xml/* +xml/hashKey.xml +xml/hashhkey.xml --- 'a/css/styles.css' +++ b/css/styles.css @@ -5303,6 +5303,7 @@ h3.widget-title.side-nav {margin-top: 20 .no-padding { padding: 0 !important; } + /** #loading { content: ''; display: block; @@ -5311,8 +5312,26 @@ h3.widget-title.side-nav {margin-top: 20 bottom: 0; right: 0; position:absolute; - width: 100%; height: 100%; background: url('loading.gif') no-repeat center center; + width: 100%; height: 100%; + background: url('loading.gif') no-repeat center center; margin:0 auto; z-index:10000000; /**opacity: 0.4; **/ +} +**/ +/* Paste this css to your style sheet file or under head tag */ +/* This only works with JavaScript, +if it's not present, don't show loader */ +.no-js #loader { display: none; } +.js #loader { display: block; position: absolute; left: 100px; top: 0; } +.se-pre-con { + display: none; + position: fixed; + left: 0px; + top: 0px; + width: 100%; + height: 100%; + z-index: 9999; + opacity: 0.2; + background: url(loading.gif) center no-repeat transparent; } \ No newline at end of file --- 'a/doc.php' +++ b/doc.php @@ -96,9 +96,8 @@ curl_close($vhi); $issuedNew = explode('¿', $resissued); $dataI = json_decode($issuedNew[1], TRUE); ?> - +
-
@@ -110,7 +109,6 @@ $dataI = json_decode($issuedNew[1], TRUE
  • Issued Document
  • -
    @@ -127,8 +125,7 @@ $dataI = json_decode($issuedNew[1], TRUE
    - -
    + "; ?> - @@ -232,6 +228,7 @@ $dataI = json_decode($issuedNew[1], TRUE
    + \ No newline at end of file --- 'a/footer.php' +++ b/footer.php @@ -31,11 +31,9 @@
    - - \ No newline at end of file --- 'a/header.php' +++ b/header.php @@ -223,6 +223,7 @@
    + \ No newline at end of file --- 'a/uri.php' +++ b/uri.php @@ -5,7 +5,6 @@ $headers = array( 'Authorization: Bearer ' . $_POST['access_token'] //'Authorization: Basic '. base64_encode("$username:$password") ); -//$urlUri = 'https://developers.digitallocker.gov.in/public/oauth2/1/files/' . $id; $urlUri = $config['download_uri'] . $id; $uri = curl_init($urlUri); --- 'a/xml/hashKey.xml' +++ b/xml/hashKey.xml @@ -1,5 +1,10 @@ +<<<<<<< HEAD 1770bcbfdc625d53c2f1d6dffe74776d0d6531a7 +======= + + b22b8855d8181f04d13e365e931555c903af71e5 +>>>>>>> develop --- 'a/xml/hashhkey.xml' +++ b/xml/hashhkey.xml @@ -1,5 +1,10 @@ +<<<<<<< HEAD 019eecc37ea5b7bce1343eb34db4c76a9e48a63a +======= + + 72ffd3b88365481579eadbb19518935d7a43ef09 +>>>>>>> develop