Download as
Browse Code »

Commit 7ef60deabbaaaa51e4e4f7d9a7b601198219599c

Authored by Jared Pace
2 parents c54cc32a 0cb4f3f9
Exists in master and in 1 other branch production

Merge branch 'master' of github.com:jdpace/errbit

Showing 6 changed files with 123 additions and 8 deletions   Show diff stats
app/views/users/show.html.haml
  Diff comments   View file @7ef60de
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 = link_to 'edit', edit_user_path(@user), :class => 'button' 3 = link_to 'edit', edit_user_path(@user), :class => 'button'
4 = link_to 'destroy', user_path(@user), :method => :delete, :confirm => 'Seriously?', :class => 'button' 4 = link_to 'destroy', user_path(@user), :method => :delete, :confirm => 'Seriously?', :class => 'button'
5 5
6 -%table 6 +%table.single_user
7 %tr 7 %tr
8 %th Email 8 %th Email
9 %td.main= @user.email 9 %td.main= @user.email
public/javascripts/application.js
  Diff comments   View file @7ef60de
@@ -2,6 +2,17 @@ @@ -2,6 +2,17 @@
2 2
3 $(function(){ 3 $(function(){
4 activateTabbedPanels(); 4 activateTabbedPanels();
  5 +
  6 + $('#watcher_name').live("click", function() {
  7 + $(this).closest('form').find('.show').removeClass('show');
  8 + $('#app_watchers_attributes_0_user_id').addClass('show');
  9 + });
  10 +
  11 + $('#watcher_email').live("click", function() {
  12 + $(this).closest('form').find('.show').removeClass('show');
  13 + $('#app_watchers_attributes_0_email').addClass('show');
  14 + });
  15 +
5 }); 16 });
6 17
7 function activateTabbedPanels() { 18 function activateTabbedPanels() {
public/mockup.html 0 → 100644
  Diff comments   View file @7ef60de
@@ -0,0 +1,90 @@ @@ -0,0 +1,90 @@
  1 +<!DOCTYPE html>
  2 +<html>
  3 + <head>
  4 + <title>
  5 + Errbit &mdash;
  6 + Add App
  7 + </title>
  8 + <meta content='text/html; charset=utf-8' http-equiv='content-type'>
  9 + <meta name="csrf-param" content="authenticity_token"/>
  10 + <meta name="csrf-token" content="2xxr2t/FRsJU1jXFRJYSbR/x7dk4jIPwmEhE2sgrWFA="/>
  11 + <script src="/javascripts/jquery.js?1281707549" type="text/javascript"></script>
  12 + <script src="/javascripts/rails.js?1281707549" type="text/javascript"></script>
  13 + <script src="/javascripts/form.js?1281727831" type="text/javascript"></script>
  14 + <script src="/javascripts/application.js?1281707549" type="text/javascript"></script>
  15 +
  16 +
  17 + <link href="/stylesheets/reset.css?1281707549" media="screen" rel="stylesheet" type="text/css" />
  18 + <link href="/stylesheets/application.css?1281730151" media="screen" rel="stylesheet" type="text/css" />
  19 +
  20 + <style type="text/css" media="screen">
  21 + #app_watchers_attributes_0_user_id,
  22 + #app_watchers_attributes_0_email {
  23 + display:none;
  24 + }
  25 + #app_watchers_attributes_0_user_id.show,
  26 + #app_watchers_attributes_0_email.show {
  27 + display: block;
  28 + }
  29 + </style>
  30 +
  31 + </head>
  32 + <body class='new' id='apps'>
  33 + <div id='header'>
  34 + <div>
  35 + <a href="/" id="site-name">Errbit</a>
  36 + <ul id='session-links'>
  37 + <li><a href="/users/sign_out" id="sign-out">Sign out</a></li>
  38 + </ul>
  39 + </div>
  40 + </div>
  41 + <div id='nav-bar'>
  42 + <ul>
  43 + <!-- /%li= link_to 'Dashboard', admin_dashboard_path, :class => active_if_here(:dashboards) -->
  44 + <li class='active apps'><a href="/apps">Apps</a></li>
  45 + <li class='errs'><a href="/errs">Errs</a></li>
  46 + <li class='users'><a href="/users">Users</a></li>
  47 + </ul>
  48 + <div class='clear'></div>
  49 + </div>
  50 + <div id='content-wrapper'>
  51 + <div id='content-title'>
  52 + <h1>Add App</h1>
  53 + <span class='meta'></span>
  54 + <div id='action-bar'>
  55 + <a href="/apps">cancel</a>
  56 + </div>
  57 + </div>
  58 + <div id='content'>
  59 +
  60 + <form accept-charset="UTF-8" action="/apps" class="new_app" id="new_app" method="post"><div style="margin:0;padding:0;display:inline"><input name="_snowman" type="hidden" value="&#9731;" /><input name="authenticity_token" type="hidden" value="2xxr2t/FRsJU1jXFRJYSbR/x7dk4jIPwmEhE2sgrWFA=" /></div>
  61 + <div class='required'>
  62 + <label for="app_name">Name</label>
  63 + <input id="app_name" name="app[name]" size="30" type="text" />
  64 + </div>
  65 + <div class='checkbox'>
  66 + <input name="app[resolve_errs_on_deploy]" type="hidden" value="0" /><input id="app_resolve_errs_on_deploy" name="app[resolve_errs_on_deploy]" type="checkbox" value="1" />
  67 + <label for="app_resolve_errs_on_deploy">Resolve errs on deploy</label>
  68 + </div>
  69 + <fieldset class='nested-wrapper'>
  70 + <legend>Watchers</legend>
  71 + <div class='nested'>
  72 + <div>
  73 + <input type="radio" name="watcher_type" id="watcher_name"/> <label class="inline">Name</label>&nbsp;&nbsp;
  74 + <input type="radio" name="watcher_type" id="watcher_email"/> <label class="inline">Email</label><br/><br/>
  75 + </div>
  76 + <div>
  77 + <select id="app_watchers_attributes_0_user_id" name="app[watchers_attributes][0][user_id]"><option value="">-- Select a User --</option>
  78 + <option value="4c654f41eacf8d2ae8000001">Errbit Admin</option></select>
  79 + <input id="app_watchers_attributes_0_email" name="app[watchers_attributes][0][email]" size="30" type="text" />
  80 + </div>
  81 + </div>
  82 + </fieldset>
  83 + <div class='add_app'><input id="app_submit" name="commit" type="submit" value="Add" /></div>
  84 + </form>
  85 + </div>
  86 + </div>
  87 + <div id='footer'>Powered by <a href="http://github.com/jdpace/errbit" target="_blank">Errbit</a>: the open source Hoptoad server.</div>
  88 +
  89 + </body>
  90 +</html>
0 \ No newline at end of file 91 \ No newline at end of file
public/stylesheets/application.css
  Diff comments   View file @7ef60de
@@ -205,8 +205,18 @@ a.action { float: right; font-size: 0.9em;} @@ -205,8 +205,18 @@ a.action { float: right; font-size: 0.9em;}
205 background-color: #F9F9F9; 205 background-color: #F9F9F9;
206 line-height: 1em; 206 line-height: 1em;
207 } 207 }
208 -#flash-messages .notice, #flash-messages .success { background: transparent url(images/icons/success.png) 16px 50% no-repeat; }  
209 -#flash-messages .error { background: transparent url(images/icons/error.png) 16px 50% no-repeat; } 208 +#flash-messages .notice {
  209 + background-color: #b5eeff;
  210 + border: 1px solid #6cf;
  211 +}
  212 +#flash-messages li.success {
  213 + background: #cfc url(images/icons/success.png) 16px 50% no-repeat;
  214 + border: 1px solid #6c3;
  215 +}
  216 +#flash-messages li.error {
  217 + background: #fcc url(images/icons/error.png) 16px 50% no-repeat;
  218 + border: 1px solid #f99;
  219 +}
210 #flash-messages .alert { 220 #flash-messages .alert {
211 background: #ffc url(images/icons/warning.png) 10px 7px no-repeat; 221 background: #ffc url(images/icons/warning.png) 10px 7px no-repeat;
212 border-color: #e4bb69; 222 border-color: #e4bb69;
@@ -231,7 +241,7 @@ form label { @@ -231,7 +241,7 @@ form label {
231 } 241 }
232 form label.inline { display: inline; } 242 form label.inline { display: inline; }
233 form .checkbox label { display: inline; } 243 form .checkbox label { display: inline; }
234 -form .required label { color: #BF3838;} 244 +form .required label { color: #990000;}
235 form input[type=text], form input[type=password] { 245 form input[type=text], form input[type=password] {
236 width: 96%; padding: 0.8em; 246 width: 96%; padding: 0.8em;
237 font-size: 1em; 247 font-size: 1em;
@@ -329,7 +339,7 @@ form legend + .nested { @@ -329,7 +339,7 @@ form legend + .nested {
329 /* Tables */ 339 /* Tables */
330 table { 340 table {
331 width: 100%; 341 width: 100%;
332 - border: 1px solid #C6C6C6; 342 + border: 1px solid #C6C6C6;
333 margin-bottom: 1.5em; 343 margin-bottom: 1.5em;
334 border-collapse: separate; 344 border-collapse: separate;
335 } 345 }
@@ -349,6 +359,9 @@ table th { background-color: #E2E2E2; font-weight: bold; text-transform: upperca @@ -349,6 +359,9 @@ table th { background-color: #E2E2E2; font-weight: bold; text-transform: upperca
349 table tbody tr:nth-child(odd) td { background-color: #F9F9F9; } 359 table tbody tr:nth-child(odd) td { background-color: #F9F9F9; }
350 table .main { width: 100%; } 360 table .main { width: 100%; }
351 361
  362 +table.single_user {
  363 + border-top: none;
  364 +}
352 /* Code */ 365 /* Code */
353 pre { 366 pre {
354 padding: 0.8em; 367 padding: 0.8em;
@@ -443,10 +456,11 @@ a.button { @@ -443,10 +456,11 @@ a.button {
443 line-height: 30px; 456 line-height: 30px;
444 } 457 }
445 a:hover.button { 458 a:hover.button {
446 - box-shadow: 0px 0px 4px #69C;  
447 - -moz-box-shadow: 0px 0px 4px #69C;  
448 - -webkit-box-shadow: 0px 0px 4px #69C; 459 + box-shadow: 0px 0px 4px #ccc;
  460 + -moz-box-shadow: 0px 0px 4px #ccc;
  461 + -webkit-box-shadow: 0px 0px 4px #ccc;
449 text-decoration: none; 462 text-decoration: none;
  463 + background-color: #eee;
450 } 464 }
451 a.button.active { 465 a.button.active {
452 border-color: #fff; 466 border-color: #fff;
public/stylesheets/images/icons/success.png 100755 → 100644
View file @7ef60de

393 Bytes | W: | H:

1.06 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
public/stylesheets/images/icons/thumbs-up.png 0 → 100644
View file @7ef60de

1.42 KB