Skip to content

Commit bba56db

Browse files
aubreyjaaubreyja
committed
Merge remote-tracking branch 'webwork2-dev/master' into bugmail
2 parents 5f4db04 + f297868 commit bba56db

File tree

161 files changed

+36686
-60
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

161 files changed

+36686
-60
lines changed

‎README‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎README.md‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
2+
3+
WeBWorK
4+
Online Homework Delivery System
5+
Version 2.5.0
6+
Branch: system/tags/rel-2-5-0/webwork2
7+
8+
http://webwork.maa.org/wiki/Release_notes_for_WeBWorK_2.5.0
9+
Copyright 2000-2011, The WeBWorK Project
10+
http://webwork.maa.org
11+
All rights reserved.
12+
13+
14+
##How to use this dev repo:
15+
Click fork webwork2-dev, all your future dev work will be done from your fork.
16+
17+
If you're using the commandline for git on your computer run these commands:
18+
19+
If you don't have a local repo yet:
20+
```
21+
git clone git@github.com:<your user name>/webwork2-dev.git
22+
```
23+
24+
If you already have a repo:
25+
__warning these commands will just merge it with you're currently checkedout branch!__
26+
27+
```
28+
git remote add webwork2-dev git://github.com/<your user name>/webwork2-dev.git
29+
git fetch webwork2-dev
30+
git merge webwork2-dev/master
31+
32+
```
33+
34+
fix whatever problems are present
35+
36+
make some changes
37+
38+
commit
39+
40+
`git push webwork2-dev master`
41+
42+
go to your github webwork2-dev fork and click pull request. Create a new pull request to openwebwork/webwork2-dev.

‎conf/templates/math3/lbtwo.template‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,5 +124,10 @@
124124
WeBWorK &#169; 2000-2007 <a href="http://openwebwork.sf.net/">The WeBWorK Project</a>
125125
</div>
126126
</footer>
127+
128+
<!--#if can="output_JS"-->
129+
<!--#output_JS-->
130+
<!--#endif-->
131+
127132
</body>
128133
</html>

‎htdocs/css/userlist.css‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
.Body{
2+
padding: 20px;
3+
}
4+
#users_table { border-collapse: collapse; border: 1px solid #CCB; width: 800px; }
5+
#users_table td, table.testgrid th { padding: 5px; border: 1px solid #E0E0E0; }
6+
#users_table th { background: #E5E5E5; text-align: left; font-size: 90%; }
7+
#users_table td {font-size: 90%;}

‎htdocs/js/apps/LibraryBrowser/docs/docco.css‎

Lines changed: 186 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,186 @@
1+
/*--------------------- Layout and Typography ----------------------------*/
2+
body {
3+
font-family: 'Palatino Linotype', 'Book Antiqua', Palatino, FreeSerif, serif;
4+
font-size: 15px;
5+
line-height: 22px;
6+
color: #252519;
7+
margin: 0; padding: 0;
8+
}
9+
a {
10+
color: #261a3b;
11+
}
12+
a:visited {
13+
color: #261a3b;
14+
}
15+
p {
16+
margin: 0 0 15px 0;
17+
}
18+
h1, h2, h3, h4, h5, h6 {
19+
margin: 0px 0 15px 0;
20+
}
21+
h1 {
22+
margin-top: 40px;
23+
}
24+
#container {
25+
position: relative;
26+
}
27+
#background {
28+
position: fixed;
29+
top: 0; left: 525px; right: 0; bottom: 0;
30+
background: #f5f5ff;
31+
border-left: 1px solid #e5e5ee;
32+
z-index: -1;
33+
}
34+
#jump_to, #jump_page {
35+
background: white;
36+
-webkit-box-shadow: 0 0 25px #777; -moz-box-shadow: 0 0 25px #777;
37+
-webkit-border-bottom-left-radius: 5px; -moz-border-radius-bottomleft: 5px;
38+
font: 10px Arial;
39+
text-transform: uppercase;
40+
cursor: pointer;
41+
text-align: right;
42+
}
43+
#jump_to, #jump_wrapper {
44+
position: fixed;
45+
right: 0; top: 0;
46+
padding: 5px 10px;
47+
}
48+
#jump_wrapper {
49+
padding: 0;
50+
display: none;
51+
}
52+
#jump_to:hover #jump_wrapper {
53+
display: block;
54+
}
55+
#jump_page {
56+
padding: 5px 0 3px;
57+
margin: 0 0 25px 25px;
58+
}
59+
#jump_page .source {
60+
display: block;
61+
padding: 5px 10px;
62+
text-decoration: none;
63+
border-top: 1px solid #eee;
64+
}
65+
#jump_page .source:hover {
66+
background: #f5f5ff;
67+
}
68+
#jump_page .source:first-child {
69+
}
70+
table td {
71+
border: 0;
72+
outline: 0;
73+
}
74+
td.docs, th.docs {
75+
max-width: 450px;
76+
min-width: 450px;
77+
min-height: 5px;
78+
padding: 10px 25px 1px 50px;
79+
overflow-x: hidden;
80+
vertical-align: top;
81+
text-align: left;
82+
}
83+
.docs pre {
84+
margin: 15px 0 15px;
85+
padding-left: 15px;
86+
}
87+
.docs p tt, .docs p code {
88+
background: #f8f8ff;
89+
border: 1px solid #dedede;
90+
font-size: 12px;
91+
padding: 0 0.2em;
92+
}
93+
.pilwrap {
94+
position: relative;
95+
}
96+
.pilcrow {
97+
font: 12px Arial;
98+
text-decoration: none;
99+
color: #454545;
100+
position: absolute;
101+
top: 3px; left: -20px;
102+
padding: 1px 2px;
103+
opacity: 0;
104+
-webkit-transition: opacity 0.2s linear;
105+
}
106+
td.docs:hover .pilcrow {
107+
opacity: 1;
108+
}
109+
td.code, th.code {
110+
padding: 14px 15px 16px 25px;
111+
width: 100%;
112+
vertical-align: top;
113+
background: #f5f5ff;
114+
border-left: 1px solid #e5e5ee;
115+
}
116+
pre, tt, code {
117+
font-size: 12px; line-height: 18px;
118+
font-family: Monaco, Consolas, "Lucida Console", monospace;
119+
margin: 0; padding: 0;
120+
}
121+
122+
123+
/*---------------------- Syntax Highlighting -----------------------------*/
124+
td.linenos { background-color: #f0f0f0; padding-right: 10px; }
125+
span.lineno { background-color: #f0f0f0; padding: 0 5px 0 5px; }
126+
body .hll { background-color: #ffffcc }
127+
body .c { color: #408080; font-style: italic } /* Comment */
128+
body .err { border: 1px solid #FF0000 } /* Error */
129+
body .k { color: #954121 } /* Keyword */
130+
body .o { color: #666666 } /* Operator */
131+
body .cm { color: #408080; font-style: italic } /* Comment.Multiline */
132+
body .cp { color: #BC7A00 } /* Comment.Preproc */
133+
body .c1 { color: #408080; font-style: italic } /* Comment.Single */
134+
body .cs { color: #408080; font-style: italic } /* Comment.Special */
135+
body .gd { color: #A00000 } /* Generic.Deleted */
136+
body .ge { font-style: italic } /* Generic.Emph */
137+
body .gr { color: #FF0000 } /* Generic.Error */
138+
body .gh { color: #000080; font-weight: bold } /* Generic.Heading */
139+
body .gi { color: #00A000 } /* Generic.Inserted */
140+
body .go { color: #808080 } /* Generic.Output */
141+
body .gp { color: #000080; font-weight: bold } /* Generic.Prompt */
142+
body .gs { font-weight: bold } /* Generic.Strong */
143+
body .gu { color: #800080; font-weight: bold } /* Generic.Subheading */
144+
body .gt { color: #0040D0 } /* Generic.Traceback */
145+
body .kc { color: #954121 } /* Keyword.Constant */
146+
body .kd { color: #954121; font-weight: bold } /* Keyword.Declaration */
147+
body .kn { color: #954121; font-weight: bold } /* Keyword.Namespace */
148+
body .kp { color: #954121 } /* Keyword.Pseudo */
149+
body .kr { color: #954121; font-weight: bold } /* Keyword.Reserved */
150+
body .kt { color: #B00040 } /* Keyword.Type */
151+
body .m { color: #666666 } /* Literal.Number */
152+
body .s { color: #219161 } /* Literal.String */
153+
body .na { color: #7D9029 } /* Name.Attribute */
154+
body .nb { color: #954121 } /* Name.Builtin */
155+
body .nc { color: #0000FF; font-weight: bold } /* Name.Class */
156+
body .no { color: #880000 } /* Name.Constant */
157+
body .nd { color: #AA22FF } /* Name.Decorator */
158+
body .ni { color: #999999; font-weight: bold } /* Name.Entity */
159+
body .ne { color: #D2413A; font-weight: bold } /* Name.Exception */
160+
body .nf { color: #0000FF } /* Name.Function */
161+
body .nl { color: #A0A000 } /* Name.Label */
162+
body .nn { color: #0000FF; font-weight: bold } /* Name.Namespace */
163+
body .nt { color: #954121; font-weight: bold } /* Name.Tag */
164+
body .nv { color: #19469D } /* Name.Variable */
165+
body .ow { color: #AA22FF; font-weight: bold } /* Operator.Word */
166+
body .w { color: #bbbbbb } /* Text.Whitespace */
167+
body .mf { color: #666666 } /* Literal.Number.Float */
168+
body .mh { color: #666666 } /* Literal.Number.Hex */
169+
body .mi { color: #666666 } /* Literal.Number.Integer */
170+
body .mo { color: #666666 } /* Literal.Number.Oct */
171+
body .sb { color: #219161 } /* Literal.String.Backtick */
172+
body .sc { color: #219161 } /* Literal.String.Char */
173+
body .sd { color: #219161; font-style: italic } /* Literal.String.Doc */
174+
body .s2 { color: #219161 } /* Literal.String.Double */
175+
body .se { color: #BB6622; font-weight: bold } /* Literal.String.Escape */
176+
body .sh { color: #219161 } /* Literal.String.Heredoc */
177+
body .si { color: #BB6688; font-weight: bold } /* Literal.String.Interpol */
178+
body .sx { color: #954121 } /* Literal.String.Other */
179+
body .sr { color: #BB6688 } /* Literal.String.Regex */
180+
body .s1 { color: #219161 } /* Literal.String.Single */
181+
body .ss { color: #19469D } /* Literal.String.Symbol */
182+
body .bp { color: #954121 } /* Name.Builtin.Pseudo */
183+
body .vc { color: #19469D } /* Name.Variable.Class */
184+
body .vg { color: #19469D } /* Name.Variable.Global */
185+
body .vi { color: #19469D } /* Name.Variable.Instance */
186+
body .il { color: #666666 } /* Literal.Number.Integer.Long */

0 commit comments

Comments
 (0)