Merge origin/develop into develop

Conflicts: mathmlcaneval-frontend/src/main/webapp/pages/formula_view.jsp
MIR-MU · Sep 14, 2014 · edb7e3a · edb7e3a
2 parents 9cb69b3 + 02c6227
commit edb7e3a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/mathmlcaneval-frontend/src/main/webapp/pages/canonicoutput_view.jsp b/mathmlcaneval-frontend/src/main/webapp/pages/canonicoutput_view.jsp
@@ -383,4 +383,4 @@
             <div class="moveMe"></div>
         </div> <!-- /container -->
     </tiles:putAttribute>
-</tiles:insertDefinition>
+</tiles:insertDefinition>
diff --git a/mathmlcaneval-frontend/src/main/webapp/pages/formula_view.jsp b/mathmlcaneval-frontend/src/main/webapp/pages/formula_view.jsp
@@ -162,6 +162,7 @@
                     </div>
                 </div>
             </div>
+
             <div class="row">
                 <div class="col-md-12">
                     <div class="panel panel-primary" >
@@ -177,16 +178,18 @@
                     </div>
                 </div>
             </div>
-
             <div class="row" id="formulaWindow">
                 <div class="col-md-12">
-                    <div class="panel panel-primary" >
+                    <div class="panel panel-primary">
+
                         <!-- Formula in MathML & rendered -->
                         <div class="panel-heading">
                             <spring:message code="entity.formula.xml" />
+
                             <div class="pull-right">
                                 <span class="glyphicon glyphicon-resize-full" id="resizeWindow"></span>
                             </div>
+
                         </div>
                         <div class="panel-body">
                             <pre class="brush: xml">
@@ -197,8 +200,8 @@
                 </div>
             </div>
 
-                            <!-- moveMe is for javascript to find next element which is moved when
-                            xml preview is set to page wide-->
+            <!-- moveMe is for javascript to find next element which is moved when
+            xml preview is set to page wide-->
             <div class="row moveMe">
                 <div class="col-md-12">
                     <div class="panel panel-primary">
@@ -259,4 +262,4 @@
         </div>
 
     </tiles:putAttribute>
-</tiles:insertDefinition>
+</tiles:insertDefinition>