TiddlyWiki.org

Changeset 4979

Show
Ignore:
Timestamp:
16/05/08 14:39:30 (4 months ago)
Author:
simon
Message:

monkeygtd: cosmetic overhaul for actions/projects/ticklers. can make an action into a subproject. other minor tweaks.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • Trunk/contributors/SimonBaird/mgtd3/framework/MgtdTagControls.js

    r4834 r4979  
    288288                                                tiddler.removeTag("Project"); 
    289289                                                tiddler.addTag("Tickler");                           
     290                                                tiddler.addTag("Once");                           
    290291                                                return false; 
    291292                                        }); 
     
    293294                } 
    294295        }, 
     296 
     297        convertActionToSubProj: { 
     298                handler: function(place,macroName,params,wikifier,paramString,tiddler) { 
     299                        if (tiddler.tags.contains('Action')) { 
     300 
     301                                createTiddlyButton(place, "make subj project", "make this action into a sub project", function(e) { 
     302                                                tiddler.removeTag("Action");                       
     303                                                tiddler.removeTag("Next");                      
     304                                                tiddler.removeTag("Future");                      
     305                                                tiddler.removeTag("Waiting For");                      
     306                                                tiddler.removeTag("Done");                      
     307                                                tiddler.addTag("Project");                       
     308                                                tiddler.addTag("Active");                       
     309                                                return false; 
     310                                        }); 
     311 
     312                        } 
     313                } 
     314        }, 
     315 
    295316 
    296317        linkToParent: { 
  • Trunk/contributors/SimonBaird/mgtd3/layout/MonkeyGTDTheme.theme

    r4833 r4979  
    434434.mgtdList .action .tiddlyLinkExisting, 
    435435.mgtdList .plain .tiddlyLinkExisting, 
    436 .mgtdList .tickler .tiddlyLinkExisting 
     436.mgtdList .tickler .tiddlyLinkExisting, 
     437.mgtdList .project .tiddlyLinkExisting 
    437438{ 
    438439        font-weight: normal ! important; 
     
    442443.mgtdList .action .tiddlyLink, 
    443444.mgtdList .plain .tiddlyLink, 
    444 .mgtdList .tickler .tiddlyLink 
     445.mgtdList .tickler .tiddlyLink, 
     446.mgtdList .project .tiddlyLink 
    445447{ 
    446448        font-weight: normal ! important; 
     
    526528        /* TODO make prettier */ 
    527529        font-weight:medium; font-size:120%; margin:0.1em; background-color:#ffd; 
    528         border:2px solid [[ColorPalette::TertiaryMid]]
    529         background-color:[[ColorPalette::TertiaryPale]]
     530        border:1px solid #ccc
     531        background-color:#fff
    530532        text-align:center; 
    531533        width:8em; 
     
    629631} 
    630632 
     633 
     634.controls { 
     635        margin: auto; 
     636        margin:0; padding:0; 
     637} 
     638.controls tr, .controls td, .controls { 
     639        border-style:none!important; 
     640        border-collapse:no-collapse; 
     641} 
     642 
     643.controls { 
     644        clear:right; 
     645        background-color:#f0f0f0; 
     646        border:1px solid #ccc!important;  
     647        padding:0.5em; 
     648        /* margin-top:1em; */ 
     649        padding-bottom:0.5em; 
     650} 
     651 
     652.toolbar .button { 
     653        border-style:none!important; 
     654} 
     655 
     656.controls .subtitle { 
     657        margin-left:0; 
     658        padding-left:0; 
     659} 
     660 
     661.controls .button { 
     662        background-color:#fff; 
     663} 
     664 
     665.controls .label { 
     666        color:#888; font-size:90%; 
     667} 
     668 
     669.controls .floatleft { 
     670        padding-right:1em; 
     671        float:left; 
     672} 
     673 
     674.controls .floatright { 
     675        padding-left:1em; 
     676        float:right; 
     677} 
     678 
     679 
     680.controls .clearleft { clear:left; } 
     681.controls .clearright { clear:right; } 
     682.controls .clearboth { clear:both; } 
     683 
     684.controls .button.on { 
     685        background-color:#555; border-style:none!important; 
     686} 
     687 
     688.controls .button.Starred.off, 
     689.controls .button.Starred.on 
     690{ background-color:#f0f0f0; border-style:none!important;} 
     691 
     692.unboldLinks .tiddlyLink { 
     693        font-weight:normal; 
     694} 
     695 
     696.smaller select { font-size:90%; } 
     697 
     698.buttonsLikeLinks .button { 
     699        border-style:none!important; 
     700        background:transparent; 
     701        color:#008; 
     702} 
     703 
     704.buttonsLikeLinks .button:hover { 
     705        text-decoration:underline; 
     706} 
     707 
     708 
    631709/* for user styles */ 
    632710[[StyleSheet]] 
  • Trunk/contributors/SimonBaird/mgtd3/views/TitleButtons.tiddler

    r4833 r4979  
    11!Project 
    22<!--{{{--> 
    3 <span class='title' macro='view title'></span> 
    4 <span macro="linkToParent Area '[A]'"></span> 
    5 <span macro="linkToParent Project '[P]'"></span> 
    6 (Project)<span macro="help Project"></span> 
    7 <span macro="toggleTag Complete . -"></span> 
    8 <span macro="hideWhenTagged Complete"> 
    9  <span macro="multiToggleTag ProjectStatus longVersion:on"></span> 
    10 </span> 
    11 <span macro="singleToggleTag tag:Starred"></span> 
    12 <br/> 
    13 Area:<span macro="multiSelectTag Area allowNone:on"></span><span macro="linkToParent Area"></span> 
    14 Realm:<span macro="multiSelectTag Realm"></span> 
    15 [[MonkeyGTDTheme##Subtitle]] 
    16 <br/> 
    17 Subproject of:<span macro="multiSelectTag Project allowNone:on"></span><span macro="linkToParent Project"></span><br/> 
    18 Associated contact:<span macro="multiSelectTag Contact allowNone:on"></span><span macro="linkToParent Contact"></span></span>  
    19 <span macro="deleteAllTagged 'delete project' '' 'delete'"></span><br/> 
    20 <span macro="convertToFromTickler"></span> 
     3<div class="projectcontrols controls"> 
     4 <div style="float:right;" class="smaller"> 
     5  <span class="label">Realm:</span><span macro="multiSelectTag Realm allowNone:on"></span> 
     6  Project<span macro="help Project"></span> 
     7 </div> 
     8 <div> 
     9  <span macro="toggleTag Complete . -"></span> 
     10  <span class='title' macro='view title'></span> 
     11  <span macro="linkToParent Area '[A]'"></span> 
     12  <span macro="linkToParent Project '[P]'"></span> 
     13  <span macro="singleToggleTag tag:Starred"></span> 
     14  [[MonkeyGTDTheme##Subtitle]] 
     15 </div> 
     16 <div macro="hideWhenTagged Complete" style="padding-top:0.25em;padding-bottom:0.25em;"> 
     17  <span macro="multiToggleTag ProjectStatus longVersion:on"></span> 
     18 </div> 
     19 <div> 
     20  <div class="floatright" macro="convertToFromTickler"><br/></div> 
     21  <div class="floatright" macro="deleteAllTagged 'delete project' '' 'delete'"><br/></div> 
     22  <div class="floatleft"><span class="label">Area:</span><br><span macro="multiSelectTag Area allowNone:on"></span><span macro="linkToParent Area"></span></div> 
     23  <div class="floatleft"><span class="label">Subproject of</span>:<br><span macro="multiSelectTag Project allowNone:on"></span><span macro="linkToParent Project"></span></div> 
     24  <div class="floatleft"><span class="label">Associated contact</span>:<br><span macro="multiSelectTag Contact allowNone:on"></span><span macro="linkToParent Contact"></span></div> 
     25  <div class="clearboth"></div> 
     26 </div> 
     27</div> 
    2128<!--}}}--> 
    2229 
    2330!Action 
    2431<!--{{{--> 
    25 <span class='title' macro='view title'></span> 
    26 <span macro="linkToParent Project '[P]'"></span> 
    27 (Action)<span macro="help Action"></span> 
    28 <span macro="toggleTag Done . -"></span> 
    29 <span macro="hideWhenTagged Done"> 
    30  <span macro="multiToggleTag ActionStatus longVersion:on"></span> 
    31 </span> 
    32 <span macro="singleToggleTag tag:Starred"></span> 
    33 <br/> 
    34 <span macro="showWhen config.mGTD.getOptChk('MultipleContexts')"> 
    35 Context:<span macro="groupOfSingleToggleTags Context useCheckbox:yes"></span><br/> 
    36 </span> 
    37 <span macro="else"> 
    38 Context:<span macro="multiSelectTag Context allowNone:on"></span><span macro="linkToParent Context"></span> 
    39 </span> 
    40 Project:<span macro="multiSelectTag Project allowNone:on"></span><span macro="linkToParent Project"></span> 
    41 <span macro="showWhen tiddler.getByIndex('Project').length == 0"> 
    42         <!-- only show area if there's no project ---> 
    43         Area:<span macro="multiSelectTag Area allowNone:on"></span> 
    44 </span> 
    45 Realm:<span macro="multiSelectTag Realm"></span> 
    46 [[MonkeyGTDTheme##Subtitle]] 
    47 <br/> 
    48 <span macro="showWhen tiddler.tags.contains('Waiting For') && !tiddler.tags.contains('Done')"> 
    49         <!-- different label for waiting --> 
    50         Delegated to/waiting on: 
    51 </span><span macro="else"> 
    52         Associated contact: 
    53 </span> 
    54 <span macro="multiSelectTag Contact allowNone:on"></span> 
    55 <span macro="linkToParent Contact"></span> <br/> 
    56 <span macro="convertToFromTickler"></span> 
    57 </span> 
     32<div class="actioncontrols controls"> 
     33 <div style="float:right;" class="smaller"> 
     34  <span class="label">Realm:</span><span macro="multiSelectTag Realm allowNone:on"></span> 
     35  Action<span macro="help Action"></span> 
     36 </div> 
     37 <div> 
     38  <span macro="toggleTag Done . -"></span> 
     39  <span class='title' macro='view title'></span> 
     40  <span macro="linkToParent Project '[P]'"></span> 
     41  <span macro="singleToggleTag tag:Starred"></span> 
     42  [[MonkeyGTDTheme##Subtitle]] 
     43 </div> 
     44 <div macro="hideWhenTagged Done" style="padding-top:0.25em;padding-bottom:0.25em;"> 
     45  <span macro="multiToggleTag ActionStatus longVersion:on"></span> 
     46 </div> 
     47 <div macro="showWhen config.mGTD.getOptChk('MultipleContexts')"> 
     48  <span class="label">Context:</span><br/><span class="unboldLinks" macro="groupOfSingleToggleTags Context useCheckbox:yes"></span> 
     49 </div> 
     50 <div> 
     51  <div class="floatright" macro="convertToFromTickler"><br/></div> 
     52  <div class="floatright" macro="convertActionToSubProj"><br/></div> 
     53  <div class="floatleft" macro="else"><span class="label">Context:</span><br/><span macro="multiSelectTag Context allowNone:on"></span><span macro="linkToParent Context"></span></div> 
     54  <div class="floatleft"><span class="label">Project:</span><br/><span macro="multiSelectTag Project allowNone:on"></span><span macro="linkToParent Project"></span></div> 
     55  <div macro="hideWhen tiddler.hasParent('Project')" class="floatleft"><span class="label">Area:</span><br><span macro="multiSelectTag Area allowNone:on"></span><span macro="linkToParent Area"></span></div> 
     56  <div class="floatleft"> 
     57   <span macro="hideWhenTaggedAny 'Waiting For' 'Done'" class="label">Associated contact:</span> 
     58   <span macro="else" class="label">Delegated to/waiting on:</span><br> 
     59   <span macro="multiSelectTag Contact allowNone:on"></span><span macro="linkToParent Contact"></span> 
     60  </div> 
     61  <div class="clearboth"></div> 
     62 </div> 
     63</div> 
    5864<!--}}}--> 
    5965 
    6066!Tickler 
    6167<!--{{{--> 
    62 <span class='title' macro='view title'></span> 
    63 <span macro="linkToParent Project '[P]'"></span> 
    64 (Tickler)<span macro="help Tickler"></span> 
    65 <span macro="showWhen tiddler.tags.contains('Once') || tiddler.getByIndex('TicklerRepeatType').length==0"><span macro="toggleTag Actioned . -"></span></span> 
    66 <span macro="showWhenTagged 'Daily'"   ><span macro="addDay"></span></span> 
    67 <span macro="showWhenTagged 'Weekly'"  ><span macro="addWeek"></span></span> 
    68 <span macro="showWhenTagged 'Monthly'" ><span macro="addMonth"></span></span> 
    69 <span macro="showWhenTagged 'Yearly'"  ><span macro="addYear"></span></span> 
    70 <span macro="singleToggleTag tag:Starred"></span> 
    71 <span macro="hideWhenTagged Actioned"> 
    72  <span macro="multiToggleTag TicklerStatus longVersion:on"></span> 
    73 </span> 
    74 <span macro="hideWhenTagged Actioned"> 
    75  <span macro="multiToggleTag TicklerRepeatType longVersion:on"></span> 
    76 </span> 
    77 <br/> 
    78 Project:<span macro="multiSelectTag Project allowNone:on"></span><span macro="linkToParent Project"></span> 
    79 <span macro="showWhen tiddler.getByIndex('Project').length == 0"> 
    80         <!-- only show area if there's no project ---> 
    81         Area:<span macro="multiSelectTag Area allowNone:on"></span> 
    82 </span> 
    83 Realm:<span macro="multiSelectTag Realm"></span> 
    84 [[MonkeyGTDTheme##Subtitle]] 
    85 <br/> 
    86 Tickler date:<span macro="dateChooser"></span> 
    87 <span macro="addDay"></span> 
    88 <span macro="addWeek"></span> 
    89 <span macro="addMonth"></span> 
    90 <span macro="addYear"></span> 
    91 <br/> 
    92 Associated contact:<span macro="multiSelectTag Contact allowNone:on"></span><span macro="linkToParent Contact"></span> 
    93 <br/> 
    94 <span macro="convertToFromTickler"></span> 
     68<div class="ticklercontrols controls"> 
     69 <div style="float:right;" class="smaller"> 
     70  <span class="label">Realm:</span><span macro="multiSelectTag Realm allowNone:on"></span> 
     71  Tickler<span macro="help Tickler"></span> 
     72 </div> 
     73 <div> 
     74  <span macro="showWhen tiddler.tags.contains('Once') || !tiddler.hasParent('TicklerRepeatType')"> 
     75   <span macro="toggleTag Actioned . -"></span> 
     76  </span> 
     77  <span macro="showWhenTagged 'Daily'"   ><span macro="addDay"></span></span> 
     78  <span macro="showWhenTagged 'Weekly'"  ><span macro="addWeek"></span></span> 
     79  <span macro="showWhenTagged 'Monthly'" ><span macro="addMonth"></span></span> 
     80  <span macro="showWhenTagged 'Yearly'"  ><span macro="addYear"></span></span> 
     81  <span class='title' macro='view title'></span> 
     82  <span macro="linkToParent Area '[A]'"></span> 
     83  <span macro="linkToParent Project '[P]'"></span> 
     84  <span macro="singleToggleTag tag:Starred"></span> 
     85  [[MonkeyGTDTheme##Subtitle]] 
     86 </div> 
     87 <div macro="hideWhenTagged Actioned" style="padding-top:0.25em;padding-bottom:0.25em;"> 
     88  <span macro="multiToggleTag TicklerRepeatType longVersion:on"></span> 
     89 </div> 
     90 <div> 
     91  <div class="floatleft"><span class="label">Tickler date:</span><br/><span macro="dateChooser"></span></div> 
     92  <div class="floatleft buttonsLikeLinks"><br> 
     93   <span macro="addDay"></span> 
     94   <span macro="addWeek"></span> 
     95   <span macro="addMonth"></span> 
     96   <span macro="addYear"></span> 
     97  </div> 
     98  <div class="clearboth"></div> 
     99 </div> 
     100 <div> 
     101  <div class="floatright" macro="convertToFromTickler"><br/></div> 
     102  <div class="floatleft"><span class="label">Project:</span><br/><span macro="multiSelectTag Project allowNone:on"></span><span macro="linkToParent Project"></span></div> 
     103  <div macro="hideWhen tiddler.hasParent('Project')" class="floatleft"><span class="label">Area:</span><br><span macro="multiSelectTag Area allowNone:on"></span><span macro="linkToParent Area"></span></div> 
     104  <div class="floatleft"><span class="label">Associated contact</span>:<br><span macro="multiSelectTag Contact allowNone:on"></span><span macro="linkToParent Contact"></span></div> 
     105  <div class="clearboth"></div> 
     106 </div> 
     107</div> 
    95108<!--}}}--> 
    96109 
     
    114127!Realm 
    115128<!--{{{--> 
    116 <span class='title' macro='view title'></span> (Realm)<span macro="help Realm"></span> 
     129<span class='title' macro='view title'></span> (Realm)<span macro="help Realm allowNone:on"></span> 
    117130<!--}}}--> 
    118131 
     
    129142        Area:<span macro="multiSelectTag Area allowNone:on"></span> 
    130143</span> 
    131 Realm:<span macro="multiSelectTag Realm"></span><br/> 
     144Realm:<span macro="multiSelectTag Realm allowNone:on"></span><br/> 
    132145<div style="border-bottom:1px solid [[ColorPalette::TertiaryLight]]">Double click or click "edit" to edit. Use "new here" to make sub item.</div><!--- TODO should be a class ---> 
    133146<!--}}}-->