Skip to content

Commit

Permalink
Item23:
Browse files Browse the repository at this point in the history 
   * rendering data forms as tables in view again
   * integrated css fixes by Carlo Schulz
   * moving revinfo to first h1 in content area



git-svn-id: http://svn.foswiki.org/trunk/NatSkin@584 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
  • Loading branch information
MichaelDaum authored and MichaelDaum committed Nov 12, 2008
1 parent 9b312d3 commit 24501e4
Show file tree
Hide file tree
Showing 22 changed files with 206 additions and 171 deletions.
11 changes: 7 additions & 4 deletions data/TWiki/NatSkin.txt
View file
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" date="1225905328" format="1.1" reprev="1.1" version="$Rev$"}%
%META:TOPICINFO{author="ProjectContributor" date="1226506238" format="1.1" reprev="1.5" version="$Rev$"}%
<!--

PLEASE DO NOT EDIT THIS TOPIC
Expand Down Expand Up @@ -119,12 +119,15 @@ allways open an extra window.
| Skin Author: | Michael Daum |
| Copyright &copy;: | 2003-2008, Michael Daum http://michaeldaumconsulting.com |
| License: | GPL ([[http://www.gnu.org/copyleft/gpl.html][GNU General Public License]]) |
| Skin Version: | v3.0-pre24 |
| Skin Version: | v3.0-pre25 |
| Dependencies: | NatSkinPlugin |
| Description: | Driven by cascading stylesheets, Comes with 12 alternative styles, <nop>MoveableType and Wordpress Look-n-Feel |
| Base Name: | nat |
| Screenshot: | <div style="overflow:hidden;height:200px"><a href="%ATTACHURL%/BlueNoteStyle.jpeg"><img src="%ATTACHURL%/BlueNoteStyle.jpeg" title="Clean"/></a></div> |
| Change&nbsp;History: | <!-- specify latest version first -->&nbsp; |
| 12 Nov 2008: | rendering data forms as tables in view again; \
integrated css fixes by Carlo Schulz; \
moving revinfo to first h1 in content area |
| 11 Nov 2008: | rewrite of data forms using divs instead of tables; \
lots of usability fixes |
| 05 Nov 2008: | redesigned header bar using a default nextwiki logo; \
Expand Down Expand Up @@ -408,6 +411,6 @@ allways open an extra window.

%META:FILEATTACHMENT{name="wikiringlogo40x40.png" attachment="wikiringlogo40x40.png" attr="h" comment="" date="1189787359" path="wikiringlogo40x40.png" size="2571" stream="wikiringlogo40x40.png" tmpFilename="" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="BlueNoteStyle.jpeg" attachment="BlueNoteStyle.jpeg" attr="h" comment="" date="1225905266" path="BlueNoteStyle.jpeg" size="42093" stream="IO::File=GLOB(0x8f2567c)" tmpFilename="/var/tmp/CGItemp41158" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="nextwiki-header.png" attachment="nextwiki-header.png" attr="h" comment="" date="1225886578" path="nextwiki-header.png" size="15861" stream="IO::File=GLOB(0x8f25db0)" tmpFilename="/var/tmp/CGItemp15194" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="nextwiki-header.png" attachment="nextwiki-header.png" attr="h" comment="" date="1226506238" path="nextwiki-header.png" size="16828" stream="IO::File=GLOB(0x8f63c50)" tmpFilename="/var/tmp/CGItemp29744" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="nextwiki-header-tile.png" attachment="nextwiki-header-tile.png" attr="h" comment="" date="1225886085" path="nextwiki-header-tile.png" size="762" stream="IO::File=GLOB(0x8f206f0)" tmpFilename="/var/tmp/CGItemp18012" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="nextwiki-logo.png" attachment="nextwiki-logo.png" attr="h" comment="" date="1225886097" path="nextwiki-logo.png" size="4415" stream="IO::File=GLOB(0x8f237b8)" tmpFilename="/var/tmp/CGItemp17744" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="nextwiki-logo.png" attachment="nextwiki-logo.png" attr="h" comment="" date="1226504153" path="nextwiki-logo.png" size="7060" stream="IO::File=GLOB(0x8f64450)" tmpFilename="/var/tmp/CGItemp29501" user="ProjectContributor" version="1"}%
2 changes: 1 addition & 1 deletion data/TWiki/TWikiWebTopicActions.txt
View file
Expand Up @@ -5,7 +5,7 @@ Default site-level configuration for the !WebTopicActions !WebComponent
%STARTINCLUDE%<!-- twikiwebtopicactions -->
%USERACTIONS{
restrictedactions="new, attach, move, delete, diff, more, raw"
format="<div class='natTopicActions'>$new$sep$edit$sep$attach$sep$raw$sep$delete$sep$diff$sep$print$sep$more</div>"
format="<div class='natTopicActions'>$edit$sep$new$sep$attach$sep$raw$sep$delete$sep$diff$sep$print$sep$more</div>"
}%
<!-- //twikiwebtopicactions -->%STOPINCLUDE%

2 changes: 2 additions & 0 deletions lib/TWiki/Contrib/NatSkin/MANIFEST
View file
Expand Up @@ -21,6 +21,7 @@ data/TWiki/TWikiWebSideBar.txt 0644
data/TWiki/TWikiWebTopicActions.txt 0644
data/TWiki/WebLinks.txt 0644
lib/TWiki/Contrib/NatSkin.pm 0644
pub/TWiki/NatSkin/application_form_edit.png 0644
pub/TWiki/NatSkin/arrow_divide.png 0644
pub/TWiki/NatSkin/arrow_refresh.png 0644
pub/TWiki/NatSkin/arrow_refresh_small.png 0644
Expand All @@ -37,6 +38,7 @@ pub/TWiki/NatSkin/BlueNoteStyle.css 0644
pub/TWiki/NatSkin/BlueNoteStyle.jpeg 0644
pub/TWiki/NatSkin/BlueNoteThin.css 0644
pub/TWiki/NatSkin/bullet-toc.gif 0644
pub/TWiki/NatSkin/button-bg.png 0644
pub/TWiki/NatSkin/comment.png 0644
pub/TWiki/NatSkin/cross.png 0644
pub/TWiki/NatSkin/database_delete.png 0644
Expand Down
13 changes: 6 additions & 7 deletions pub/TWiki/NatSkin/BaseStyle.css
View file
Expand Up @@ -196,7 +196,6 @@ pre {
margin:0px auto;
}
.natOopsMessage .twikiFormSteps {
width:25em;
margin-bottom:2em;
}
.natLayoutTable {
Expand Down Expand Up @@ -386,12 +385,9 @@ pre {
.natEditTopicInfo {
margin:0.5em 0em 1em 0em;
}
.natEditTopicInfo table {
width:100%;
}
.natEditTopicInfo table th,
.natEditTopicInfo table td {
padding:0px 0px 5px 0px;
padding:0em 0.5em 0.5em 0em;
}
.natEditBody table th.twikiFirstCol {
width:10em;
Expand Down Expand Up @@ -554,12 +550,15 @@ pre {
}
.natEditTopicAction:hover,
.natEditTopicAction,
.natEditFormTopicAction:hover,
.natEditFormTopicAction,
.natEditTextTopicAction:hover,
.natEditTextTopicAction {
background-image:url(pencil.png);
}
.natEditFormTopicAction:hover,
.natEditFormTopicAction {
background-image:url(application_form_edit.png);
background-image:url(pencil.png);
}
.natAttachTopicAction:hover,
.natAttachTopicAction {
background-image:url(attach.png);
Expand Down
6 changes: 3 additions & 3 deletions pub/TWiki/NatSkin/BlueNoteBorder.css
View file
Expand Up @@ -4,6 +4,9 @@
.natBody {
margin:1em 2em;
}
.twikiBroadcastMessage {
margin:-1em -2em 1em;
}
.natEditBody {
margin:0px;
}
Expand All @@ -27,9 +30,6 @@
.natSideBar {
border-bottom:1px #aaaaaa solid;
}
.natBottomBar {
background:#e5e5e5;
}
.natBottomBarContents {
margin-top:1px; /* konqueror fix */
}
Expand Down
37 changes: 25 additions & 12 deletions pub/TWiki/NatSkin/BlueNoteButtons.css
View file
Expand Up @@ -3,9 +3,11 @@

.natSideBarHeader,
.natWebButtons {
background:#9CBAEF;
border-top:1px solid white;
border-bottom:1px solid white;
background-color:#9CBAEF;
background-image:url(button-bg.png);
background-repeat:repeat-x;
background-position:left bottom;
border-top:1px solid #E1EAFA;
}
.natBodyRight .natWebButtons {
padding-left:2em;
Expand Down Expand Up @@ -42,6 +44,9 @@
.natWebButtons ul a:hover {
text-decoration: none;
background-color:#0055b5;
background-image:url(button-bg.png);
background-repeat:repeat-x;
background-position:left bottom;
color:white;
}

Expand Down Expand Up @@ -131,24 +136,30 @@ ul.superfish a {
padding:0em 1em;
_padding:0em 2em; /* broken box model in IE6 */
display:block;
width:100%;
}

ul.superfish li {
/*
background:url(menubg.gif);
background-position:top left;
background-repeat:repeat-x;*/
border-right:1px solid #fff;
border-right:1px solid #E1EAFA;
}
ul.superfish {
border-left:1px solid #fff;
border-left:1px solid #E1EAFA;
}
ul.superfish ul {
border-left:0px;
}
ul.superfish li li {
/*
border-bottom:1px solid #fff;
border-right:1px solid #fff;
*/
border-bottom:1px solid #c2c4c4;
border-left:1px solid #c2c4c4;
border-right:1px solid #c2c4c4;
width:9.45em;
}
ul.superfish li:hover,
Expand All @@ -164,22 +175,25 @@ ul.superfish li li.sfHover,
ul.superfish li li a:focus,
ul.superfish li li a:hover,
ul.superfish li li a:active {
background-color:#9CBAEF;
color:#0055b5;
background-color:#0055b5;
color:#fff;
}
ul.superfish li ul {
border-top:1px solid #fff;
border-top:1px solid #c2c4c4;
width:11.45em;
}
ul.superfish li ul ul {
border-top:1px solid #c2c4c4;
}
ul.superfish li li a.twikiNewLink,
ul.superfish li li {
background-color:#cfcecf;
background:#E9E9EB;
}
ul.superfish li li li {
background-color:#cfcecf;
background:#E9E9EB;
}
ul.superfish li li li li {
background-color:#cfcecf;
background:#E9E9EB;
}
ul.superfish li.sfHover ul {
opacity:0.95;
Expand All @@ -205,5 +219,4 @@ ul.superfish li li a {
margin:0em -1em;
padding:0em 1em;
_padding:0em 2em; /* broken box model in IE6 */
display:block;
}

0 comments on commit 24501e4

Please sign in to comment.