diff options
author | M <m@lfurio.us> | 2015-11-16 22:20:05 -0500 |
---|---|---|
committer | M <m@lfurio.us> | 2015-11-16 22:20:05 -0500 |
commit | ee5cc69977d13d2183758ff855c8365cfa68dc19 (patch) | |
tree | 0a6e8b6de246add83afee8d0ed4394b5e0de7c18 /app | |
parent | 02d0f8d0b29572d196ba123d70c7426fd415573a (diff) | |
download | scrott-ee5cc69977d13d2183758ff855c8365cfa68dc19.tar.gz scrott-ee5cc69977d13d2183758ff855c8365cfa68dc19.zip |
* Committing more front-end ideas to index.html -- Added tons of example content and made a rough-draft for a pad-view
+ Committing Sonic character images for use as example content on index.html
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/img/amy.png | bin | 0 -> 69547 bytes | |||
-rw-r--r-- | app/assets/img/eggman.png | bin | 0 -> 102190 bytes | |||
-rw-r--r-- | app/assets/img/knuckles.png | bin | 0 -> 77600 bytes | |||
-rw-r--r-- | app/assets/img/sonic.png | bin | 0 -> 169301 bytes | |||
-rw-r--r-- | app/assets/img/tails.png | bin | 0 -> 185686 bytes | |||
-rw-r--r-- | app/index.html | 207 |
6 files changed, 161 insertions, 46 deletions
diff --git a/app/assets/img/amy.png b/app/assets/img/amy.png Binary files differnew file mode 100644 index 0000000..493fb13 --- /dev/null +++ b/app/assets/img/amy.png diff --git a/app/assets/img/eggman.png b/app/assets/img/eggman.png Binary files differnew file mode 100644 index 0000000..6fea441 --- /dev/null +++ b/app/assets/img/eggman.png diff --git a/app/assets/img/knuckles.png b/app/assets/img/knuckles.png Binary files differnew file mode 100644 index 0000000..7c7b7e2 --- /dev/null +++ b/app/assets/img/knuckles.png diff --git a/app/assets/img/sonic.png b/app/assets/img/sonic.png Binary files differnew file mode 100644 index 0000000..db3559f --- /dev/null +++ b/app/assets/img/sonic.png diff --git a/app/assets/img/tails.png b/app/assets/img/tails.png Binary files differnew file mode 100644 index 0000000..8639790 --- /dev/null +++ b/app/assets/img/tails.png diff --git a/app/index.html b/app/index.html index cdf47fe..15b8602 100644 --- a/app/index.html +++ b/app/index.html @@ -6,7 +6,7 @@ <meta http-equiv="X-UA-Compatible" content="IE=edge" /> <meta name="viewport" content="width=device-width, initial-scale=1" /> - <title>Scrott - Project 1</title> + <title>Scrott - Save the World</title> <link rel="stylesheet" type="text/css" href="assets/css/bootstrap.min.css" /> @@ -30,20 +30,28 @@ body <span class="icon-bar"></span> </button> - <a href="/" class="navbar-brand">Scrott</a> + <a href="/" class="navbar-brand"><span class="glyphicon glyphicon-pencil"></span> Scrott</a> </div> <!--NAVBAR CONTENT--> <div class="collapse navbar-collapse" id="navbar-collapse-1"> <ul class="nav navbar-nav"> <li class="dropdown"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Project 1 <span class="caret"></span></a> + <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Save the World <span class="caret"></span></a> <ul class="dropdown-menu"> <li><a href="#">Project 2</a></li> <li role="separator" class="divider"></li> <li><a href="#">Create New Pad</a></li> </ul> </li> + + <li class="dropdown"> + <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><span class="glyphicon glyphicon-plus"></span> <span class="caret"></span></a> + <ul class="dropdown-menu"> + <li><a href="#">Open Issue</a></li> + <li><a href="#">New Discussion Thread</a></li> + </ul> + </li> </ul> <form method="post" action="#" class="navbar-form navbar-left" role="search"> @@ -54,8 +62,16 @@ body <ul class="nav navbar-nav navbar-right"> <li class="dropdown"> - <a href="#" class=dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Scott <span class="caret"></span></a> + <a href="#" class=dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"> + <span class="glyphicon glyphicon-exclamation-sign"></span> + <span class="glyphicon glyphicon-envelope"></span> + <span class="glyphicon glyphicon-user"></span> Sonic the Hedgehog <span class="caret"></span> + </a> <ul class="dropdown-menu"> + <li><a href="#">Issues assigned to Me <span class="badge">1</span></a></li> + <li><a href="#">My open Issues</a></li> + <li role="separator" class="divider"></li> + <li><a href="#">Private Messages <span class="badge">1</span></a></li> <li><a href="#">Settings</a></li> <li><a href="#">Log out</a></li> </ul> @@ -65,48 +81,147 @@ body </div> </nav> - <h1>asdf</h1> - <h1>asdf</h1> - <h1>asdf</h1> - <h1>asdf</h1> - <h1>asdf</h1> - <h1>asdf</h1> - <h1>asdf</h1> - <h1>asdf</h1> - <h1>asdf</h1> - <h1>asdf</h1> - <h1>asdf</h1> - <h1>asdf</h1> - <h1>asdf</h1> - <h1>asdf</h1> - <h1>asdf</h1> - <h1>asdf</h1> - <h1>asdf</h1> - <h1>asdf</h1> - <h1>asdf</h1> - <h1>asdf</h1> - <h1>asdf</h1> - <h1>asdf</h1> - <h1>asdf</h1> - <h1>asdf</h1> - <h1>asdf</h1> - <h1>asdf</h1> - <h1>asdf</h1> - <h1>asdf</h1> - <h1>asdf</h1> - <h1>asdf</h1> - <h1>asdf</h1> - <h1>asdf</h1> - <h1>asdf</h1> - <h1>asdf</h1> - <h1>asdf</h1> - <h1>asdf</h1> - <h1>asdf</h1> - <h1>asdf</h1> - <h1>asdf</h1> - <h1>asdf</h1> - <h1>asdf</h1> - <h1>asdf</h1> + <!-- PAD SUMMARY --> + <div class="container"> + <div class="well well-lg"> + <div class="row"> + <div class="col-md-4"> + <h1>Save the World <span class="glyphicon glyphicon-globe"></span><!--Denoting this pad as globally visible--></h1> + <img src="assets/img/sonic.png" alt="Sonic" class="img-circle" height="50" /> + <span class="glyphicon glyphicon-plus"></span> + <img src="assets/img/tails.png" alt="Miles" class="img-circle" height="50" /> + <img src="assets/img/amy.png" alt="Amy" class="img-circle" height="50" /> + <img src="assets/img/knuckles.png" alt="Knuckles" class="img-circle" height="50" /> + </div> + + <div class="col-md-8"> + <legend class="text-center">Issue Progress</legend> + <div class="progress"> + <div class="progress-bar progress-bar-success" style="width: 50%">Closed</div> + <div class="progress-bar progress-bar-warning" style="width: 25%">In Progress</div> + <div class="progress-bar progress-bar-danger" style="width: 25%">To Do</div> + </div> + + <div class="row"> + <div class="col-md-4 text-center"> + <!-- open issues --> + <a href="#"><span class="label label-info"><span class="glyphicon glyphicon-inbox"></span> 5 Open Issues</span></a> + </div> + + <div class="col-md-4 text-center"> + <a href="#"><span class="label label-info"><span class="glyphicon glyphicon-comment"></span> 10 Unresolved Discussions</span></a> + </div> + + <div class="col-md-4 text-center"> + <div class="btn-group" role="group"> + <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-cog"></span></button> + </div> + </div> + </div> + </div> + </div> + </div> + + <div class="panel panel-default"> + <h2 class="text-center">In Progress</h2> + <table class="table table-hover"> + <tr> + <td>a8c2402b (#4)</td> + <td>Example Issue</td> + <td> + <img src="assets/img/sonic.png" alt="Sonic" class="img-circle" height="35" /> + <span class="glyphicon glyphicon-share-alt"></span> + <img src="assets/img/tails.png" alt="Miles" class="img-circle" height="35" /> + </td> + <td> + <div class="btn-group" role="group"> + <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-pencil"></span></button> + <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-arrow-up"></span></button> + <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-cog"></span></button> + <button type="button" class="btn btn-success"><span class="glyphicon glyphicon-ok"></span></button> + </div> + </td> + </tr> + + <tr> + <td>a8c2402b (#5)</td> + <td>Example Issue</td> + <td> + <img src="assets/img/tails.png" alt="Miles" class="img-circle" height="35" /> + <span class="glyphicon glyphicon-share-alt"></span> + <img src="assets/img/amy.png" alt="Amy" class="img-circle" height="35" /> + <span class="glyphicon glyphicon-plus"></span> + <img src="assets/img/sonic.png" alt="Sonic" class="img-circle" height="35" /> + </td> + <td> + <div class="btn-group" role="group"> + <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-pencil"></span></button> + <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-arrow-up"></span></button> + <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-cog"></span></button> + <button type="button" class="btn btn-success"><span class="glyphicon glyphicon-ok"></span></button> + </div> + </td> + </tr> + </table> + </div> + + <div class="panel panel-default"> + <h2 class="text-center">To Do</h2> + <table class="table table-hover"> + <tr> + <td>a8c2402b (#6)</td> + <td>Example Issue for external user</td> + <td> + <img src="assets/img/knuckles.png" alt="Knuckles" class="img-circle" height="35" /> + <span class="glyphicon glyphicon-share-alt"></span> + <span class="glyphicon glyphicon-user"></span> + </td> + <td> + <div class="btn-group" role="group"> + <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-pencil"></span></button> + <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-arrow-up"></span></button> + <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-cog"></span></button> + <button type="button" class="btn btn-success"><span class="glyphicon glyphicon-ok"></span></button> + </div> + </td> + </tr> + + <tr> + <td>a8c2402b (#7)</td> + <td>Example Unassigned Issue</td> + <td> + <span class="glyphicon glyphicon-ban-circle"></span> + <span class="glyphicon glyphicon-share-alt"></span> + <img src="assets/img/sonic.png" alt="Sonic" class="img-circle" height="35" /> + </td> + <td> + <div class="btn-group" role="group"> + <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-pencil"></span></button> + <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-arrow-up"></span></button> + <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-cog"></span></button> + <button type="button" class="btn btn-success"><span class="glyphicon glyphicon-ok"></span></button> + </div> + </td> + </tr> + + <tr> + <td>a8c2402b (#8)</td> + <td>Example Self-assigned Issue</td> + <td> + <img src="assets/img/amy.png" alt="Amy" class="img-circle" height="35" /> + </td> + <td> + <div class="btn-group" role="group"> + <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-pencil"></span></button> + <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-arrow-up"></span></button> + <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-cog"></span></button> + <button type="button" class="btn btn-success"><span class="glyphicon glyphicon-ok"></span></button> + </div> + </td> + </tr> + </table> + </div> + </div> <!-- JS --> <script type="text/javascript" src="assets/js/jquery.min.js"></script> |