fix conflicts

app/views/includes/foot.jade

@@ -1,7 +1,5 @@
 #footer(data-ng-include="'/views/footer.html'", role='navigation')
 
-//script(type='text/javascript', src='/lib/jquery/jquery.min.js')
-//script(type='text/javascript', src='/lib/bootstrap/dist/js/bootstrap.min.js')
 script(type='text/javascript', src='/socket.io/socket.io.js')
 script(type='text/javascript', src='/lib/momentjs/moment.js')
 script(type='text/javascript', src='/lib/qrcode-generator/js/qrcode.js')

config/express.js

@@ -49,12 +49,14 @@ module.exports = function(app, historicSync) {
     //dynamic helpers
     app.use(helpers(config.app.name));
 
+    // IMPORTAMT: for html5mode, this line must to be before app.router
+    app.use(express.static(config.root + '/public'));
+
     //routes should be at the last
     app.use(app.router);
 
     //Setting the fav icon and static folder
     app.use(express.favicon());
-    app.use(express.static(config.root + '/public'));
 
     //Assume "not found" in the error msgs is a 404. this is somewhat silly, but valid, you can do whatever you like, set properties, use instanceof etc.
     app.use(function(err, req, res, next) {

config/routes.js

@@ -2,20 +2,6 @@
 
 module.exports = function(app, historicSync) {
 
-  //Home route
-  var index = require('../app/controllers/index');
-
-  app.get('/', index.render);
-  app.get('/blocks', index.render);
-  app.get('/status', index.render);
-  app.get('/blocks-date/*', index.render);
-  app.get('/block-index/*', index.render);
-  app.get('/block/*', index.render);
-  app.get('/tx/*', index.render);
-  app.get('/address/*', index.render);
-
-  app.get('/api/version', index.version);
-
   //Block routes
   var blocks = require('../app/controllers/blocks');
   app.get('/api/blocks', blocks.list);
@@ -44,4 +30,8 @@ module.exports = function(app, historicSync) {
 
   app.get('/api/sync', st.sync);
 
+  //Home route
+  var index = require('../app/controllers/index');
+  app.get('/api/version', index.version);
+  app.get('*', index.render);
 };

public/css/common.css

@@ -208,8 +208,8 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
 
 .icon-block {
   color: #FFFFFF;
-  font-size: 27px;
-  margin-top:  20px;
+  font-size: 35px;
+  margin-top:  10px;
 }
 
 .block-tx {
@@ -403,3 +403,8 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
 
 .connection-status { margin-top: 60px; }
 .page-header { margin-top: 0; }
+
+.block_hash {
+  margin-left: 46px;
+  text-align: center;
+}

public/js/directives.js

@@ -50,7 +50,6 @@ angular.module('insight')
 
           scope.$on('$destroy', function() {
             client.off('mousedown', onMousedown);
-            client.unglue(elm);
           });
         });
       }

public/views/block.html

@@ -7,14 +7,14 @@
         </div>
         <h1 data-ng-if="block">Block #{{ block.height }}</h1>
       </div>
-      <div class="m50v" data-ng-show="!tx.isCoinBase">
+      <div class="m10v">
+        <button class="pull-right btn-copy" clip-copy="block.hash"><span class="glyphicon glyphicon-paperclip"></span></button>
+        <a class="ellipsis block_hash" href="/address/{{block.hash}}">{{block.hash}}</a>
+      </div>
+      <div class="m20v" data-ng-show="!tx.isCoinBase">
         <h4>Hashes</h4>
         <table class="table" style="table-layout: fixed">
           <tbody>
-          <tr>
-            <td class="small"> Hash </td>
-            <td><a class="address ellipsis" href="/block/{{block.hash}}">{{block.hash}}</a></td>
-          </tr>
           <tr>
             <td class="small"> Previous Block</td>
             <td><a class="address ellipsis" href="/block/{{block.previousblockhash}}">{{block.previousblockhash}}</a></td>