Commit Graph

131 Commits

Author SHA1 Message Date
Bridger Maxwell
38a9631659 Updated to use django-wiki with significantly less sql queries. 2012-08-19 17:37:58 -04:00
Bridger Maxwell
1e08164db5 Added MathJax to wiki pages. 2012-08-18 13:12:04 -04:00
Bridger Maxwell
0598a471c1 Wiki menu no longer shows edit for users who can't edit. Changed template to mako for convenience. 2012-08-18 12:22:50 -04:00
Bridger Maxwell
3fc59b3da5 Added javascript groups to wiki preview modal so circuits show up. 2012-08-18 00:17:20 -04:00
Tom Giannattasio
a2d0ada82c styled settings page 2012-08-17 17:01:45 -04:00
Tom Giannattasio
1bd790fabb finished attachment styles 2012-08-17 16:46:40 -04:00
Tom Giannattasio
c253474297 added modal functionality for attachments page 2012-08-17 15:59:31 -04:00
Tom Giannattasio
411fcfd0cd Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki 2012-08-17 14:50:44 -04:00
Tom Giannattasio
1411c0e066 started tweaking upload interface 2012-08-17 14:50:40 -04:00
Bridger Maxwell
b05bace12a Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki
Conflicts:
	lms/templates/wiki/base.html
2012-08-17 14:48:06 -04:00
Tom Giannattasio
e96a5fcbee started attachments rework 2012-08-17 14:44:27 -04:00
Bridger Maxwell
8595cb24b2 Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki
Conflicts:
	lms/templates/wiki/base.html
2012-08-17 14:44:25 -04:00
Tom Giannattasio
f67a356466 added additional bootstrap js files 2012-08-17 14:14:07 -04:00
Tom Giannattasio
b5b5978130 started styling attachments page 2012-08-17 13:32:40 -04:00
Tom Giannattasio
ad45a44a7c added bootstrap js and other dependencies; tweaked settings template 2012-08-17 09:37:42 -04:00
Bridger Maxwell
df79f84c33 Fixed static includes in wiki django templates. 2012-08-16 19:41:04 -04:00
Tom Giannattasio
490eb7a32b styled changes, new article and delete pages 2012-08-16 17:31:05 -04:00
Tom Giannattasio
bb6d6d9ac8 edit page styles 2012-08-16 16:41:41 -04:00
Bridger Maxwell
d064d29cd8 Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki 2012-08-15 23:01:27 -04:00
Bridger Maxwell
2b29c95266 Added template for inline preview. 2012-08-15 21:47:26 -04:00
Bridger Maxwell
48e9dc8031 Added bootstrap-modal for the wiki preview modals. 2012-08-15 20:07:05 -04:00
Tom Giannattasio
13c2bb588e added styles for main article, sidebar and breadcrumb 2012-08-15 15:59:46 -04:00
Tom Giannattasio
abf26dced9 started styles 2012-08-15 13:10:47 -04:00
Bridger Maxwell
85f1899cb6 Wiki pages can now be viewed from the course URL and the course nav is shown. It doesn't follow the user yet. 2012-08-14 17:15:44 -04:00
Bridger Maxwell
c8fc7bed3e Small template change. 2012-08-14 08:39:19 -04:00
Bridger Maxwell
66d1259d4b Created copy of main.html that is django template. Using this for wiki instead of converting every view. 2012-08-13 19:07:41 -04:00
Bridger Maxwell
0a9ad1a5f9 Added settings template. 2012-08-13 16:42:57 -04:00
Bridger Maxwell
ff1a0ba274 Added wiki create and create_root. Fixed some mitxmako bugs. 2012-08-13 14:25:11 -04:00
Bridger Maxwell
e462fad367 Converted wiki edit page and breadcrumbs. 2012-08-10 18:15:21 -04:00
Bridger Maxwell
3f4c4d7487 Got most of the wiki article page working. It shows the article menu now. 2012-08-10 14:46:53 -04:00
Bridger Maxwell
45baccae85 Added a django template loader that can return Mako templates. Started pulling in new wiki. 2012-08-10 11:31:29 -04:00