Skip to content

Instantly share code, notes, and snippets.

@Chris927

Chris927/demo.diff

Created April 23, 2012 15:51
Show Gist options
  • Save Chris927/2471811 to your computer and use it in GitHub Desktop.
Save Chris927/2471811 to your computer and use it in GitHub Desktop.
Download ZIP
Diff of the code changes we did in last week's session
Raw
demo.diff
diff --git a/grails-app/views/layouts/main.gsp b/grails-app/views/layouts/main.gsp
index 4e70434..8d3dcae 100644
--- a/grails-app/views/layouts/main.gsp
+++ b/grails-app/views/layouts/main.gsp
@@ -12,14 +12,23 @@
<link rel="shortcut icon" href="${resource(dir: 'images', file: 'favicon.ico')}" type="image/x-icon">
<link rel="apple-touch-icon" href="${resource(dir: 'images', file: 'apple-touch-icon.png')}">
<link rel="apple-touch-icon" sizes="114x114" href="${resource(dir: 'images', file: 'apple-touch-icon-retina.png')}">
+ <link rel="stylesheet" href="/todo/css/bootstrap.css" />
<!-- <link rel="stylesheet" href="${resource(dir: 'css', file: 'main.css')}" type="text/css"> -->
<!-- <link rel="stylesheet" href="${resource(dir: 'css', file: 'mobile.css')}" type="text/css"> -->
<g:layoutHead/>
<r:layoutResources />
</head>
<body>
- <div id="grailsLogo" role="banner"><a href="http://grails.org"><img src="${resource(dir: 'images', file: 'grails_logo.png')}" alt="Grails"/></a></div>
+ <div class="container-fluid">
+ <div class="row">
+ <div class="span6">
<g:layoutBody/>
+ </div>
+ <div class="span4">
+ here some ads or twitter feeds or whatever else
+ </div>
+ </div>
+ </div>
<div class="footer" role="contentinfo"></div>
<div id="spinner" class="spinner" style="display:none;"><g:message code="spinner.alt" default="Loading&hellip;"/></div>
<g:javascript library="application"/>
diff --git a/grails-app/views/task/create.gsp b/grails-app/views/task/create.gsp
index fc27d40..5c272fa 100644
--- a/grails-app/views/task/create.gsp
+++ b/grails-app/views/task/create.gsp
@@ -30,7 +30,7 @@
<g:render template="form"/>
</fieldset>
<fieldset class="buttons">
- <g:submitButton name="create" class="save" value="${message(code: 'default.button.create.label', default: 'Create')}" />
+ <g:submitButton name="create" class="btn btn-primary" value="${message(code: 'default.button.create.label', default: 'Create')}" />
</fieldset>
</g:form>
</div>
diff --git a/grails-app/views/task/edit.gsp b/grails-app/views/task/edit.gsp
index a258138..1978826 100644
--- a/grails-app/views/task/edit.gsp
+++ b/grails-app/views/task/edit.gsp
@@ -33,8 +33,8 @@
<g:render template="form"/>
</fieldset>
<fieldset>
- <g:actionSubmit action="update" value="${message(code: 'default.button.update.label', default: 'Update')}" />
- <g:actionSubmit action="delete" value="${message(code: 'default.button.delete.label', default: 'Delete')}" formnovalidate="" onclick="return confirm('${message(code: 'default.button.delete.confirm.message', default: 'Are you sure?')}');" />
+ <g:actionSubmit class="btn btn-primary" action="update" value="${message(code: 'default.button.update.label', default: 'Update')}" />
+ <g:actionSubmit class="btn btn-danger" action="delete" value="${message(code: 'default.button.delete.label', default: 'Delete')}" formnovalidate="" onclick="return confirm('${message(code: 'default.button.delete.confirm.message', default: 'Are you sure?')}');" />
</fieldset>
</g:form>
</div>
diff --git a/grails-app/views/task/list.gsp b/grails-app/views/task/list.gsp
index 4c8c88e..895ac73 100644
--- a/grails-app/views/task/list.gsp
+++ b/grails-app/views/task/list.gsp
@@ -19,7 +19,7 @@
<g:if test="${flash.message}">
<div role="status">${flash.message}</div>
</g:if>
- <table>
+ <table class="table table-striped table-bordered table-condensed">
<thead>
<tr>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment