Changeset 17806
- Timestamp:
- 07/31/08 13:52:16 (1 month ago)
- Files:
-
- trunk/core/src/net/project/view/components/BlogArchives.java (modified) (1 diff)
- trunk/core/src/net/project/view/components/BlogTask.java (modified) (1 diff)
- trunk/core/web/html/blog/ViewBlog.html (modified) (7 diffs)
- trunk/core/web/html/resource/management/components/BlogArchives.html (modified) (1 diff)
- trunk/core/web/html/resource/management/components/BlogTask.html (modified) (1 diff)
- trunk/core/web/html/resource/management/components/BlogTeam.html (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/core/src/net/project/view/components/BlogArchives.java
r17773 r17806 129 129 archivesList = new ArrayList<BlogArchives>(); 130 130 blogArchive = new BlogArchives(); 131 blogArchive.setLinkDisplayName(" Blog entries not exist");131 blogArchive.setLinkDisplayName("No Blogs"); 132 132 blogArchive.setLinkHrefValue("0"); 133 133 archivesList.add(blogArchive); trunk/core/src/net/project/view/components/BlogTask.java
r17767 r17806 102 102 taskList.addAll(tasks); 103 103 } else { 104 firstOption.setTaskName(" Tasks Not Exist");104 firstOption.setTaskName("No Tasks Found"); 105 105 taskList.add(firstOption); 106 106 } trunk/core/web/html/blog/ViewBlog.html
r17773 r17806 8 8 </t:parameter> 9 9 </t:if> 10 <div id="filtersDiv" style="position: absolute; left: 300px; top: 100px; z-index: 1;" /> 10 11 <!-- Left Side Div Starts --> 11 12 <div style="left: 5px; top: 86px; position: absolute; width: 25%; height: 100%;"> … … 68 69 <tr><td height="10"></td></tr --> 69 70 70 <tr valign="top"><td align="left"><h3 style="color: #6699FF;">Filter by :</h3></td></tr> 71 <t:if test="fullView"> 72 <tr valign="top"> 73 <td align="left"> 74 View full entries 75 | 76 <a href="${jspRootURL}/blog/view/get_titles_only?module=${moduleId}"> View titles only </a> 77 </td> 78 </tr> 79 <t:parameter name="else"> 80 <tr valign="top"> 81 <td align="left"> 82 <a href="${jspRootURL}/blog/view/get_full_entries?module=${moduleId}"> View full entries </a> 83 | 84 View titles only 85 </td> 86 </tr> 87 </t:parameter> 88 </t:if> 89 90 91 <!-- tr valign="top"><td align="left"><h3 style="color: #6699FF;">Filter by :</h3></td></tr --> 71 92 72 93 <!-- Filter for View --> … … 79 100 <tr valign="top"> 80 101 <td width="30%"> 81 < label style="color: #0000FF;"> View : </label>102 <!-- label style="color: #0000FF;"> View : </label --> 82 103 </td> 83 104 <td width="70%"> 84 105 <!-- select t:type="select" model="literal:0=All,1=Active,2=Critical,3=Late" value="literal:0=All" clientId="view" blankOption="NEVER" / --> 85 <select ><option selected="selected"> All </option></select>106 <select t:type="select" model="literal:0=All" value="literal:0=All" clientId="assignmentFilter" style="display: none;" /> 86 107 </td> 87 108 </tr> … … 129 150 </t:if> 130 151 131 < tr valign="top" align="right">152 <!-- tr valign="top" align="right"> 132 153 <td> 133 154 <label style="font-family: Arial; color: gray;">${filterResultMessage}</label> 134 155 <button name="filter" onclick="applyFilters();">Filter</button> 135 156 </td> 136 </tr >157 </tr --> 137 158 </table> 138 159 </td> … … 148 169 149 170 <!-- Blog content starts here --> 150 <div id="blog-content" style="height: 75%; width: 758px; position: absolute; left: 265px; top: 1 05px; overflow-Y: scroll; overflow-X: hidden;">171 <div id="blog-content" style="height: 75%; width: 758px; position: absolute; left: 265px; top: 115px; overflow-Y: scroll; overflow-X: hidden;"> 151 172 152 173 <!-- Middle content Div Starts --> 153 <div id="middleDiv" style="height: 100%; position: absolute; left: 80px; top: 5px; bottom: 10px;">174 <div id="middleDiv" style="height: 100%; position: absolute; left: 80px; top: 15px; bottom: 10px;"> 154 175 <div style="font-family: Arial; font-weight: bold; color: red;"> ${message}</div> 155 176 <table width="600px" height="100%" align="left"> … … 160 181 <tr> 161 182 <td> 162 <div> 163 <t:if test="fullView"> 164 View full entries 165 | 166 <a href="${jspRootURL}/blog/view/get_titles_only?module=${moduleId}"> View titles only </a> 167 <t:parameter name="else"> 168 <a href="${jspRootURL}/blog/view/get_full_entries?module=${moduleId}"> View full entries </a> 169 | 170 View titles only 171 </t:parameter> 172 </t:if> 173 </div> 183 174 184 </td> 175 185 </tr> … … 362 372 initializeContentPanel(); 363 373 374 var datesCombo = new Ext.form.ComboBox({ 375 fieldLabel: 'Dates', 376 typeAhead: true, 377 triggerAction: 'all', 378 transform: 'archives', 379 lazyRender: true, 380 listClass: 'x-combo-list-small', 381 editable : false, 382 width: 120, 383 listWidth : 120 384 }); 385 386 var viewCombo = null; 387 var teamCombo = null; 388 var taskCombo = null; 389 390 if(spaceType == 'project'){ 391 viewCombo = new Ext.form.ComboBox({ 392 fieldLabel: 'View', 393 typeAhead: true, 394 triggerAction: 'all', 395 transform: 'assignmentFilter', 396 lazyRender: true, 397 listClass: 'x-combo-list-small', 398 editable : false, 399 width: 100, 400 listWidth : 100 401 }); 402 teamCombo = new Ext.form.ComboBox({ 403 fieldLabel: 'Team', 404 typeAhead: true, 405 triggerAction: 'all', 406 transform: 'team', 407 lazyRender: true, 408 listClass: 'x-combo-list-small', 409 editable : false, 410 width: 130, 411 listWidth : 130 412 }); 413 taskCombo = new Ext.form.ComboBox({ 414 fieldLabel: 'Task', 415 typeAhead: true, 416 triggerAction: 'all', 417 transform: 'task', 418 lazyRender: true, 419 listClass: 'x-combo-list-small', 420 editable : false, 421 width: 180, 422 listWidth : 180 423 }); 424 } 425 426 Ext.onReady(function(){ 427 428 Ext.QuickTips.init(); 429 430 var personFilters = [{ 431 layout: 'column', 432 items:[{ 433 columnWidth:.4, 434 layout: 'form', 435 items: [ 436 datesCombo 437 ] 438 }] 439 }]; 440 441 var projectFilters = [{ 442 layout: 'column', 443 items:[{ 444 columnWidth:.3, 445 layout: 'form', 446 items: [ 447 viewCombo 448 ] 449 },{ 450 columnWidth:.4, 451 layout: 'form', 452 items: [ 453 datesCombo 454 ] 455 },{ 456 columnWidth:.3, 457 layout: 'form', 458 items: [ 459 teamCombo 460 ] 461 }] 462 }, taskCombo 463 ]; 464 465 var filterForm = new Ext.FormPanel({ 466 labelWidth: 35, 467 frame: true, 468 collapsible: true, 469 collapsed: true, 470 title: 'Filters', 471 bodyStyle: 'padding:1px 1px 0', 472 width: '650px', 473 474 items: spaceType == 'person' ? personFilters : projectFilters, 475 476 buttons: [{ 477 text: 'Filter', 478 handler : applyFilters 479 }] 480 }); 481 482 /*if(viewCombo != null){ 483 filterForm.add(viewCombo); 484 } 485 if(teamCombo != null){ 486 filterForm.add(teamCombo); 487 } 488 if(taskCombo != null){ 489 filterForm.add(taskCombo); 490 }*/ 491 492 filterForm.render('filtersDiv'); 493 494 }); 364 495 <!-- // 365 496 // This function is for triming the spaces in values trunk/core/web/html/resource/management/components/BlogArchives.html
r17773 r17806 10 10 <tr> 11 11 <td width="30%"> 12 < label style="color: #0000FF;"> Dates : </label>12 <!-- label style="color: #0000FF;"> Dates : </label --> 13 13 </td> 14 14 <td width="70%"> trunk/core/web/html/resource/management/components/BlogTask.html
r17767 r17806 10 10 <tr> 11 11 <td width="30%"> 12 < label style="color: #0000FF;">Tasks : </label>12 <!-- label style="color: #0000FF;"> Tasks : </label --> 13 13 </td> 14 14 <td width="70%"> trunk/core/web/html/resource/management/components/BlogTeam.html
r17767 r17806 8 8 <tr> 9 9 <td width="30%"> 10 < label style="color: #0000FF;"> Teammate : </label>10 <!-- label style="color: #0000FF;"> Teammate : </label --> 11 11 </td> 12 12 <td width="70%">
