Changeset 1156


Ignore:
Timestamp:
12/03/08 22:37:00 (3 years ago)
Author:
ArthurClemens
Message:

Item385: Improve layout attachment button and form header: fix attachment count; make the twisty a button; add title and direct edit link to form

Location:
trunk/PatternSkin
Files:
1 deleted
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/PatternSkin/data/System/PatternSkinColorSettings.txt

    r1138 r1156  
    6969---++++ SIDE_BAR_LINK_TEXT Side bar link text 
    7070   * Local SIDE_BAR_LINK_TEXT = #444 
    71  
     71---++++ BUTTON_TEXT_NORMAL Button text 
     72   * Local BUTTON_TEXT_NORMAL = #333 
     73    
    7274---+++ Disabled 
    7375---++++ DISABLED_BORDER Disabled border 
    … …  
    493495.patternContent .foswikiForm { 
    494496   background-color:%ATTACHMENT_AND_FORM_BACKGROUND%; 
     497   border-color:%MAIN_TEXT_BACKGROUND%; 
     498} 
     499.twikiAttachments .twikiButton h3, 
     500.foswikiForm .twikiButton h3 { 
     501        color:%HEADER_TEXT%; 
    495502} 
    496503.twikiAttachments table, 
    … …  
    502509   background-color:%MAIN_TEXT_BACKGROUND%; 
    503510} 
     511.foswikiForm td, 
     512.foswikiForm th, 
    504513.twikiAttachments td,  
    505514.twikiAttachments th { 
    … …  
    862871   border-color:#fff #94cce2 #94cce2 #fff; 
    863872   background-color:#cce7f1; 
    864    color:#333; 
     873   color:%BUTTON_TEXT_NORMAL%; 
    865874} 
    866875.twikiButton:hover, 
    … …  
    871880   border-color:#94cce2 #94cce2 #94cce2 #94cce2; 
    872881   background-color:#cce7f1; 
    873    color:#333; 
     882   color:%BUTTON_TEXT_NORMAL%; 
    874883} 
    875884.twikiButtonDisabled, 
    … …  
    915924   border-color:#fff #94cce2 #94cce2 #fff; 
    916925   background-color:#cce7f1; 
    917    color:#333; 
     926   color:%BUTTON_TEXT_NORMAL%; 
    918927} 
    919928.patternToolBar span a:hover { 

  • trunk/PatternSkin/data/System/PatternSkinCustomization.txt

    r1090 r1156  
    394394</verbatim> 
    395395</blockquote> 
    396  
    397 ---+++ I want to put the topic form in a twisty 
    398  
    399 The attachment tables are placed in a open/close twisty. You can do the same for the topic form. 
    400  
    401 Edit =templates/formtables.pattern.tmpl= to have this code: 
    402 <verbatim> 
    403 %{ These templates define the form attached at the bottom of viewed page. }% 
    404  
    405 %TMPL:DEF{"starttopicformwisty"}%%TWISTY{id="topicformlist" mode="div" remember="on" link="%MAKETEXT{"Form"}%" showimgleft="%ICONURLPATH{toggleopen}%" hideimgleft="%ICONURLPATH{toggleclose}%"}%%TMPL:END% 
    406  
    407 %TMPL:DEF{"endtopicformwisty"}%%ENDTWISTY%%TMPL:END% 
    408  
    409 %{ Start of form table }% 
    410 %TMPL:DEF{FORM:display:header}%<div class="foswikiForm">%TMPL:P{"starttopicformwisty"}% 
    411 <table class='twikiFormTable' border='1'>%TMPL:P{FORM:display:header:headerrow}%%TMPL:END% 
    412  
    413 %{ Header }% 
    414 %TMPL:DEF{FORM:display:header:headerrow}%<tr><th class='twikiFormTableHRow foswikiFirstCol' colspan='2'> 
    415 [[%A_TITLE%]] 
    416 </th></tr>%TMPL:END% 
    417  
    418 %{ Each row }% 
    419 %TMPL:DEF{FORM:display:row}%<tr valign='top'><td class='twikiFormTableRow foswikiFirstCol' align='right'> %A_TITLE% </td><td> 
    420 %A_VALUE% 
    421 </td></tr>%TMPL:END% 
    422  
    423 %{ Footer }% 
    424 %TMPL:DEF{FORM:display:footer}%</table>%TMPL:P{FORM:display:footer:editlink}% 
    425 %TMPL:P{"endtopicformwisty"}%</div><!-- /foswikiForm -->%TMPL:END% 
    426 </verbatim> 
    427  
    428 To give the twisty toggle link the same style as the attachment twisty link, add this to pattern skin's =style.css=: 
    429 <verbatim> 
    430 .foswikiForm .twistyTrigger .twikiLinkLabel { 
    431    font-size:122%; /* h4 size */ 
    432    font-weight:bold; 
    433 } 
    434 </verbatim> 
    435  

  • trunk/PatternSkin/lib/Foswiki/Contrib/PatternSkin/MANIFEST

    r1136 r1156  
    8080templates/css.pattern.tmpl 0444 
    8181templates/edit.pattern.tmpl 0444 
    82 templates/form.pattern.tmpl 0444 
    8382templates/formtables.pattern.tmpl 0444 
    8483templates/foswiki.pattern.tmpl 0444 

  • trunk/PatternSkin/pub/System/PatternSkin/colors.css

    r1139 r1156  
    292292.patternContent .foswikiForm { 
    293293   background-color:#eef7fa; 
     294   border-color:#fff; 
     295} 
     296.twikiAttachments .twikiButton h3, 
     297.foswikiForm .twikiButton h3 { 
     298        color:#d1400e; 
    294299} 
    295300.twikiAttachments table, 
    … …  
    301306   background-color:#fff; 
    302307} 
     308.foswikiForm td, 
     309.foswikiForm th, 
    303310.twikiAttachments td,  
    304311.twikiAttachments th { 

  • trunk/PatternSkin/pub/System/PatternSkin/pattern.js

    r1155 r1156  
    1919        setAttachmentCount:function(inTableElement) {            
    2020                var count = inTableElement.getElementsByTagName("tr").length - 1; 
    21                 var countStr = " " + "<span class='patternAttachmentCount'>" + " ("  + count + ")" + "<\/span>"; 
     21                var countStr = " " + "<span class='patternSmallLinkToHeader'>" + ' '  + count + "<\/span>"; 
    2222                var showElem = document.getElementById('topicattachmentslistshow'); 
    2323                if (showElem != undefined) { 
    2424                        var elems = foswiki.getElementsByClassName(showElem, 'patternToggleHeader'); 
    25                         elems[0].innerHTML += countStr; 
     25                        if (elems && elems[0]) { 
     26                                elems[0].innerHTML += countStr; 
     27                        } 
    2628                } 
    2729                var hideElem = document.getElementById('topicattachmentslisthide'); 
    2830                if (hideElem != undefined) { 
    2931                        var elems = foswiki.getElementsByClassName(hideElem, 'patternToggleHeader'); 
    30                         elems[0].innerHTML += countStr; 
     32                        if (elems && elems[0]) { 
     33                                elems[0].innerHTML += countStr; 
     34                        } 
    3135                } 
    3236        }, 
    … …  
    101105        '.twikiFocus':function(el) { 
    102106                el.focus(); 
     107        }, 
     108        '.twikiChangeFormButton':function(el) { 
     109                el.onclick = function() { 
     110                        alert("twikiChangeFormButton"); 
     111                        suppressSaveValidation(); 
     112                } 
    103113        } 
    104114}; 

  • trunk/PatternSkin/pub/System/PatternSkin/style.css

    r1141 r1156  
    5151pre { 
    5252    width:auto; 
    53     height:1%; 
     53        height:1%; /* for IE */ 
    5454    margin:1em 0; /* Win IE tries to make this bigger otherwise */ 
    5555    border-style:solid; 
    … …  
    310310} 
    311311 
    312 .twikiEditForm { 
    313         margin:0 0 .5em 0; 
    314 } 
    315  
    316312/* TwistyContrib */ 
    317313.twistyTrigger a:link, 
    … …  
    351347        margin:1em 0; 
    352348        padding:1px; /* fixes disappearing borders because of overflow:auto; in foswikiForm */ 
     349        border-width:2px 0 0 0; 
     350        border-style:solid; 
     351        height:1%; /* for IE */ 
    353352} 
    354353.twikiTable h2, .twikiFormTable h2, 
    … …  
    385384.twikiAttachments .twikiTable, 
    386385table.twikiFormTable { 
    387         margin:5px 0; 
     386        margin:10px 0 5px 0; 
    388387        border-collapse:collapse; 
    389388        padding:0px; 
    … …  
    396395        line-height:1.5em; /*S1*/ 
    397396        width:auto; 
    398         voice-family:"\"}\""; /* hide the following for Explorer 5.x */ 
    399         voice-family:inherit; 
    400397        width:100%; 
    401398} 
    … …  
    434431        text-decoration:none; 
    435432} 
    436 .twikiAttachments .twistyTrigger .twikiLinkLabel { 
    437         font-size:122%; /* h4 size */ 
    438         font-weight:bold; 
    439 } 
    440 .patternAttachmentCount { 
     433.twikiAttachments h3, 
     434.foswikiForm h3 { 
     435        font-size:115%; 
     436        font-weight:bold; 
     437        display:inline; 
     438        margin:0; 
     439        padding:0; 
     440} 
     441.twikiAttachments .twikiButton h3, 
     442.foswikiForm .twikiButton h3 { 
     443        padding:.1em .2em; 
     444} 
     445.patternToggleHeader {} 
     446.foswikiForm h3 a:link, 
     447.foswikiForm h3 a:visited { 
     448        text-decoration:none; 
     449} 
     450.patternSmallLinkToHeader { 
    441451        font-weight:normal; 
     452        font-size:86%; 
     453        margin:0 0 0 .15em; 
    442454} 
    443455.twikiFormSteps { 
    … …  
    903915        border-width:0 0 1px 0; 
    904916        border-style:solid; 
    905         height:1%; /* or WIN/IE wont draw the backgound */ 
     917        height:1%; /* for IE */ 
    906918        font-weight:bold; 
    907919} 
    … …  
    987999/* edit.pattern.tmpl */ 
    9881000 
    989 .patternEditPage #patternMainContents, 
    990 .patternEditPage .patternTopic { 
    991         padding:0; 
    992 } 
    993 .patternEditPage .patternTopic { 
    994         margin-bottom:0; 
     1001.patternEditPage #patternMainContents { 
     1002        padding:0 0 2em 0; 
    9951003} 
    9961004.patternEditPage .foswikiForm { 
    997         margin:.5em 0 0 0; 
     1005        margin:2.25em 0 0 0; 
     1006        border:none; 
    9981007} 
    9991008.patternEditPage .foswikiForm h1, 
    … …  
    10031012        font-size:120%; 
    10041013        font-weight:bold; 
    1005 }        
     1014} 
     1015.twikiEditForm {} 
    10061016.twikiEditboxStyleMono { 
    10071017        font-family: "Bitstream Vera Sans Mono","Andale Mono",Courier,monospace; 

  • trunk/PatternSkin/templates/attachtables.pattern.tmpl

    r14 r1156  
    55%TMPL:DEF{"commonattachtableattributes"}%valign="middle" dataalign="center,left,left,right,left,left,left,center" datavalign="top" headercolor="#0066cc" databg="#ffffff" headerbg="#ffffff" headerbgsorted="#eeeeee" databgsorted="#f5f5f5" tablerules="rows" %TMPL:END% 
    66 
    7 %TMPL:DEF{"topicattachmentwisty"}%%TWISTY{id="topicattachmentslist" mode="div" remember="on" link="%MAKETEXT{"Attachments"}%" showimgleft="%ICONURLPATH{toggleopen}%" hideimgleft="%ICONURLPATH{toggleclose}%"}%%TMPL:END% 
     7%TMPL:DEF{"topicattachmentwisty"}%%TWISTY{id="topicattachmentslist" mode="div" remember="on" showlink="<h3 class='patternToggleHeader'>&#9658; %MAKETEXT{"Attachments"}%</h3>" hidelink="<h3 class='patternToggleHeader'>&#9660; %MAKETEXT{"Attachments"}%</h3>" linkclass="twikiButton"}%%TMPL:END% 
    88 
    99%{ Header definition for topic attachments and top table in attach screen }% 

  • trunk/PatternSkin/templates/formtables.pattern.tmpl

    r1090 r1156  
    44 
    55%{ Start of form table }% 
    6 %TMPL:DEF{FORM:display:header}%<div class="foswikiForm"> 
    7 <table class='twikiFormTable' border='1'>%TMPL:P{FORM:display:header:headerrow}%%TMPL:END% 
     6%TMPL:DEF{FORM:display:header}%<div class="foswikiForm">%TMPL:P{FORM:display:title}%<table class='twikiFormTable' border='1'>%TMPL:P{FORM:display:header:headerrow}%%TMPL:END% 
    87 
    98 
    109%{ Header }% 
    11 %TMPL:DEF{FORM:display:header:headerrow}%<tr><th class='twikiFormTableHRow foswikiFirstCol' colspan='2'> 
    12 [[%A_TITLE%]] 
    13 </th></tr>%TMPL:END% 
     10%TMPL:DEF{FORM:display:header:headerrow}%%TMPL:END% 
    1411 
    1512 
    … …  
    2320 
    2421%{ Footer }% 
    25 %TMPL:DEF{FORM:display:footer}%</table>%TMPL:P{FORM:display:footer:editlink}% 
    26 </div><!-- /foswikiForm -->%TMPL:END% 
     22%TMPL:DEF{FORM:display:footer}%</table></div><!-- /foswikiForm -->%TMPL:END% 
     23 
     24 
     25%TMPL:DEF{FORM:display:title}%<h3>[[%A_TITLE%]] %TMPL:P{FORM:display:editlink}%</h3>%TMPL:END% 
     26 
     27 
     28%TMPL:DEF{FORM:display:editlink}%<span class='patternSmallLinkToHeader'><a href='%SCRIPTURL{edit}%/%WEB%/%TOPIC%?t=%GMTIME{$epoch}%;action=form'>%MAKETEXT{"edit"}%</a></span>%TMPL:END% 
     29 

  • trunk/PatternSkin/templates/foswiki.pattern.tmpl

    r1089 r1156  
    3131<link rel="shortcut icon" href="%FAVICON%" type="image/x-icon" /> 
    3232<link rel="alternate" href="%SCRIPTURL{edit}%/%BASEWEB%/%BASETOPIC%?_T=%DATE%" type="application/x-wiki" title="edit %BASETOPIC%" /> 
     33<meta name="TOPIC" content="%INTURLENCODE{%TOPIC%}%" /> 
     34<meta name="WEB" content="%INTURLENCODE{%WEB%}%" /> 
    3335<meta name="SCRIPTURLPATH" content="%SCRIPTURLPATH%" /> 
    3436<meta name="SCRIPTSUFFIX" content="%SCRIPTSUFFIX%" /> 
Note: See TracChangeset for help on using the changeset viewer.