Merge pull request #7 from hunterlester/development

Implements design
This commit is contained in:
snogcel 2016-12-02 23:00:59 -07:00 committed by GitHub
commit ef8603e659
5 changed files with 249 additions and 133 deletions

89
css/master.css Normal file
View file

@ -0,0 +1,89 @@
body {
background-image: url("../images/background.png");
}
textarea {
background-color:#fafafa !important;
}
.createProposal {
}
i.fa {
font-size: 1.5em;
color: #999;
}
.header_title {
color: rgb(30, 115, 190);
font-weight: 600;
margin: 0;
}
.header_description {
margin: 1% 0% 5% 0%;
font-weight: 600;
}
.proposalBlock {
margin-top: 6%;
padding: 7%;
background-color: #ffffff;
box-shadow: 0px 17px 24px 0px rgba(0, 0, 0, 0.16);
}
.removeMargin {
margin: 0;
}
.validationError {
background-color:#ffe6e6;
}
.walletCommands {
}
#header {
margin-top:2em;
}
/*#createProposalHeader {
margin-top:1em;
}*/
#createProposalForm {
margin-top:1em;
}
#lang_box {
width: 82px;
position: relative;
top: -4px;
}
#payment_amount {
display: inline-block;
width: 20%;
}
#walletCommandsHeader {
margin-top:2em;
}
#walletCommandsPrepare {
margin-top:2em;
}
#walletCommandsTx {
margin-top:2em;
}
#walletCommandsProgress {
margin-top:2em;
}
#walletCommandsSubmit {
margin-top:2em;
}

BIN
images/background.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 624 KiB

BIN
images/dash_logo.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.7 KiB

BIN
images/lang.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

View file

@ -5,8 +5,10 @@
<title>Dash Governance Tools</title> <title>Dash Governance Tools</title>
<link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous"> <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
<link rel="stylesheet" href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.12.0/themes/smoothness/jquery-ui.css"> <link rel="stylesheet" href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.12.0/themes/smoothness/jquery-ui.css">
<link rel="stylesheet" href="css/master.css">
<script src="https://code.jquery.com/jquery-3.1.0.js" integrity="sha256-slogkvB1K3VOkzAI8QITxV3VzpOnkeNVsKvtkYLMjfk=" crossorigin="anonymous"></script> <script src="https://code.jquery.com/jquery-3.1.0.js" integrity="sha256-slogkvB1K3VOkzAI8QITxV3VzpOnkeNVsKvtkYLMjfk=" crossorigin="anonymous"></script>
<script src="https://use.fontawesome.com/f0153b9f7b.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.12.0/jquery-ui.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.12.0/jquery-ui.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script> <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
<script src="bitcore-lib-dash.js"></script> <script src="bitcore-lib-dash.js"></script>
@ -585,172 +587,197 @@
</script> </script>
<style type="text/css">
textarea { background-color:#fafafa !important; }
#header { margin-top:2em; }
.createProposal { }
#createProposalHeader { margin-top:1em; }
#createProposalForm { margin-top:1em; }
.walletCommands { }
#walletCommandsHeader { margin-top:2em; }
#walletCommandsPrepare { margin-top:2em; }
#walletCommandsTx { margin-top:2em; }
#walletCommandsProgress { margin-top:2em; }
#walletCommandsSubmit { margin-top:2em; }
.validationError { background-color:#ffe6e6; }
</style>
</head> </head>
<body> <body>
<div class="col-xs-10 col-xs-offset-1"> <div class="container-fluid">
<div class="row" id="header">
<div class="col-sm-2">
<img src="images/dash_logo.png" alt="dash governance tools">
</div>
<div class="col-sm-4">
<h2 class="header_title">Dash Budget Proposal Generator</h2>
<h5 class="header_description">Generate budget proposal commands you can copy/paste into your Dash wallet to prepare a budget proposal and submit it to the network.</h5>
</div>
<div class="col-sm-4 col-sm-offset-2 text-right">
<i class="fa fa-twitter" aria-hidden="true"></i>
<i class="fa fa-facebook" aria-hidden="true"></i>
<i class="fa fa-rss" aria-hidden="true"></i>
<img id="lang_box" src="images/lang.png" alt="english language">
</div>
</div>
<div class="row" id="header"> <div class="row">
<div class="col-xs-12"> <div class="col-sm-5 col-sm-offset-2 col-xs-12 col-xs-offset-0">
<h1>Dash Budget Proposal Generator</h1> <div class="proposalBlock createProposal">
Generate budget proposal commands you can copy/paste into your Dash wallet to prepare a budget proposal and submit it to the network. <div class="row">
<div class="col-xs-12">
<div class="row" id="createProposalHeader">
<div class="col-xs-12">
<h1 class="removeMargin">Create a Proposal</h1>
<h5 class="header_description">Enter details for your proposal and click 'Create Proposal'. This will generate a command you can run in your local wallet to prepare the proposal at a cost of 0.33 Dash</h5>
</div>
</div>
<div id="createProposalForm">
<div class="row">
<div class="col-xs-12">
<div class="form-group">
<label for="name">Proposal Name:</label>
<input type="text" class="form-control" id="name" value="" placeholder="proposal-name">
</div>
<div class="form-group">
<label for="url">Proposal Description URL:</label>
<input type="text" class="form-control" id="url" value="" placeholder="https://www.dashcentral.org/p/proposal-name">
</div>
</div>
</div>
<div class="row">
<div class="col-xs-3">
<div class="form-group">
<label for="start_epoch">Start Date:</label>
<select name="start_epoch" class="form-control" id="start_epoch"></select>
</div>
</div>
<div class="col-xs-3">
<!-- -->
<!-- -->
<!-- ATTENTION: COMMENT FOR JON -->
<!-- -->
<!-- -->
<!-- The following form group is a placeholder for proposal end time. Please change to the correct id. -->
<div class="form-group">
<label for="start_epoch">End Date:</label>
<select name="start_epoch" class="form-control" id="end_epoch"></select>
</div>
<!-- -->
<!-- -->
<!-- -->
</div>
<div class="col-xs-6">
<div class="form-group">
<label for="payment_address">Payment Address:</label>
<input type="text" class="form-control" id="payment_address" value="" placeholder="">
</div>
</div>
</div>
<div class="row">
<div class="col-xs-7">
<div class="form-group">
<label for="payment_amount">Monthly Payment Amount in Dash:</label>
<input type="text" class="form-control" id="payment_amount" value="" placeholder="0">
</div>
</div>
<div class="col-xs-4 col-xs-offset-1">
<div type="submit" class="btn btn-success" id="btnPrepare">Create Proposal</div>
<div type="submit" class="btn btn-primary hidden" id="btnEdit">Edit Proposal</div>
<div type="submit" class="btn btn-primary hidden" id="btnNew">New Proposal</div>
</div>
</div>
<div class="form-group" style="display:none;">
<label for="type">type:</label>
<input type="text" class="form-control" id="type" value="1" placeholder="1">
</div>
<div class="form-group" style="display:none;">
<label for="parentHash">parent-hash:</label>
<input type="text" class="form-control" id="parentHash" value="0" placeholder="0">
</div>
<div class="form-group" style="display:none;">
<label for="revision">revision:</label>
<input type="text" class="form-control" id="revision" value="1" placeholder="1">
</div>
<div class="form-group" style="display:none;">
<label for="time">Creation Time:</label>
<input type="text" class="form-control" id="time" value="" placeholder="">
</div>
<!-- -->
<!-- -->
<!-- -->
<!-- ATTENTION: COMMENT FOR JON -->
<!-- The following form group is commented out because it's not a part of the design mock. Staying here for safe keeping just in case still needed. -->
<!-- <div class="form-group">
<label for="end_epoch">Choose payment cycle:</label>
<select name="end_epoch" class="form-control" id="end_epoch"></select>
</div> -->
</div>
</div>
</div> </div>
</div> </div>
<div class="row createProposal" id="createProposalHeader">
<div class="col-xs-12">
<h2>Create a Proposal</h2>
Enter details for your proposal and click 'Create Proposal'. This will generate a command you can run in your local wallet to prepare the proposal at a cost of 0.33 Dash
</div>
</div>
<div class="row createProposal" id="createProposalForm"> <div class="row walletCommands hidden" id="walletCommandsHeader">
<div class="col-xs-6"> <div class="col-xs-12">
<h2>Wallet Commands</h2>
<div class="form-group">
<label for="name">Proposal Name:</label>
<input type="text" class="form-control" id="name" value="" placeholder="proposal-name">
</div>
<div class="form-group">
<label for="url">Proposal Description URL:</label>
<input type="text" class="form-control" id="url" value="" placeholder="https://www.dashcentral.org/p/proposal-name">
</div>
<div class="form-group">
<label for="start_epoch">Proposal Start Date:</label>
<select name="start_epoch" class="form-control" id="start_epoch"></select>
</div>
<div type="submit" class="btn btn-primary" id="btnPrepare">Create Proposal</div>
<div type="submit" class="btn btn-primary hidden" id="btnEdit">Edit Proposal</div>
<div type="submit" class="btn btn-primary hidden" id="btnNew">New Proposal</div>
<div class="form-group" style="display:none;">
<label for="type">type:</label>
<input type="text" class="form-control" id="type" value="1" placeholder="1">
</div>
<div class="form-group" style="display:none;">
<label for="parentHash">parent-hash:</label>
<input type="text" class="form-control" id="parentHash" value="0" placeholder="0">
</div>
<div class="form-group" style="display:none;">
<label for="revision">revision:</label>
<input type="text" class="form-control" id="revision" value="1" placeholder="1">
</div>
<div class="form-group" style="display:none;">
<label for="time">Creation Time:</label>
<input type="text" class="form-control" id="time" value="" placeholder="">
</div> </div>
</div> </div>
<div class="col-xs-6"> <div class="row walletCommands hidden" id="walletCommandsPrepare">
<div class="form-group"> <div class="col-xs-12">
<label for="payment_address">Payment Address:</label>
<input type="text" class="form-control" id="payment_address" value="" placeholder="">
</div>
<div class="form-group"> <div class="form-group">
<label for="payment_amount">Monthly Payment Amount in Dash:</label> <label for="prepareProposal">Prepare-Proposal Command:</label>
<input type="text" class="form-control" id="payment_amount" value="" placeholder="0"> <div>Paste this proposal command into your Dash wallet console to spend a Fee transaction of 0.33 DASH.</div>
</div> <textarea readonly class="form-control" id="prepareProposal" rows="4" placeholder=""></textarea>
</div>
<div class="form-group">
<label for="end_epoch">Choose payment cycle:</label>
<select name="end_epoch" class="form-control" id="end_epoch"></select>
</div> </div>
</div> </div>
</div> <div class="row walletCommands hidden" id="walletCommandsTx">
<div class="row walletCommands hidden" id="walletCommandsHeader"> <div class="col-xs-12">
<div class="col-xs-12">
<h2>Wallet Commands</h2>
</div>
</div>
<div class="row walletCommands hidden" id="walletCommandsPrepare">
<div class="col-xs-12">
<div class="form-group"> <div class="form-group">
<label for="prepareProposal">Prepare-Proposal Command:</label> <label for="feeTxid">Fee Transaction ID:</label>
<div>Paste this proposal command into your Dash wallet console to spend a Fee transaction of 0.33 DASH.</div> <div>Paste the transaction ID returned by the wallet below to generate the final submit command.</div>
<textarea readonly class="form-control" id="prepareProposal" rows="4" placeholder=""></textarea> <input type="text" class="form-control" id="feeTxid" value="" placeholder="<fee-txid>">
</div> </div>
</div>
</div> </div>
</div> <div class="row walletCommands hidden" id="walletCommandsProgress">
<div class="row walletCommands hidden" id="walletCommandsTx"> <div class="col-xs-12">
<div class="col-xs-12"> <div class="form-group">
<label for="feeTxid">Fee Transaction Progress:</label>
<div id="progresstxt">We'll wait for 6 confirmations. Waiting for new blocks to confirm...</div>
<div id="progressbar"></div>
</div>
</div>
</div>
<div class="row walletCommands hidden" id="walletCommandsSubmit">
<div class="col-xs-12">
<div class="form-group">
<label for="submitProposal">Submit Proposal Command:</label>
<div>Paste the Fee TX id to generate the proposal submit command. This is the final step and can be completed after 6 confirmations on the fee tx.</div>
<textarea readonly class="form-control" id="submitProposal" rows="4" placeholder=""></textarea>
</div>
<div class="form-group">
<label for="feeTxid">Fee Transaction ID:</label>
<div>Paste the transaction ID returned by the wallet below to generate the final submit command.</div>
<input type="text" class="form-control" id="feeTxid" value="" placeholder="<fee-txid>">
</div> </div>
</div> </div>
</div> </div>
</div>
<div class="row walletCommands hidden" id="walletCommandsProgress">
<div class="col-xs-12">
<div class="form-group">
<label for="feeTxid">Fee Transaction Progress:</label>
<div id="progresstxt">We'll wait for 6 confirmations. Waiting for new blocks to confirm...</div>
<div id="progressbar"></div>
</div>
</div>
</div>
<div class="row walletCommands hidden" id="walletCommandsSubmit">
<div class="col-xs-12">
<div class="form-group">
<label for="submitProposal">Submit Proposal Command:</label>
<div>Paste the Fee TX id to generate the proposal submit command. This is the final step and can be completed after 6 confirmations on the fee tx.</div>
<textarea readonly class="form-control" id="submitProposal" rows="4" placeholder=""></textarea>
</div>
</div>
</div>
</div> </div>
</body> </body>