Commit Graph

77 Commits

Author SHA1 Message Date
Kyle Fiedler
6244031ce4 close wiki design branch
--HG--
branch : kf-wiki
extra : close : 1
2012-01-11 12:20:36 -05:00
Kyle Fiedler
d5de197d5f merged in default
--HG--
branch : kf-wiki
2012-01-11 12:12:53 -05:00
Kyle Fiedler
741d174189 Added structure and style for most of the wiki
--HG--
branch : kf-wiki
2012-01-11 11:33:18 -05:00
Piotr Mitros
c99d1035d0 Saving schematics works 2012-01-10 22:42:14 -05:00
Piotr Mitros
fc81719a87 Refactor for new capa question/answer framework 2012-01-10 21:48:42 -05:00
Bridger Maxwell
680e3da1dc Getting simplewiki search to work. 2012-01-10 14:13:06 -05:00
Kyle Fiedler
61a713f2c2 Changed some style for the courseware, fixed the footer links and fixed the modal window 2012-01-09 16:56:22 -05:00
Kyle Fiedler
8b29b15351 Merged courseware branch 2012-01-09 15:14:01 -05:00
Kyle Fiedler
76b4f6467a Added more style for problems and acordion
--HG--
branch : kf-courseware
2012-01-09 14:48:55 -05:00
Kyle Fiedler
1fc4ab7d08 Merged in default
--HG--
branch : kf-courseware
2012-01-09 11:54:13 -05:00
Kyle Fiedler
fceb44ea80 Fix spelling on readme and edit some css
--HG--
branch : kf-courseware
2012-01-09 11:50:52 -05:00
Bridger Maxwell
c217432ab3 Changed simplewiki templates to inherit from main.html and have standard navigation, footer, etc. 2012-01-09 11:44:15 -05:00
Bridger Maxwell
2202ec0931 Merged Mako simplewiki templates 2012-01-09 10:02:24 -05:00
Bridger Maxwell
67fc2586e5 Fixed bugs in templates. Now working as they were originally, but with Mako. 2012-01-08 04:53:22 -05:00
Bridger Maxwell
4ca87c445b Converting SimpleWiki pages to Mako templates. Moving them to templates. Some bugs remain. 2012-01-08 02:20:48 -05:00
Kyle Fiedler
784071573f merged kf-refactor into default 2012-01-06 16:37:46 -05:00
Kyle Fiedler
512381bdd1 Fixed merge confilcts, hopefully
--HG--
branch : kf-refactor
2012-01-06 16:32:51 -05:00
Kyle Fiedler
63ad756a2d Added style for video and sequence
--HG--
branch : kf-refactor
2012-01-06 15:38:21 -05:00
Kyle Fiedler
170f81a487 More style for the textbook page and various style fixes
--HG--
branch : kf-refactor
2012-01-06 13:19:57 -05:00
Piotr Mitros
a0abfe178d Feedback text a bit better. Window clears when submitted 2012-01-06 09:53:33 -05:00
Piotr Mitros
4c7da227a3 Feedback button works 2012-01-05 22:09:51 -05:00
Kyle Fiedler
b98d833762 Added some slight style and new typeface
--HG--
branch : kf-refactor
2012-01-05 21:39:55 -05:00
Kyle Fiedler
47bc1b8a68 Added more to the sass readme
--HG--
branch : kf-refactor
2012-01-05 20:40:27 -05:00
Piotr Mitros
3c95aabbd7 Feedback e-mail template 2012-01-05 20:29:07 -05:00
Piotr Mitros
af7167dbbe Working calculator 2012-01-05 20:28:14 -05:00
Kyle Fiedler
88a3a69c71 added a bunch more overall style
--HG--
branch : kf-refactor
2012-01-05 20:27:07 -05:00
Piotr Mitros
f25219cb74 Login page has 'Remember Me' 2012-01-05 14:28:54 -05:00
Kyle Fiedler
ba557aefae Added layout for courseware, textbooks and profile
--HG--
branch : kf-refactor
2012-01-05 12:17:22 -05:00
Piotr Mitros
e5a2c72123 Wiki now supports circuits, modulo bugs 2012-01-04 19:01:56 -05:00
Kyle Fiedler
2ffe64dc3c Added sass files and readme for generation
--HG--
branch : kf-refactor
2012-01-04 14:36:10 -05:00
Kyle Fiedler
340f4ffca4 Cleaned markup up more
--HG--
branch : kf-refactor
2012-01-04 11:14:37 -05:00
Kyle Fiedler
57a3005f71 Refactored html for navigation
--HG--
branch : kf-refactor
2012-01-03 17:01:48 -05:00
kylefiedler
8c757e1ec5 Started to refactor html
--HG--
branch : kf-refactor
2012-01-03 16:48:12 -05:00
Piotr Mitros
95a52a08c3 Fixed show_answer 2012-01-02 17:04:04 -05:00
Piotr Mitros
081bdd92af GET -> POST 2012-01-02 08:00:15 -05:00
Piotr Mitros
844d506e46 Minor changes to text 2012-01-01 23:27:30 -05:00
Piotr Mitros
ca535dc90a More logging, typo fixes 2012-01-01 23:00:22 -05:00
Piotr Mitros
20e0bdef9f Backup files not tracked 2012-01-01 19:28:26 -05:00
Piotr Mitros
373221f273 cjt fixed schematic bug. Back in the system 2012-01-01 19:24:32 -05:00
Piotr Mitros
7003ff6268 Added help page. Commented out schematic due to bug 2012-01-01 12:49:29 -05:00
Piotr Mitros
548d0491c3 Slight layout changes. Addition of trakcing. 2012-01-01 06:28:45 -05:00
Piotr Mitros
858d4fae59 Standard video size now. 2011-12-31 11:42:44 -05:00
Piotr Mitros
84c81dcaf0 Ugly big video player 2011-12-31 11:39:14 -05:00
Piotr Mitros
b198ee0bf6 Wiki integrated 2011-12-30 07:01:21 -05:00
Piotr Mitros
8ec9e41429 Bug fix 2011-12-29 16:44:04 -05:00
Piotr Mitros
dddc90aeac New textbook format 2011-12-29 16:37:57 -05:00
Piotr Mitros
bd657f5d6b Book TOC works 2011-12-29 15:46:22 -05:00
Piotr Mitros
c99ff280ab Textbook browser, try 2 2011-12-29 09:52:34 -05:00
Piotr Mitros
de3e72596e Textbook browser 2011-12-29 09:51:48 -05:00
Piotr Mitros
28dd8ef6b5 Testing deploy scripts 2011-12-28 17:24:59 -05:00