Navigation Menu

Skip to content

Commit

Permalink
Item10247: working on tabs for form and attachments, more css tweaks
Browse files Browse the repository at this point in the history 
git-svn-id: http://svn.foswiki.org/trunk/BaseSkin@11974 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
  • Loading branch information
ArthurClemens authored and ArthurClemens committed Jun 17, 2011
1 parent 30c0c26 commit 3f8a698
Show file tree
Hide file tree
Showing 10 changed files with 212 additions and 178 deletions.
4 changes: 3 additions & 1 deletion data/System/BaseSkinDocumentTemplate.txt
View file
Expand Up @@ -68,7 +68,9 @@
---------------------------------------------------
}%%TMPL:DEF{"head:meta:description"}%%TOPIC%%TMPL:END%%{
---------------------------------------------------
}%%TMPL:DEF{"head:windowtitle"}%<title>%TMPL:P{"titleaction"}% <nop>%BASETOPIC%%TMPL:P{"titlesep"}%%BASEWEB%%TMPL:P{"titlesep"}%<nop>%WIKITOOLNAME%</title>%TMPL:END%%{
}%%TMPL:DEF{"head:windowtitle:separator"}% | %TMPL:END%%{
---------------------------------------------------
}%%TMPL:DEF{"head:windowtitle"}%<title>%TMPL:P{"titleaction"}% <nop>%BASETOPIC%%TMPL:P{"head:windowtitle:separator"}%%BASEWEB%%TMPL:P{"head:windowtitle:separator"}%<nop>%WIKITOOLNAME%</title>%TMPL:END%%{
---------------------------------------------------
}%%{
Allow other templates to easy add body class names. These should make sure that class 'foswikiNoJs' is always written.
Expand Down
2 changes: 0 additions & 2 deletions data/System/BaseSkinEditTemplate.txt
View file

This file was deleted.

99 changes: 2 additions & 97 deletions data/System/BaseSkinTestView.txt
View file
Expand Up @@ -61,103 +61,8 @@ Base skin test page
1 level 1
1 level 2
1 level 3
<h2 id="form_elements">Forms</h2>
<fieldset>
<legend>Legend</legend>
<p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nullam dignissim convallis est. Quisque aliquam. Donec faucibus. Nunc iaculis suscipit dui. Nam sit amet sem. Aliquam libero nisi, imperdiet at, tincidunt nec, gravida vehicula, nisl. Praesent mattis, massa quis luctus fermentum, turpis mi volutpat justo, eu volutpat enim diam eget metus.</p>
<form>
<h2>Form Element</h2>
<p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nullam dignissim convallis est. Quisque aliquam. Donec faucibus. Nunc iaculis suscipit dui.</p>
<p><label for="text_field">Text Field:</label></p>
<input type="text" id="text_field" />
<p><label for="text_area">Text Area:</label><br />
<textarea id="text_area"></textarea></p>
<p><label for="select_element">Select Element:</label></p>
<select name="select_element">
<optgroup label="Option Group 1"></p>
<option value="1">Option 1</option>
<option value="2">Option 2</option>
<option value="3">Option 3</option>
<p> </optgroup></p>
<p> <optgroup label="Option Group 2"></p>
<option value="1">Option 1</option>
<option value="2">Option 2</option>
<option value="3">Option 3</option>
<p> </optgroup><br />
</select>
</p>
<p><label for="radio_buttons">Radio Buttons:</label></p>
<input type="radio" class="radio" name="radio_button" value="radio_1" /> Radio 1<br/></p>
<input type="radio" class="radio" name="radio_button" value="radio_2" /> Radio 2<br/></p>
<input type="radio" class="radio" name="radio_button" value="radio_3" /> Radio 3<br/>
</p>
<p><label for="checkboxes">Checkboxes:</label></p>
<input type="checkbox" class="checkbox" name="checkboxes" value="check_1" /> Radio 1<br/></p>
<input type="checkbox" class="checkbox" name="checkboxes" value="check_2" /> Radio 2<br/></p>
<input type="checkbox" class="checkbox" name="checkboxes" value="check_3" /> Radio 3<br/>
</p>
<p><label for="password">Password:</label></p>
<input type="password" class="password" name="password" />
<p><label for="file">File Input:</label></p>
<input type="file" class="file" name="file" />
<p>
<input class="button" type="reset" value="Clear" />
<input class="button" type="submit" value="Submit" /></p></form>
</fieldset>
<h2 id="tables">Tables</h2>
<table cellspacing="0" cellpadding="0">
<tr>
<th>Table Header 1</th>
<th>Table Header 2</th>
<th>Table Header 3</th>
</tr>
<tr>
<td>Division 1</td>
<td>Division 2</td>
<td>Division 3</td>
</tr>
<tr class="even">
<td>Division 1</td>
<td>Division 2</td>
<td>Division 3</td>
</tr>
<tr>
<td>Division 1</td>
<td>Division 2</td>
<td>Division 3</td>
</tr>
</table>
<h2 id="misc">Misc Stuff &#8211; abbr, acronym, pre, code, sub, sup, etc.</h2>
<p>Lorem <sup>superscript</sup> dolor <sub>subscript</sub> amet, consectetuer adipiscing elit. Nullam dignissim convallis est. Quisque aliquam. <cite>cite</cite>. Nunc iaculis suscipit dui. Nam sit amet sem. Aliquam libero nisi, imperdiet at, tincidunt nec, gravida vehicula, nisl. Praesent mattis, massa quis luctus fermentum, turpis mi volutpat justo, eu volutpat enim diam eget metus. Maecenas ornare tortor. Donec sed tellus eget sapien fringilla nonummy. <acronym title="National Basketball Association">NBA</acronym> Mauris a ante. Suspendisse quam sem, consequat at, commodo vitae, feugiat in, nunc. Morbi imperdiet augue quis tellus. <abbr title="Avenue">AVE</abbr></p>
<hr />
<pre>
Lorem ipsum dolor sit amet,
consectetuer adipiscing elit.
Nullam dignissim convallis est.
Quisque aliquam. Donec faucibus.
Nunc iaculis suscipit dui.
Nam sit amet sem.
Aliquam libero nisi, imperdiet at,
tincidunt nec, gravida vehicula,
nisl.
Praesent mattis, massa quis
luctus fermentum, turpis mi
volutpat justo, eu volutpat
enim diam eget metus.
Maecenas ornare tortor.
Donec sed tellus eget sapien
fringilla nonummy.
<acronym title="National Basketball Association">NBA</acronym>
Mauris a ante. Suspendisse
quam sem, consequat at,
commodo vitae, feugiat in,
nunc. Morbi imperdiet augue
quis tellus.
<abbr title="Avenue">AVE</abbr>
</pre>
<blockquote><p>
&#8220;This stylesheet is going to help so freaking much.&#8221; <br />-Blockquote
</p></blockquote>



---+ H1 header [[%TOPIC%][with link]]
*Intro text.* Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text.
Expand Down
20 changes: 16 additions & 4 deletions data/System/BaseSkinViewTemplate.txt
View file
Expand Up @@ -23,17 +23,29 @@ sidebar contentsidebarsidebar contentsidebar sidebar contentsidebar sidebar cont
---------------------------------------------------
}%%TMPL:DEF{"topic:before"}%%TMPL:P{"form:top"}%%TMPL:P{"attachments:top"}%%TMPL:END%%{
---------------------------------------------------
}%%TMPL:DEF{"topic:after"}%%TABPANE{class="simple"}%
%TAB{"Form"}%%TMPL:P{"form:bottom"}%%ENDTAB%
%TAB{"Attachments (%QUERY{"length(attachments[NOT lc(attr)=~'h'])"}%)"}%%TMPL:P{"attachments:bottom"}%%ENDTAB%
%ENDTABPANE%%TMPL:END%%{
}%%TMPL:DEF{"topic:after"}%%TABPANE{class="simple"}%
%IF{
"%QUERY{"length(attachments[NOT lc(attr)=~'h'])"}% > 0"
then="$percntTMPL:P{
\"tab:attachments\"
}$percnt"
}%%IF{
"%QUERY{"length(fields[NOT lc(attributes)=~'h'])"}% > 0"
then="$percntTMPL:P{
\"tab:form\"
}$percnt"
}%%ENDTABPANE%%TMPL:END%%{
---------------------------------------------------
}%%TMPL:DEF{"form"}%%META{"form"}%%TMPL:END%%{
---------------------------------------------------
}%%TMPL:DEF{"form:top"}%%TMPL:END%%{
---------------------------------------------------
}%%TMPL:DEF{"form:bottom"}%%TMPL:P{"form"}%%TMPL:END%%{
---------------------------------------------------
}%%TMPL:DEF{"tab:form"}%%TAB{"Form"}%%TMPL:P{"form"}%%ENDTAB%%TMPL:END%%{
---------------------------------------------------
}%%TMPL:DEF{"tab:attachments"}%%TAB{"Attachments (%QUERY{"length(attachments[NOT lc(attr)=~'h'])"}%)"}%%TMPL:P{"attachments:bottom"}%%ENDTAB% %TMPL:END%%{
---------------------------------------------------
}%%TMPL:DEF{"attachments"}%%META{"attachments"}%%TMPL:END%%{
---------------------------------------------------
}%%TMPL:DEF{"attachments:top"}%%TMPL:END%%{
Expand Down
6 changes: 1 addition & 5 deletions data/System/BasejsSkinViewTemplate.txt
View file
Expand Up @@ -2,10 +2,6 @@
Base Skin topic template that loads a Javascript file
}%%TMPL:INCLUDE{"view"}%%{
---------------------------------------------------
}%%TMPL:DEF{"head:script"}%%TMPL:PREV%%TMPL:P{
"LIBJS"
id="BaseSkinJs/js"
requires=""
}%%TMPL:END%%{
}%%TMPL:DEF{"head:script"}%%TMPL:END%%{
---------------------------------------------------
}%%{</verbatim>}%
3 changes: 2 additions & 1 deletion lib/Foswiki/Contrib/BaseSkin/MANIFEST
View file
Expand Up @@ -4,7 +4,6 @@ data/System/BasejsSkinViewTemplate.txt 0644
data/System/BaseSkin.txt 0644
data/System/BaseSkinCommonTemplate.txt 0644
data/System/BaseSkinDocumentTemplate.txt 0644
data/System/BaseSkinEditTemplate.txt 0644
data/System/BaseSkinTestView.txt 0644
data/System/BaseSkinViewTemplate.txt 0644
pub/System/BaseSkinCss/base_src.css 0644
Expand All @@ -19,3 +18,5 @@ pub/System/BaseSkinCss/grid.css.gz 0644
pub/System/BaseSkinJs/modernizr-1.7_src.js 0644
pub/System/BaseSkinJs/modernizr-1.7.js 0644
pub/System/BaseSkinJs/modernizr-1.7.js.gz 0644
templates/attachtables.base.tmpl 0644
templates/formtables.base.tmpl 0644

0 comments on commit 3f8a698

Please sign in to comment.