Minor bug fixes in views. Modified CSS.

lykaios · Apr 26, 2012 · 2259b41 · 2259b41
1 parent 08c80f7
commit 2259b41
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 13 deletions.
diff --git a/app/assets/stylesheets/bootstrap_and_overrides.css.less b/app/assets/stylesheets/bootstrap_and_overrides.css.less
@@ -21,6 +21,12 @@ body {padding-top: 80px;
 body.index{
 	  text-align: center;
 }
+h3.error{
+	  text-align: center;
+}
+h4.error{
+	  text-align: center;
+}
 p.query-results{
 	  border-top: 2px; 
 	  border-bottom: 0px; 

diff --git a/app/controllers/sqlcons_controller.rb b/app/controllers/sqlcons_controller.rb
@@ -18,8 +18,9 @@ def index
   #@qstring = the query passed through params
   def fetchquery
   	#Save initial query so user doesn't see uid regulation	
-  	@qstring_init = params[:q].downcase 
-  	@qstring      = @qstring_init
+  	@qstring_init = params[:q].downcase
+	#Use strip to trim out the whitespace
+  	@qstring      = @qstring_init.strip
   	#Pull back regexp for the specific lesson
   	sectionregex = Sqlcons.select(:regtext).where(:ch => session[:tutch], :sec => session[:tutsec]).first.regtext
   	@qmodel      = Sqlcons.new(:id => 1, :qtext=> @qstring, :regtext => sectionregex)

diff --git a/app/views/sqlcons/show.html.erb b/app/views/sqlcons/show.html.erb
@@ -1,6 +1,6 @@
-<!-- 
+<!--
+Regtext = <%= @qmodel.regtext.to_s if @qmodel%> | Qtext = <%= @qstring if @qstring%> 
 -->
-<!-- Regtext = <%= @qmodel.regtext.to_s if @qmodel%> | Qtext = <%= @qstring if @qstring%> -->
 <!--Prints to screen the current tutorial view or error message-->
 <div class="span6">
 	<%= render :file => @lesson_name%>
@@ -25,7 +25,7 @@
   <% if @qresults %>
   <% unprint = [99] %>
   <% field_chk = 0 %>
-  <b><i><%= "Query Results"%></b></i>
+  <b><i><%="Query Results" if !@waserror%></b></i>
   <table >
 	<% qfields = @qresults.fields%>
 	<tr>

diff --git a/app/views/sqlcons/tutorials/qerror.html b/app/views/sqlcons/tutorials/qerror.html
@@ -1,4 +1,2 @@
-<body class="index">
-<h3> Your query didn't match this lessons statement. </h3>
-<h4> Check the spelling of your query, or stop trying SQL injection </h4>
-</body>
+<h3 class="error"> Your query didn't match this lessons statement. </h3>
+<h4 class="error"> Check the spelling of your query, or stop trying SQL injection </h4>
diff --git a/app/views/sqlcons/tutorials/sqlerror.html b/app/views/sqlcons/tutorials/sqlerror.html
@@ -1,3 +1 @@
-<body class="index">
-<h3> SQL Error (see below)</h3>
-</body>
+<h3 class="error"> SQL Error (see below)</h3>
diff --git a/db/seeds.rb b/db/seeds.rb
@@ -15,7 +15,7 @@
 Sqlcons.create(ch: 2,sec:  2,regtext: '(select)(.*?)(course_fcts)(.*?)(join)(.*?)');
 Sqlcons.create(ch: 2,sec:  3,regtext: '(select)(.*?)(students)(.*?)(left join)(.*?)');
 Sqlcons.create(ch: 2,sec:  4,regtext: '(select)(.*?)(teachers)(.*?)(left join)(.*?)');
-Sqlcons.create(ch: 2,sec:  5,regtext: '(select)(.*?)(teachers)(.*?)(right join)(.*?)');
+Sqlcons.create(ch: 2,sec:  5,regtext: '(select)(.*?)(course_fcts)(.*?)(right join)(.*?)');
 
 #Chapter 3
 Sqlcons.create(ch: 3,sec: 1,regtext: '(insert|select)(.*?)(students)');