Merge branch 'feature/codemirror' into develop

aws-dc-21 · Nov 12, 2013 · f654d62 · f654d62
2 parents cab9685 + 92f48b1
commit f654d62
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 17 deletions.
diff --git a/Gemfile b/Gemfile
@@ -7,6 +7,7 @@ gem 'uglifier', '>= 1.3.0'
 gem 'jquery-rails'
 gem 'jbuilder', '~> 1.2'
 gem 'simple_form'
+gem 'codemirror-rails'
 
 group :doc do
   gem 'sdoc', require: false

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -39,6 +39,8 @@ GEM
     bootstrap-sass (2.3.2.2)
       sass (~> 3.2)
     builder (3.1.4)
+    codemirror-rails (3.16)
+      railties (>= 3.0, < 5)
     diff-lcs (1.2.5)
     dotenv (0.9.0)
     dotenv-rails (0.9.0)
@@ -142,6 +144,7 @@ DEPENDENCIES
   activerecord-jdbcmysql-adapter (= 1.3.0)
   activerecord-jdbcsqlite3-adapter
   bootstrap-sass (~> 2.3.2.0)
+  codemirror-rails
   dotenv-rails
   jbuilder (~> 1.2)
   jquery-rails

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -13,4 +13,17 @@
 //= require jquery
 //= require jquery_ujs
 //= require bootstrap
+//= require codemirror
+//= require codemirror/modes/sql
 //= require_tree .
+
+$(function() {
+  window.editor = CodeMirror.fromTextArea($('#run_query_sql')[0], {
+    mode: 'text/x-sql',
+    indentWithTabs: true,
+    smartIndent: true,
+    lineNumbers: true,
+    matchBrackets : true,
+    autofocus: true
+  });
+});
diff --git a/app/assets/stylesheets/application.css → app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css → app/assets/stylesheets/application.css.scss
@@ -9,6 +9,11 @@
  * compiled file, but it's generally better to create a new file per style scope.
  *
  *= require_self
+ *= require codemirror
  *= require_tree .
  */
 @import "bootstrap";
+
+body {
+  padding-top: 40px;
+}
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -1,14 +1,17 @@
 <!DOCTYPE html>
 <html>
-<head>
+  <head>
-  <title>DonorsChoose</title>
+    <title>DonorsChoose</title>
-  <%= stylesheet_link_tag    "application", media: "all" %>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <%= javascript_include_tag "application" %>
+    <%= stylesheet_link_tag    "application", media: "all" %>
-  <%= csrf_meta_tags %>
+    <%= javascript_include_tag "application" %>
-</head>
+    <%= csrf_meta_tags %>
-<body>
+  </head>
-
+  <body>
-<%= yield %>
+    <div class="container-fluid">
-
+      <div class="row-fluid">
-</body>
+        <%= yield %>
+      </div>
+    </div>
+  </body>
 </html>
diff --git a/app/views/run_queries/_form.html.erb b/app/views/run_queries/_form.html.erb
@@ -2,7 +2,7 @@
   <%= f.error_notification %>
 
   <div class="form-inputs">
-    <%= f.input :sql %>
+    <%= f.input :sql, :as => :text, :input_html => { :cols => 80, :rows => 10 } %>
   </div>
 
   <div class="form-actions">

diff --git a/app/views/run_queries/new.html.erb b/app/views/run_queries/new.html.erb
@@ -1,5 +1,5 @@
-<h1>New run_query</h1>
+<div class="span12">
-
+  <div class="well">
-<%= render 'form' %>
+    <%= render 'form' %>
-
+  </div>
-<%= link_to 'Back', run_queries_path %>
+</div>
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
@@ -1,4 +1,8 @@
 en:
+  helpers:
+    submit:
+      run_query:
+        create: "Run Query"
   simple_form:
     "yes": 'Yes'
     "no": 'No'