Permalink
Browse files

Update bootstrap layout

  • Loading branch information...
1 parent 0ebb67d commit 6355e6b631fcb6579a5f4971bd22be3109e4b60c @mshafrir committed Jun 13, 2012
Showing with 23 additions and 25 deletions.
  1. +3 −4 public/css/app.css
  2. +4 −4 public/templates/cusipTable.html
  3. +2 −3 src/server/server.coffee
  4. +11 −11 views/index.jade
  5. +3 −3 views/layout.jade
View
@@ -7,19 +7,18 @@ h1 {
font-family: 'Helvetica Neue', 'Helvetica';
font-weight: normal;
letter-spacing: -1px;
- margin-top: 0;
- margin-left: 16px;
+ margin: 0 0 10px 16px;
display: inline-block;
}
-form#search .actions {
+#search .actions {
background: #fff;
margin: 0;
padding-top: 0;
border: 0;
}
-input#cusip {
+#cusip {
vertical-align: middle;
}
@@ -1,12 +1,12 @@
-<% if (typeof(found) !== 'undefined' && !found) { %>
+<% if (!_.isUndefined(found) && !found) { %>
-<div class="alert-message block-message error">
+<div class="alert alert-block alert-error">
The CUSIP was not found.
</div>
<% } else { %>
-<table id="cusip-table" class="zebra-striped">
+<table id="cusip-table" class="table table-striped">
<thead>
<tr>
<th class="key">Name</th>
@@ -39,7 +39,7 @@
</tr>
<% } %>
- <% if (typeof(type) !== 'undefined' && !_.isEmpty(type)) { %>
+ <% if (!_.isEmpty(type)) { %>
<tr>
<td>Security Type</td>
<td><%- type %></td>
@@ -52,7 +52,7 @@ app.use(express.static('public'))
assetManager = require('connect-assetmanager')
assetHandler = require('connect-assetmanager-handlers')
-assets =
+assets =
css:
dataType: 'css'
path: './public/css/'
@@ -173,7 +173,7 @@ class QuantumCusipSource extends CusipSource
[month_str, day_str] = _.map([month, day], (s) -> _.last("0#{s}".split(''), 2).join(''))
full_year = year + (if year >= 50 then 1900 else 2000)
delisted = (new Date("#{full_year}-#{month_str}-#{day_str}"))
-
+
if security_name?
cusip_data =
name: security_name,
@@ -184,7 +184,6 @@ class QuantumCusipSource extends CusipSource
found: true
callback(null, cusip_data)
-
# CUSIP was not found.
else
View
@@ -9,40 +9,40 @@ block head
block styles
link(rel='stylesheet', href='http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/base/jquery-ui.css')
- link(rel='stylesheet', href='http://twitter.github.com/bootstrap/1.4.0/bootstrap.min.css')
+ link(rel='stylesheet', href='http://twitter.github.com/bootstrap/assets/css/bootstrap.css')
link(rel='stylesheet', href='/app.css')
block scripts
script(src='http://ajax.googleapis.com/ajax/libs/jquery/1.7/jquery.min.js')
script(src='http://documentcloud.github.com/underscore/underscore-min.js')
script(data-main='js/boot.js', src='/js/libs/require/require.js')
-
+
block content
.container
.row
- .span8
+ .span6
h1 CUSIP Lookup
.row
- .span6
+ .span4
form#search(action='/cusips', method='get')
fieldset
- .clearfix
- label(for='cusip') CUSIP
- .input
+ .control-group
+ label.control-label(for='cusip') CUSIP
+ .controls
input#cusip.span2(type='text', name='cusip',
placeholder='', value='010383206',
required='required', autofocus='autofocus', maxlength='10')
-
+
div.actions
- input.btn.primary(type='submit', value='Lookup')
+ input.btn.btn-primary(type='submit', value='Lookup')
dl.faq
dt What's a CUSIP?
dd The acronym CUSIP stands for
strong Committee on Uniform Security Identification Procedures
dt Who owns it?
dd
- | The CUSIP distribution system is owned by the
+ | The CUSIP distribution system is owned by the
a(href='http://www.aba.com') American Bankers Association
span and is operated by Standard & Poor's.
dt Where can I learn more about CUSIPs?
@@ -52,5 +52,5 @@ block content
p.email
a(href='mailto:mshafrir@gmail.com') Contact me
- .span9.offset1
+ .span7.offset1
#cusip-console
View
@@ -2,10 +2,10 @@
html(lang="en")
head
block head
-
+
block styles
-
+
body
block content
-
+
block scripts

0 comments on commit 6355e6b

Please sign in to comment.