Skip to content

Commit

Permalink
Merge pull request iquidus#48 from BitterLox/master
Browse files Browse the repository at this point in the history
Added support for facebook and Google+ ; Fixed layout in movement and network page
  • Loading branch information
iquidus authored Jul 20, 2016
2 parents ef7342e + 9324643 commit e19733b
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 4 deletions.
6 changes: 5 additions & 1 deletion settings.json.template
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@
"markets": true,
"richlist": true,
"twitter": true,
"facebook": false,
"googleplus": false,
"search": true,
"movement": true,
"network": true
Expand Down Expand Up @@ -112,8 +114,10 @@
"high_flag": 5000
},

// twitter
// twitter, facebook, googleplus
"twitter": "iquidus",
"facebook": "yourfacebookpage",
"googleplus": "yourgooglepluspage",

//genesis
"genesis_tx": "65f705d2f385dc85763a317b3ec000063003d6b039546af5d8195a5ec27ae410",
Expand Down
12 changes: 11 additions & 1 deletion views/layout.jade
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,18 @@ html
if settings.display.twitter
ul.nav.navbar-nav
li.pull-left
a#twitter-icon(href="https://twitter.com/#{settings.twitter}", target='_blank')
a#twitter-icon(href="https://twitter.com/#{settings.twitter}", target='_blank')
span.glyphicon.fa.fa-twitter
if settings.display.facebook
ul.nav.navbar-nav
li.pull-left
a#facebook-icon(href="https://www.facebook.com/#{settings.facebook}", target='_blank')
span.glyphicon.fa.fa-facebook
if settings.display.googleplus
ul.nav.navbar-nav
li.pull-left
a#googleplus-icon(href="https://plus.google.com/#{settings.googleplus}", target='_blank')
span.glyphicon.fa.fa-google-plus
.col-md-4
ul.nav
li.text-center(style='margin-left:80px;margin-right:80px;')
Expand Down
2 changes: 1 addition & 1 deletion views/movement.jade
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ block content
rtable.api().ajax.reload(null, false);
}, 45000 );
});
.col-xs-12.col-md-10.col-md-offset-1
.col-xs-12.col-md-10.col-md-offset-1(style="margin-bottom: 5%")
table#alerts-table.table.table-striped.table-bordered
thead
th timestamp
Expand Down
2 changes: 1 addition & 1 deletion views/network.jade
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ block content
]
});
});
.col-md-12
.col-md-12(style="margin-bottom: 4%")
.row.text-center(style='margin-bottom:15px;')
i #{settings.locale.net_warning}
.panel.panel-default
Expand Down

0 comments on commit e19733b

Please sign in to comment.