Difference between revisions of "Template:Marmas"
Jump to navigation
Jump to search
(Created template table for assignments) |
(added link to week 15 and fixed link for 12\13) |
||
| (18 intermediate revisions by the same user not shown) | |||
| Line 1: | Line 1: | ||
| + | [[Category:Journal Entry]] | ||
{| class="wikitable" | {| class="wikitable" | ||
| − | | | + | |- |
| + | ! colspan = "3" |[[user:marmas| Michael Armas' User Page]] | ||
|- | |- | ||
! Weekly Pages | ! Weekly Pages | ||
| Line 7: | Line 9: | ||
|- | |- | ||
| [[Week 1| Week 1]] | | [[Week 1| Week 1]] | ||
| − | | [[Individual Journal Week 1]] | + | | [[User:marmas|Individual Journal Week 1]] |
| − | | [[ | + | | [[Class Journal Week 1|Class Journal Week 1]] |
|- | |- | ||
| [[Week 2| Week 2]] | | [[Week 2| Week 2]] | ||
| − | | [[Individual Journal Week 2]] | + | | [[marmas Week 2|Individual Journal Week 2]] |
| − | | [[ | + | | [[Class Journal Week 2|Class Journal Week 2]] |
|- | |- | ||
| [[Week 3| Week 3]] | | [[Week 3| Week 3]] | ||
| − | | [[Individual Journal Week 3]] | + | | [[ASP1/YDR321W Week 3|Individual Journal Week 3]] |
| − | | [[ | + | | [[Class Journal Week 3|Class Journal Week 3]] |
|- | |- | ||
| [[Week 4| Week 4]] | | [[Week 4| Week 4]] | ||
| − | | [[Individual Journal Week 4]] | + | | [[Marmas Week 4|Individual Journal Week 4]] |
| − | | [[ | + | | [[Class Journal Week 4|Class Journal Week 4]] |
|- | |- | ||
| [[Week 5| Week 5]] | | [[Week 5| Week 5]] | ||
| − | | [[Individual Journal Week 5]] | + | | [[iDog Week 5|Individual Journal Week 5]] |
| − | | [[ | + | | [[Class Journal Week 5|Class Journal Week 5]] |
|- | |- | ||
| [[Week 6| Week 6]] | | [[Week 6| Week 6]] | ||
| − | | [[Individual Journal Week 6]] | + | | [[Marmas Week 6|Individual Journal Week 6]] |
| − | | [[ | + | | [[Class Journal Week 6|Class Journal Week 6]] |
|- | |- | ||
| [[Week 7| Week 7]] | | [[Week 7| Week 7]] | ||
| − | | [[Individual Journal Week 7]] | + | | [[Marmas Week 7|Individual Journal Week 7]] |
| − | | [[ | + | | [[Class Journal Week 7|Class Journal Week 7]] |
|- | |- | ||
| [[Week 8| Week 8]] | | [[Week 8| Week 8]] | ||
| − | | [[Individual Journal Week 8]] | + | | [[Marmas Week 8|Individual Journal Week 8]] |
| − | | [[ | + | | [[Class Journal Week 8|Class Journal Week 8]] |
|- | |- | ||
| [[Week 9| Week 9]] | | [[Week 9| Week 9]] | ||
| − | | [[Individual Journal Week 9]] | + | | [[Marmas Week 9|Individual Journal Week 9]] |
| − | | [[ | + | | [[Class Journal Week 9|Class Journal Week 9]] |
|- | |- | ||
| [[Week 10| Week 10]] | | [[Week 10| Week 10]] | ||
| − | | [[Individual Journal Week 10]] | + | | [[Marmas Week 10|Individual Journal Week 10]] |
| − | | [[ | + | | [[Class Journal Week 10|Class Journal Week 10]] |
|- | |- | ||
| [[Week 11| Week 11]] | | [[Week 11| Week 11]] | ||
| − | | [[Individual Journal Week 11]] | + | | [[Marmas Week 11|Individual Journal Week 11]] |
| − | | [[ | + | | [[FunGals|Class Journal Week 11]] |
|- | |- | ||
| [[Week 12/13| Week 12/13]] | | [[Week 12/13| Week 12/13]] | ||
| − | | [[Individual Journal Week 12/13]] | + | | [[Marmas Week 12/13|Individual Journal Week 12/13]] |
| − | | [[ | + | | [[FunGals|Class Journal Week 12/13]] |
| + | |- | ||
| + | | [[Week 15| Week 15]] | ||
| + | | [[Marmas Week 15|Individual Journal Week 15]] | ||
| + | | [[FunGals|Class Journal Week 15]] | ||
|- | |- | ||
|} | |} | ||
