Permalink
Browse files

Began converting scaffolding for twitter bootstrap 2.0

  • Loading branch information...
chriscantu committed Feb 9, 2012
1 parent 93ad053 commit 9867c522ae69a34f44eb892b44f1ed4a93889258
View
@@ -1,7 +1,8 @@
#Grails Metadata file
-#Wed Jan 18 01:00:45 CST 2012
+#Sun Feb 05 11:12:28 CST 2012
app.grails.version=2.0.0
app.name=twitter-bootstrap
app.servlet.version=2.5
app.version=0.1
-plugins.twitter-bootstrap=1.4.0.14
+plugins.svn=1.0.2
+plugins.twitter-bootstrap=2.0.0.16
@@ -1,4 +1,4 @@
-<div id="my-modal" class="modal hide fade" style="display: none; ">
+<div id="my-modal" class="modal fade" style="display: none; ">
<g:form name="create-request" controller="request" action="save">
<div class="modal-header">
<a href="#" class="close">×</a>
@@ -1,29 +1,27 @@
-<div class="topbar-wrapper" style="z-index: 5;">
- <div class="topbar" data-dropdown="dropdown">
- <div class="topbar-inner">
- <div class="container">
- <h3><a href="${createLink(uri: '/')}">Racker Support</a></h3>
- <ul class="nav">
- <li class="active"><a href="${createLink(uri: '/')}">Home</a></li>
- <li class="dropdown">
- <a href="#" class="dropdown-toggle">Reports</a>
- <ul class="dropdown-menu">
-
- <li><g:link action="list" controller="request" >Requests</g:link></li>
- <li class="divider"></li>
- <li><a href="#">Changes</a></li>
- <li class="divider"></li>
- <li><a href="#">Approvals</a></li>
- </ul>
- </li>
- </ul>
- <form class="pull-left" action="">
- <input type="text" placeholder="Search">
- </form>
- <ul class="nav">
- <li class="active"><a data-controls-modal="my-modal" data-backdrop="true" data-keyboard="true" data-controls-modal="modal-from-dom" href="#">New Request</a></li>
- </ul>
- </div>
- </div><!-- /topbar-inner -->
- </div><!-- /topbar -->
-</div>
+<div class="navbar" data-dropdown="dropdown">
+ <div class="navbar-inner">
+ <div class="container">
+ <a class="brand" href="${createLink(uri: '/')}">Racker Support</a>
+ <ul class="nav">
+ <li class="active"><a href="${createLink(uri: '/')}">Home</a></li>
+ <li class="dropdown">
+ <a href="#" class="dropdown-toggle">Reports</a>
+ <ul class="dropdown-menu">
+ <li><g:link action="list" controller="request" >Requests</g:link></li>
+ <li class="divider"></li>
+ <li><a href="#">Changes</a></li>
+ <li class="divider"></li>
+ <li><a href="#">Approvals</a></li>
+ </ul>
+ </li>
+ </ul>
+ <form class="navbar-search pull-left" action="">
+ <input type="text" class="search-query" placeholder="Search">
+ </form>
+ <ul class="nav">
+ <li><a data-toggle="modal" href="#my-modal">New Request</a></li>
+ </ul>
+ </div>
+ </div><!-- /topbar-inner -->
+</div><!-- /topbar -->
+
@@ -29,10 +29,6 @@
<g:render template="/layouts/support-nav" />
</g:else>
-
-
- <div id="grailsLogo" role="banner"><a href="http://grails.org"><img src="${resource(dir: 'images', file: 'grails_logo.png')}" alt="Grails"/></a></div>
-
<g:layoutBody/>
<div class="footer" role="contentinfo"></div>
@@ -26,6 +26,14 @@
<g:textField name="description" required="" value="${requestInstance?.description}"/>
</div>
+<div class="row edit-properties fieldcontain ${hasErrors(bean: requestInstance, field: 'assigned', 'error')} ">
+ <div class="property-label span3" for="assigned">
+ <g:message code="request.assigned.label" default="Assigned" />:
+
+ </div>
+ <g:select id="assigned" name="assigned.id" from="${com.rackspace.User.list()}" optionKey="id" value="${requestInstance?.assigned?.id}" class="many-to-one" noSelection="['null': '']"/>
+</div>
+
<div class="row edit-properties fieldcontain ${hasErrors(bean: requestInstance, field: 'status', 'error')} required">
<div class="property-label span3" for="status">
<g:message code="request.status.label" default="Status" />:
@@ -34,11 +42,3 @@
<g:select name="status" from="${com.rackspace.Status?.values()}" keys="${com.rackspace.Status.values()*.name()}" required="" value="${requestInstance?.status?.name()}"/>
</div>
-<div class="row edit-properties fieldcontain ${hasErrors(bean: requestInstance, field: 'assigned', 'error')} required">
- <div class="property-label span3" for="assigned">
- <g:message code="request.assigned.label" default="Assigned" />:
- <span class="required-indicator">*</span>
- </div>
- <g:select id="assigned" name="assigned.id" from="${com.rackspace.User.list()}" optionKey="id" required="" value="${requestInstance?.assigned?.id}" class="many-to-one"/>
-</div>
-
@@ -10,10 +10,10 @@
<body>
<div class="container">
<div class="row">
- <div class="span4">
+ <div class="span3">
<h1><g:message code="default.list.label" args="[entityName]" /></h1>
</div>
- <div class="span12">
+ <div class="span8">
<g:if test="${flash.message}">
<div class="alert-message info" role="status"><strong>${flash.message}</strong></div>
</g:if>
@@ -30,19 +30,19 @@
</div>
<div class="row">
- <div class="sidebar span4">
+ <div class="sidebar span3">
<div class="well" role="navigation">
- <ul>
- <li><a class="home" href="${createLink(uri: '/')}"><g:message code="default.home.label"/></a></li>
- <li><g:link class="create" action="create"><g:message code="default.new.label" args="[entityName]" /></g:link></li>
+ <ul class="nav nav-list">
+ <li><a class="home" href="${createLink(uri: '/')}"><i class="icon-list"></i><g:message code="default.list.label" args="[entityName]"/></a></li>
+ <li><g:link class="create" action="create"><i class="icon-file"></i><g:message code="default.new.label" args="[entityName]" /></g:link></li>
</ul>
</div>
</div>
<div class="content">
<div class="row">
- <div class="span12">
+ <div class="span8">
<div id="list-request" class="content scaffold-list" role="main">
- <table class="zebra-striped bordered-table">
+ <table class="table table-striped table-bordered">
<thead>
<tr>
@@ -52,12 +52,12 @@
<g:sortableColumn property="description" title="${message(code: 'request.description.label', default: 'Description')}" />
- <g:sortableColumn property="status" title="${message(code: 'request.status.label', default: 'Status')}" />
-
<th><g:message code="request.assigned.label" default="Assigned" /></th>
<g:sortableColumn property="dateCreated" title="${message(code: 'request.dateCreated.label', default: 'Date Created')}" />
+ <g:sortableColumn property="lastUpdated" title="${message(code: 'request.lastUpdated.label', default: 'Last Updated')}" />
+
</tr>
</thead>
<tbody>
@@ -69,12 +69,12 @@
<td>${fieldValue(bean: requestInstance, field: "description")}</td>
- <td>${fieldValue(bean: requestInstance, field: "status")}</td>
-
<td>${fieldValue(bean: requestInstance, field: "assigned")}</td>
<td><g:formatDate date="${requestInstance.dateCreated}" /></td>
+ <td><g:formatDate date="${requestInstance.lastUpdated}" /></td>
+
</tr>
</g:each>
</tbody>
@@ -69,15 +69,6 @@
</g:if>
</div>
- <div class="row properties">
- <g:if test="${requestInstance?.status}">
- <div id="status-label" class="property-label span3"><g:message code="request.status.label" default="Status" />:</div>
-
- <div class="property-value span7" aria-labelledby="status-label"><g:fieldValue bean="${requestInstance}" field="status"/></div>
-
- </g:if>
- </div>
-
<div class="row properties">
<g:if test="${requestInstance?.assigned}">
<div id="assigned-label" class="property-label span3"><g:message code="request.assigned.label" default="Assigned" />:</div>
@@ -105,6 +96,15 @@
</g:if>
</div>
+ <div class="row properties">
+ <g:if test="${requestInstance?.status}">
+ <div id="status-label" class="property-label span3"><g:message code="request.status.label" default="Status" />:</div>
+
+ <div class="property-value span7" aria-labelledby="status-label"><g:fieldValue bean="${requestInstance}" field="status"/></div>
+
+ </g:if>
+ </div>
+
<g:form>
<fieldset class="buttons">
<g:hiddenField name="id" value="${requestInstance?.id}" />
@@ -10,10 +10,10 @@
<body>
<div class="container">
<div class="row">
- <div class="span4">
+ <div class="span3">
<h1><g:message code="default.list.label" args="[entityName]" /></h1>
</div>
- <div class="span12">
+ <div class="span8">
<g:if test="\${flash.message}">
<div class="alert-message info" role="status"><strong>\${flash.message}</strong></div>
</g:if>
@@ -30,19 +30,19 @@
</div>
<div class="row">
- <div class="sidebar span4">
+ <div class="sidebar span3">
<div class="well" role="navigation">
- <ul>
- <li><a class="home" href="\${createLink(uri: '/')}"><g:message code="default.home.label"/></a></li>
- <li><g:link class="create" action="create"><g:message code="default.new.label" args="[entityName]" /></g:link></li>
+ <ul class="nav nav-list">
+ <li><a class="home" href="\${createLink(uri: '/')}"><i class="icon-list"></i><g:message code="default.list.label" args="[entityName]"/></a></li>
+ <li><g:link class="create" action="create"><i class="icon-file"></i><g:message code="default.new.label" args="[entityName]" /></g:link></li>
</ul>
</div>
</div>
<div class="content">
<div class="row">
- <div class="span12">
+ <div class="span8">
<div id="list-${domainClass.propertyName}" class="content scaffold-list" role="main">
- <table class="zebra-striped bordered-table">
+ <table class="table table-striped table-bordered">
<thead>
<tr>
<% excludedProps = Event.allEvents.toList() << 'id' << 'version'
View
@@ -28,6 +28,18 @@ span.currentStep {
margin-left: 27%;
}
+.pagination span.currentStep {
+ color: #999;
+ cursor: default;
+ background-color: whiteSmoke;
+ float: left;
+ padding: 0 14px;
+ line-height: 34px;
+ text-decoration: none;
+ border: 1px solid #DDD;
+ border-left-width: 0;
+}
+
div.edit-properties.error > input { border-color: #E9322D; }
div.edit-properties.error > select { border-color: #E9322D; }
div.edit-properties.error > textarea { border-color: #E9322D; }
@@ -1,9 +1,5 @@
$(document).ready( function($) {
- $('#my-modal').modal({
- keyboard: true,
- backdrop: true
- });
});
if (typeof jQuery !== 'undefined') {

0 comments on commit 9867c52

Please sign in to comment.