Changeset 1348
- Timestamp:
- 12/14/08 23:20:23 (3 years ago)
- Location:
- trunk
- Files:
-
- 10 edited
-
PatternSkin/data/System/PatternSkinColorSettings.txt (modified) (5 diffs)
-
PatternSkin/pub/System/PatternSkin/colors.css (modified) (4 diffs)
-
PatternSkin/pub/System/PatternSkin/style.css (modified) (11 diffs)
-
PatternSkin/templates/attach.pattern.tmpl (modified) (1 diff)
-
PatternSkin/templates/edit.pattern.tmpl (modified) (2 diffs)
-
PatternSkin/templates/renamebase.pattern.tmpl (modified) (2 diffs)
-
PersonalInfoAddOn/data/TWiki/PersonalInfoAddOn.txt (modified) (1 diff)
-
core/data/System/CascadingStyleSheets.txt (modified) (2 diffs)
-
core/templates/addform.tmpl (modified) (1 diff)
-
core/templates/renamebase.tmpl (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/PatternSkin/data/System/PatternSkinColorSettings.txt
r1340 r1348 53 53 ---++++ GRAYED_OUT_TEXT Grayed out text 54 54 * Local GRAYED_OUT_TEXT = %GRAYED_TEXT% 55 55 ---++++ GRAYED_OUT_TEXT_ON_DARK Grayed out text on dark background 56 * Local GRAYED_OUT_TEXT_ON_DARK = #bbb 57 56 58 ---+++ Links 57 59 ---++++ LINK_TEXT_NORMAL Link normal text … … 527 529 border-color:%FORM_STEP_BORDER%; 528 530 } 531 .foswikiFormStep h2 { 532 color:%H1_HEADER_TEXT%; 533 } 529 534 .foswikiFormStep h3, 530 535 .foswikiFormStep h4 { … … 648 653 .patternTopicActions { 649 654 background-color:%TOPIC_ACTION_BACKGROUND%; 650 color:% MUTED_TEXT%;655 color:%GRAYED_OUT_TEXT_ON_DARK%; 651 656 } 652 657 .patternTopicAction { … … 682 687 .patternSigLine { 683 688 color:%MUTED_TEXT%; 689 } 690 .patternEditTopic { 691 background:%ATTACHMENT_AND_FORM_BACKGROUND%; 684 692 } 685 693 .patternToolBar a:link .foswikiAccessKey, … … 692 700 color:inherit; 693 701 border-color:%LINK_TEXT_NORMAL_VISITED%; 694 }695 .patternSaveHelp {696 background-color:%MAIN_TEXT_BACKGROUND%;697 702 } 698 703 -
trunk/PatternSkin/pub/System/PatternSkin/colors.css
r1307 r1348 323 323 border-color:#e2e2e2; 324 324 } 325 .foswikiFormStep h2 { 326 color:#2989bb; 327 } 325 328 .foswikiFormStep h3, 326 329 .foswikiFormStep h4 { … … 444 447 .patternTopicActions { 445 448 background-color:#2989bb; 446 color:# 777;449 color:#bbb; 447 450 } 448 451 .patternTopicAction { … … 478 481 } 479 482 .patternSigLine { 480 color:#777; 483 color:#777; 484 } 485 .patternEditTopic { 486 background:#eef7fa; 481 487 } 482 488 .patternToolBar a:link .foswikiAccessKey, … … 489 495 color:inherit; 490 496 border-color:#666; 491 }492 .patternSaveHelp {493 background-color:#fff;494 497 } 495 498 -
trunk/PatternSkin/pub/System/PatternSkin/style.css
r1327 r1348 72 72 /* Text */ 73 73 h1 { 74 padding:0.25em 0 0 0;75 74 margin:0 0 .5em 0; 76 75 } … … 99 98 */ 100 99 h1.patternTemplateTitle { 101 font-size:1 80%;100 font-size:170%; 102 101 text-align:center; 103 102 } … … 364 363 vertical-align:middle; 365 364 } 366 367 365 .patternContent .foswikiAttachments, 368 366 .patternContent .foswikiForm { … … 426 424 .foswikiForm h3, 427 425 .patternTwistyButton h3 { 428 font-size:1.1 5em;426 font-size:1.1em; 429 427 font-weight:bold; 430 428 display:inline; … … 657 655 padding-top:1em; 658 656 } 659 .patternNoViewPage #patternMainContents{660 padding-top:1.5em;657 .patternNoViewPage .foswikiTopic { 658 margin-top:1em; 661 659 } 662 660 … … 669 667 } 670 668 .foswikiTopic { 671 margin: 1em0 2em 0;669 margin:0 0 2em 0; 672 670 } 673 671 .patternNoViewPage #patternMainContents, … … 682 680 } 683 681 684 682 .patternTop { 683 margin:0 0 .5em 0; 684 } 685 .patternNoViewPage .patternTop { 686 font-size:94%; 687 } 685 688 #patternSideBarContents img { 686 689 margin:0 3px 0 0; … … 995 998 padding:0 0 2em 0; 996 999 } 997 .patternEditPage .patternTop {998 font-size:94%;999 }1000 1000 .patternEditPage .patternEditTopic { 1001 margin:.25em 0 .5em 0; 1001 padding:5px; 1002 margin:0 0 .5em 0; 1003 } 1004 .patternEditPage .foswikiTextarea { 1002 1005 } 1003 1006 .patternEditPage .foswikiForm { 1004 margin:2.25em 0 0 0;1005 1007 border:none; 1008 } 1009 .foswikiFormHolder { /* constrains the textarea */ 1010 width:100%; 1006 1011 } 1007 1012 .patternEditPage .foswikiForm h1, … … 1012 1017 font-weight:bold; 1013 1018 } 1014 .foswikiEditForm {}1015 1019 .foswikiEditboxStyleMono { 1016 1020 font-family: "Bitstream Vera Sans Mono","Andale Mono",Courier,monospace; … … 1020 1024 } 1021 1025 .patternEditPage .patternActionButtons { 1022 float:left;1023 1026 margin:0.5em 0 0 0; 1024 1027 } 1025 .foswikiFormHolder { /* constrains the textarea */ 1026 width:100%; 1027 } 1028 .patternSig {} 1028 .patternSig { 1029 text-align:right 1030 } 1029 1031 .patternSigLine { 1032 margin:.5em 0 0 0; 1030 1033 border-style:none; 1031 1034 height:1%; /* for IE */ 1035 } 1036 .foswikiAddFormButton { 1032 1037 float:right; 1033 1038 } … … 1046 1051 } 1047 1052 .patternSaveHelp { 1048 margin: 2em 0 0 0;1053 margin:1em 0 0 0; 1049 1054 line-height:1.5em; 1050 1055 } 1051 1056 .patternSaveOptions { 1052 float:left;1053 1057 margin:0.25em 0 0 0; 1054 1058 clear:both; -
trunk/PatternSkin/templates/attach.pattern.tmpl
r1340 r1348 12 12 13 13 14 %TMPL:DEF{"toolbar"}%<div class="patternTop">%TWISTYBUTTON{id="attachhelp" mode="div" remember="on" link="%MAKETEXT{"Attachments help"}%" showimgleft="%ICONURLPATH{toggleopen}%" 15 hideimgleft="%ICONURLPATH{toggleclose}%"}%</div><!--//patternTop-->%TMPL:END% 14 %TMPL:DEF{"toolbar"}%<div class="patternTop">%TWISTYBUTTON{id="attachhelp" mode="div" remember="on" showlink="<h3>► %MAKETEXT{"Attachments help"}%</h3>" hidelink="<h3>▼ %MAKETEXT{"Attachments help"}%</h3>" linkclass="foswikiButton patternTwistyButton"}%</div><!--//patternTop-->%TMPL:END% 16 15 17 16 -
trunk/PatternSkin/templates/edit.pattern.tmpl
r1340 r1348 62 62 63 63 64 %TMPL:DEF{"textarea"}%<div class="patternEditTopic"><textarea class="foswikiTextarea foswikiEditboxStyleProportional" id="topic" name="text" rows="%EDITBOXHEIGHT%" cols="%EDITBOXWIDTH%" style='%EDITBOXSTYLE%' onkeydown='handleKeyDown(event)'>%TEXT%</textarea></div><!--/patternEditTopic--> 65 %TMPL:P{"sig_textareabuttons"}%%TMPL:END% 64 %TMPL:DEF{"textarea"}%<div class="patternEditTopic"><textarea class="foswikiTextarea foswikiEditboxStyleProportional" id="topic" name="text" rows="%EDITBOXHEIGHT%" cols="%EDITBOXWIDTH%" style='%EDITBOXSTYLE%' onkeydown='handleKeyDown(event)'>%TEXT%</textarea>%TMPL:P{"sig_textareabuttons"}%</div><!--/patternEditTopic-->%TMPL:END% 66 65 67 66 … … 69 68 70 69 71 %TMPL:DEF{"sig"}%<span class="patternSig foswikiLeft">< label for="sig" class="foswikiGrayText">%MAKETEXT{"Your signature to copy/paste:"}% </label><input class="foswikiInputFieldReadOnly" size="41" name="sig" type="text" readonly="readonly" title='%MAKETEXT{"Select, copy and paste your signature text to the bottom of your entry"}%' id="sig" value="-- <nop>%WIKIUSERNAME% - %DATE%" /></span><!--/patternSig-->%TMPL:END%70 %TMPL:DEF{"sig"}%<span class="patternSig foswikiLeft"><input class="foswikiInputFieldReadOnly" size="41" name="sig" type="text" readonly="readonly" title='%MAKETEXT{"Select, copy and paste your signature text to the bottom of your entry"}%' id="sig" value="-- <nop>%WIKIUSERNAME% - %DATE%" /> <label for="sig" class="foswikiGrayText">%MAKETEXT{"Your signature to copy/paste"}% </label></span><!--/patternSig-->%TMPL:END% 72 71 73 72 -
trunk/PatternSkin/templates/renamebase.pattern.tmpl
r1340 r1348 1 1 %TMPL:INCLUDE{"renamebase"}% 2 %TMPL:DEF{"logo"}%%TMPL:END% 2 3 3 4 … … 8 9 9 10 10 %TMPL:DEF{"toolbar"}%<div class="patternTop">%TWISTYBUTTON{id="renamehelp" mode="div" remember="on" link="%MAKETEXT{"Show help"}%" showimgleft="%ICONURLPATH{toggleopen}%" 11 hideimgleft="%ICONURLPATH{toggleclose}%"}%</div><!--//patternTop-->%TMPL:END% 11 %TMPL:DEF{"toolbar"}%<div class="patternTop">%TWISTYBUTTON{id="renamehelp" mode="div" remember="on" showlink="<h3>► %MAKETEXT{"Show help"}%</h3>" hidelink="<h3>▼ %MAKETEXT{"Show help"}%</h3>" linkclass="foswikiButton patternTwistyButton"}%</div><!--//patternTop-->%TMPL:END% 12 12 13 13 -
trunk/PersonalInfoAddOn/data/TWiki/PersonalInfoAddOn.txt
r1340 r1348 47 47 48 48 <div class="twikiImage"><img src="%ATTACHURLPATH%/facebook.png" alt="Screenshot of face book page" width='728' height='408' /></div> 49 50 51 ---++ Using !PersonalInfo with !NatSkin 52 53 To use the phone directory lookup, edit %TWIKIWEB%.<nop>TWikiWebSideBar: 54 55 After 56 <verbatim> 57 %STARTINCLUDE%<!-- twiki.twikiwebsidebar --> 58 </verbatim> 59 you write: 60 <verbatim> 61 <script type="text/javascript" src="%PUBURLPATH%/%TWIKIWEB%/TWikiJavascripts/twikiEvent.js"></script> 62 %INCLUDE{"Main.PersonalInfo" section="directSearch" title="*Phone list*" maxresults="10"}% 63 </verbatim> 64 (assuming you have !PersonalInfo installed in Main web) 65 49 66 50 67 ---++ Settings -
trunk/core/data/System/CascadingStyleSheets.txt
r1340 r1348 1 %META:TOPICINFO{author"ProjectContributor" date"1111929255" format"1.0" version"$Rev : 16175$"}%1 %META:TOPICINFO{author"ProjectContributor" date"1111929255" format"1.0" version"$Rev$"}% 2 2 %STARTINCLUDE% 3 3 ---+ Appendix C: CSS … … 87 87 |=.foswikiEditForm= | Edit state of data form | 88 88 |=.foswikiMandaroty= | Indication of mandatory field | 89 |=.foswikiAddFormButton= | "Add form" button on edit screen | 89 90 90 91 ---+++ HTML Forms -
trunk/core/templates/addform.tmpl
r1340 r1348 1 %{ This is a default template }%<input class="foswikiButton " type="submit" name="action_addform" value="%MAKETEXT{"Add form"}%" />1 %{ This is a default template }%<input class="foswikiButton foswikiAddFormButton" type="submit" name="action_addform" value="%MAKETEXT{"Add form"}%" /> -
trunk/core/templates/renamebase.tmpl
r1340 r1348 13 13 14 14 15 %TMPL:DEF{"changefromtitle"}%---++ %MAKETEXT{"Change from:"}% <nop>%WEB%.%TOPIC%%TMPL:END% 15 %TMPL:DEF{"changefromtitle"}%---++ %MAKETEXT{"Change from:"}% 16 <nop>%WEB%.%TOPIC%%TMPL:END% 16 17 17 18 %TMPL:DEF{"changefrom"}% … … 50 51 *%TMPL:P{"updatenote"}%* 51 52 52 <blockquote>53 53 ---++++ %MAKETEXT{"Change links in topics that refer to [_1] in the [_2] Web:" args="%TOPIC%, <nop>%WEB%"}% 54 54 %LOCAL_SEARCH% … … 57 57 %GLOBAL_SEARCH% 58 58 %TMPL:P{"checkuncheck"}% 59 </blockquote>%TMPL:END%59 %TMPL:END% 60 60 61 61
Note: See TracChangeset
for help on using the changeset viewer.
