Skip to content

T
trs
Commit 995dc123 authored by Taddeus Kroes's avatar Taddeus Kroes
Browse files
Options

Merge branch 'feature/bootstrap' into develop

parents a1b82033 0a99224b
Expand all Show whitespace changes
Inline Side-by-side
Showing with 664 additions and 292 deletions
TODO
View file @ 995dc123
...@@ -48,3 +48,5 @@ ...@@ -48,3 +48,5 @@
- frontend: replace 'dx' with '(dx)' with regex before sending to parser - frontend: replace 'dx' with '(dx)' with regex before sending to parser
- "sin^2 x" is supported by parser, but not yet by line printer. - "sin^2 x" is supported by parser, but not yet by line printer.
- Multiple integrals -> use different constant names (e.g. C and D instead of 2C)
src/frontend/css/editor.css
View file @ 995dc123
html {
background-color: #ccddef;
margin: 0;
padding: 0;
}
body { body {
margin: 0; padding-top: 40px;
padding: 20px; background-color: #f9f9f9;
font: 16px/24px Verdana, Arial, sans;
} }
#loader { .alert {
background: url(/static/img/load.gif) no-repeat scroll 0 0 transparent;
height: 31px;
width: 31px;
display: none; display: none;
position: absolute; margin: 10px 0 0;
margin-top: -5px;
margin-left: 16px;
}
.panel {
background-color: #fff;
border: 3px solid #bbb;
cursor: text;
min-height: 400px;
padding-bottom: 10px;
position: absolute;
top: 58px;
width: 47%;
} }
.alert strong {
#error { margin-right: 8px;
/*display: none;*/
font-size: 12px;
clear: both;
margin-top: 20px;
position: absolute;
} }
#input { .math-input {
float: left; width: 436px !important;
left: 2%; min-height: 314px;
padding: 7px 11px;
line-height: 26px;
overflow: hidden;
resize: none;
} }
#input textarea { .pretty-print {
width: 100%; background-color: #fff;
border: 0; border-color: #ccc;
margin: 0; min-height: 300px;
padding: 0; padding: 14px 19px;
height: 388px;
overflow-y: visible;
font: 16px/24px Verdana, Arial, sans;
outline: 0;
} }
.box { .box, .hint {
padding: 10px 15px 0 15px; position: relative;
margin: 5px 0;
padding-left: 20px;
} }
#math { .label, .icon {
float:right; position: absolute;
right: 2%; top: 50%;
} }
.label {
#math .box { margin-top: -9px;
padding: 10px 15px 0 40px; left: -8px;
background: no-repeat scroll 15px 13px transparent;
} }
.icon {
#math .box.correct { margin-top: -8px;
background-image: url(/static/img/tick.png); left: 0;
} }
#math .box.wrong { .current-line {
background-image: url(/static/img/cross.png); border-right: 3px solid #ddd;
} }
#math .box.no-progress { .credits {
background-image: url(/static/img/error.png); text-align: center;
font-size: 13px;
} }
#math .hint { #loader {
padding: 10px 15px 0 40px; display: inline-block;
background: url(/static/img/info.png) no-repeat scroll 15px 13px transparent; visibility: hidden;
color: #666; position: relative;
font-size: 14px; background: url(/static/img/load.gif) no-repeat;
line-height: 20px; height: 16px;
width: 16px;
top: 8px;
margin-left: 10px;
} }
#math .hint .MathJax { .popover {
color: #000; z-index: 1500;
white-space: normal;
color: #333;
} }
#control-buttons { .popover-content {
height: 21px; font-size: 14px;
left: 2%;
line-height: 0;
margin-bottom: 16px;
position: absolute;
vertical-align: top;
} }
.separator { .popover-title span {
border-right: 1px solid #999; font-size: 18px;
margin-top: 6px;
display: inline-block; display: inline-block;
width: 0;
height: 21px;
margin: 1px 5px;
vertical-align: top;
} }
.panel .label { .popover-title .btn-group {
background-color: #fff; float: right;
border: 1px solid #ccc; margin-right: -6px;
clear: both;
float: left;
font-size: 10px;
line-height: 14px;
margin-left: 4px;
margin-top: -12px;
padding: 2px;
} }
/* Codemirror should not resize the input area. */ .clear {
/* clear: both;
.CodeMirror-scroll {
height: auto;
overflow: visible;
}
.CodeMirror-lines {
padding: 0 !important;
}
*/
#credits {
clear both;
left: 0;
right: 0;
bottom: 0;
position: fixed;
font-size: 10px;
color: #666;
text-align: center;
} }
src/frontend/js/docs.js 0 → 100644
View file @ 995dc123
(function($, undefined) {
})(jQuery);
src/frontend/js/editor.js
View file @ 995dc123
This diff is collapsed.
src/frontend/js/examples.js 0 → 100644
View file @ 995dc123
This diff is collapsed.
src/frontend/tpl/docs.html 0 → 100644
View file @ 995dc123
<!DOCTYPE HTML>
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<title>Mathematical term rewriting frontend</title>
<link rel="stylesheet" href="/static/frontend/css/editor.css">
<link rel="stylesheet" href="/static/bootstrap/css/bootstrap.min.css">
</head>
<body>
<div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<a class="brand" href="">Mathematical Term Rewriting</a>
<ul class="nav">
<li><a href="index.html">Editor</a></li>
<li><a href="index.html?t=0">Tutorial</a></li>
<li class="dropdown">
<a href="#" data-toggle="dropdown" class="dropdown-toggle">
Examples <b class="caret"></b>
</a>
<ul class="dropdown-menu">
<li><a href="index.html?t=1">Validation &amp; hints</a></li>
<li><a href="index.html?t=2">Steps</a></li>
<li><a href="index.html?t=3">Direct answer</a></li>
</ul>
</li>
<li class="active"><a href="docs.html">Documentation</a></li>
</ul>
</div>
</div>
</div>
<div class="container">
</div>
<script type="text/javascript" src="/static/js/jquery-1.8.2.min.js"></script>
<script type="text/javascript" src="/static/bootstrap/js/bootstrap.min.js"></script>
<script type="text/javascript" src="/static/frontend/js/docs.js"></script>
</body>
</html>
src/frontend/tpl/editor.html
View file @ 995dc123
...@@ -3,33 +3,75 @@ ...@@ -3,33 +3,75 @@
<head> <head>
<meta http-equiv="content-type" content="text/html; charset=utf-8"> <meta http-equiv="content-type" content="text/html; charset=utf-8">
<title>Mathematical term rewriting frontend</title> <title>Mathematical term rewriting frontend</title>
<script type="text/javascript" src="/static/js/jquery-1.8.2.min.js"></script> <link rel="stylesheet" href="/static/bootstrap/css/bootstrap.min.css">
<script type="text/javascript"
src="/static/external/mathjax/MathJax.js?config=AM_HTMLorMML-full"></script>
<link rel="stylesheet" href="/static/frontend/css/editor.css"> <link rel="stylesheet" href="/static/frontend/css/editor.css">
</head> </head>
<body> <body>
<div id="control-buttons"><button onclick=window.clear_input()>clear</button><div class="separator"></div><button onclick=window.validate_input()>validate</button><button onclick=window.hint_input()>hint</button><button onclick=window.step_input()>step</button><button onclick=window.answer_input()>answer</button><div id="loader"></div></div> <div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<a class="brand" href="">Mathematical Term Rewriting</a>
<ul class="nav">
<li class="active"><a href="index.html">Editor</a></li>
<li><a id="tutorial" href="#">Tutorial</a></li>
<li class="dropdown" id="examples">
<a href="#" data-toggle="dropdown" class="dropdown-toggle">
Examples <b class="caret"></b>
</a>
<ul class="dropdown-menu">
<li><a href="#">Validation &amp; hints</a></li>
<li><a href="#">Steps</a></li>
<li><a href="#">Direct answer</a></li>
</ul>
</li>
<li><a href="docs.html">Documentation</a></li>
</ul>
</div>
</div>
</div>
<div id="error"></div> <div class="container">
<div id="error" class="alert alert-error">
<button type="button" class="close">&times;</button>
<strong>Error</strong> <span class="text"></span>
</div>
<div id="input" class="panel"> <div class="row">
<div class="label">Input view</div> <div class="span12">
<div class="box"> <div class="btn-toolbar">
<textarea id="MathInput"></textarea> <button id="btn-clear" class="btn">clear</button>
<div class="btn-group">
<button id="btn-validate" class="btn btn-info">validate</button>
<button id="btn-hint" class="btn btn-info">hint</button>
<button id="btn-step" class="btn btn-info">step</button>
</div>
<button id="btn-answer" class="btn">answer</button>
<div id="loader"></div>
</div>
</div> </div>
</div> </div>
<div id="math" class="panel"> <div class="row">
<div class="label">Math view</div> <div class="span6">
<textarea id="math-input" class="span6 math-input"></textarea>
</div>
<div class="span6">
<div id="pretty-print" class="well pretty-print"></div>
</div>
</div> </div>
<div id="credits">Idea and feedback by <a <div class="row">
href="http://homepages.cwi.nl/~apt/" target=_window>Prof.dr. <div class="span12 credits">
K.R. Apt</a>, implementation by Taddeüs Kroes and <a Idea and feedback by <a href="http://homepages.cwi.nl/~apt/" target="_blank">Prof.dr. Krzysztof R. Apt</a>,
href="http://smvv.kompiler.org" target=_window>Sander van implementation by Tadde&uuml;s Kroes and <a href="http://smvv.kompiler.org" target="_blank">Sander van Veen</a>.
Veen</a>. </div> </div>
</div>
</div>
<script type="text/javascript" src="/static/js/jquery-1.8.2.min.js"></script>
<script type="text/javascript" src="/static/bootstrap/js/bootstrap.min.js"></script>
<script type="text/javascript" src="/static/external/mathjax/MathJax.js?config=AM_HTMLorMML-full"></script>
<script type="text/javascript" src="/static/frontend/js/editor.js"></script> <script type="text/javascript" src="/static/frontend/js/editor.js"></script>
<script type="text/javascript" src="/static/frontend/js/examples.js"></script>
</body> </body>
</html> </html>
static/bootstrap/css/bootstrap.min.css 0 → 100644
View file @ 995dc123
This diff is collapsed.
static/bootstrap/js/bootstrap.min.js 0 → 100644
View file @ 995dc123
This diff is collapsed.
static/img/load.gif
View replaced file @ a1b82033 View file @ 995dc123
static/img/load.gif

2.55 KB | W: | H:

static/img/load.gif

1.7 KB | W: | H:

static/img/load.gif
static/img/load.gif
static/img/load.gif
static/img/load.gif
  • 2-up
  • Swipe
  • Onion skin
tests/rules.mk
View file @ 995dc123
...@@ -15,7 +15,7 @@ TGT_DIR := $(TGT_DIR) $(PROFILER_OUTPUT_DIR) ...@@ -15,7 +15,7 @@ TGT_DIR := $(TGT_DIR) $(PROFILER_OUTPUT_DIR)
.PHONY: test coverage $(TESTS) .PHONY: test coverage $(TESTS)
test: $(TESTS) build/external/pybison test: $(TESTS)
ifeq ($(findstring python-coverage,$(wildcard /usr/bin/*)), python-coverage) ifeq ($(findstring python-coverage,$(wildcard /usr/bin/*)), python-coverage)
coverage: ${COVERAGE} build coverage: ${COVERAGE} build
...@@ -42,7 +42,8 @@ ${COVERAGE}: ...@@ -42,7 +42,8 @@ ${COVERAGE}:
@echo "Install package 'python-coverage' to generate a coverage report." @echo "Install package 'python-coverage' to generate a coverage report."
@echo "On Debian/Ubuntu use: sudo apt-get install python-coverage"; false @echo "On Debian/Ubuntu use: sudo apt-get install python-coverage"; false
$(TESTS): build/external/pybison; @python -m external.testrunner $@ $(TESTS): build
@python -m external.testrunner $@
profile-test-%: $(PROFILER_OUTPUT_DIR) build profile-test-%: $(PROFILER_OUTPUT_DIR) build
python -m cProfile -s cumulative \ python -m cProfile -s cumulative \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment