From c17ca29a290db09a46360c4ccbc3f4e93089d398 Mon Sep 17 00:00:00 2001 From: Bridger Maxwell Date: Wed, 25 Jan 2012 19:26:54 -0500 Subject: [PATCH 1/2] Added editing instructions on the wiki edit page. --- .DS_Store | Bin 6148 -> 12292 bytes sass/.DS_Store | Bin 6148 -> 6148 bytes sass/_wiki.scss | 27 ++++++++++++++++++++++++++- simplewiki_edit.html | 30 +++++++++++++++++++++++++++--- 4 files changed, 53 insertions(+), 4 deletions(-) diff --git a/.DS_Store b/.DS_Store index 5a0cb2b53d4d5186eaa5877d80e607dba3b6c8d0..a630216fad2b616b683bda11c2b2e6803e0fb4f3 100644 GIT binary patch literal 12292 zcmeHMTWl0n7(U;&(3vtLQ=qg+!KIDTz=Ca4?ijYqmP>`u(3TdcF0(sRI&r$w?98@k zsZ=yEG1l7?i7{THKA?#{pb{@n#!G?^UWf_AC($<}Ci0-Z=zr$SmeSfMi6MGUa?XFw ze>si0+9y^a+OW{ldgvDTKBM7+6m<9H%Iwz;`E5#O+7 z%lNpeDys3gQeD4(`<`y|pKyLQ)Tdo#wO5yu`qFdR5u-alj)e3BVsp-%_foAdIW1)JM5Mpe#qb4Aw->^9f! zavrk%-kj$ahw?u6&J{e@?eu(yPjk30uulZsXO^k&i0>7Gonc_cFp9o?(55+^5j#yY z`+W{A$pa0j%GrgrcQiDvYuU6ddC{m^v{303Euk8|+Wi0#L4@9|H7kat_PA!&c7>`{+o%}#s=XruQK78Xwkm2L zQFMql>kHjI`VPhTT)CewywCK51H*Qn)?QrIwk%br>(`HXn0vHYmTf6YL+QddBpXF{ zN~1O;nQ~d@d{qW zYdD9G@EN|s*Z2nC;Ya+8t72!d5{ElV=MWOVk(|!q=vIuqJ_m>Q?Cn^p?Yo6Jd}$$P z?vm=IHMOhmTHCZ?>yGxR>p$a?Pp4kUHbJM5W+fVhw4TY`<#j7oYI+Z`(LOQrz9=!@ zsNi>nLX=xxSKpxP2Irg@u5P4ZjP40BOsvy2ql_4@hR)3`nr_S^atrImO`2wu6Z?gA z+jg?fC!Uivxx6j4Qq#l^rq*SV=YmFEQ`9Mz{sZ1#Al6h;_Nec7SG{%ynq++60!Fz z-o|;nj}P!6KEbEN;V*Fs-{Z;*_U@m--k)w9%hAn8piE3z%k%&Cxqtt^`3uV#B?1zG zTLuA?r@PWA+D_?9V&=|xt{ta(j4ChOZ$ij0gc|O`^c=BnGLjQQl7-5@ z{zHHz-~ZRYTjl#dB%y310uljw0sFBY AZU6uP diff --git a/sass/.DS_Store b/sass/.DS_Store index 293c0b03ea6fbb441f00a77a754e4c2e45cfc19c..108b7e7ea066ae42c27720e922c2616a0145f20e 100644 GIT binary patch delta 53 zcmZoMXfc@J&&V_}VE1GL5thmPjHkre8Il+Mi3SN delta 30 mcmZoMXfc@J&&W72U^gS
-
- -
+
+ +
${wiki_form}
+ +
+ This wiki uses Markdown for styling. There are several useful guides online. +
+
MITx Additions: +

circuit:basic

+

$LaTeX Math Expression$

+ To create a new wiki article, create a link to it. Clicking the link gives you the creation page. +

[Article](/wiki/view/Article/Child/)

+ Other useful examples:
+

[Link](http://google.com)

+

Huge Header +
====

+

Smaller Header +
-------

+

*emphasis* or _emphasis_

+

**strong** or __strong__

+

- Unordered List +
  - Sub Item 1 +
  - Sub Item 2

+

1. Ordered +
2. List

+
+ From b5167fe8162d7e62caa804ec6fb62f9f2de094a3 Mon Sep 17 00:00:00 2001 From: Bridger Maxwell Date: Wed, 25 Jan 2012 20:22:54 -0500 Subject: [PATCH 2/2] Added instructions to wiki edit and create pages. --- sass/_wiki-create.scss | 33 +++++++++++++++++++++++++++++++-- sass/_wiki.scss | 25 ------------------------- simplewiki_create.html | 3 +++ simplewiki_edit.html | 29 +++-------------------------- simplewiki_instructions.html | 22 ++++++++++++++++++++++ 5 files changed, 59 insertions(+), 53 deletions(-) create mode 100644 simplewiki_instructions.html diff --git a/sass/_wiki-create.scss b/sass/_wiki-create.scss index 5ca3ec9f0f..78bc8434da 100644 --- a/sass/_wiki-create.scss +++ b/sass/_wiki-create.scss @@ -1,22 +1,51 @@ form#wiki_revision { + float: left; + width: flex-grid(7, 9); + margin-right: flex-gutter(9); + + label { display: block; margin-bottom: 7px ; } + textarea { @include box-sizing(border-box); margin-bottom: 20px; - min-height: 300px; + min-height: 450px; width: 100%; } input[type="text"] { + display: block; width: 50%; } + #submit_delete { + float: right; + } + input[type="submit"] { - display: block; margin-top: 20px; } } + +#wiki_edit_instructions { + float: left; + width: flex-grid(2, 9); + + .markdown-example { + background-color: $light-gray; + padding-top: 5px; + padding-right: 2px; + padding-bottom: 5px; + padding-left: 5px; + + margin-top: 5px; + margin-bottom: 7px; + margin-left: 5px; + + line-height: 1.0; + } +} diff --git a/sass/_wiki.scss b/sass/_wiki.scss index 5263a8494c..b26fe2c6ad 100644 --- a/sass/_wiki.scss +++ b/sass/_wiki.scss @@ -78,31 +78,6 @@ div.wiki-wrapper { section.wiki-body { @extend .content; - form#wiki_revision { - float: left; - width: flex-grid(7, 9); - margin-right: flex-gutter(9); - } - - #wiki_edit_instructions { - float: left; - width: flex-grid(2, 9); - - .markdown-example { - background-color: $light-gray; - padding-top: 5px; - padding-right: 2px; - padding-bottom: 5px; - padding-left: 5px; - - margin-top: 5px; - margin-bottom: 7px; - margin-left: 5px; - - line-height: 1.0; - } - } - header { @extend .topbar; diff --git a/simplewiki_create.html b/simplewiki_create.html index 6e250dc527..3d820310f6 100644 --- a/simplewiki_create.html +++ b/simplewiki_create.html @@ -16,4 +16,7 @@ Create article + +<%include file="simplewiki_instructions.html"/> + diff --git a/simplewiki_edit.html b/simplewiki_edit.html index be4f7a04eb..fc5f63d970 100644 --- a/simplewiki_edit.html +++ b/simplewiki_edit.html @@ -11,34 +11,11 @@ ${ wiki_article.title }
- ${wiki_form} - - - + + -
- This wiki uses Markdown for styling. There are several useful guides online. -
-
MITx Additions: -

circuit:basic

-

$LaTeX Math Expression$

- To create a new wiki article, create a link to it. Clicking the link gives you the creation page. -

[Article](/wiki/view/Article/Child/)

- Other useful examples:
-

[Link](http://google.com)

-

Huge Header -
====

-

Smaller Header -
-------

-

*emphasis* or _emphasis_

-

**strong** or __strong__

-

- Unordered List -
  - Sub Item 1 -
  - Sub Item 2

-

1. Ordered -
2. List

-
+<%include file="simplewiki_instructions.html"/> diff --git a/simplewiki_instructions.html b/simplewiki_instructions.html new file mode 100644 index 0000000000..9f52f4e370 --- /dev/null +++ b/simplewiki_instructions.html @@ -0,0 +1,22 @@ +
+ This wiki uses Markdown for styling. There are several useful guides online. +
+
MITx Additions: +

circuit:basic

+

$LaTeX Math Expression$

+ To create a new wiki article, create a link to it. Clicking the link gives you the creation page. +

[Article](/wiki/view/Article/Child/)

+ Other useful examples:
+

[Link](http://google.com)

+

Huge Header +
====

+

Smaller Header +
-------

+

*emphasis* or _emphasis_

+

**strong** or __strong__

+

- Unordered List +
  - Sub Item 1 +
  - Sub Item 2

+

1. Ordered +
2. List

+