Ignore:
Timestamp:
Aug 7, 2009 4:57:29 PM (15 years ago)
Author:
mylan
Message:

Merged revisions 2250-2256,2258 via svnmerge from
​http://svn.quintagroup.com/products/quintagroup.quills.extras/branches/no_webresults

........

r2250 | mylan | 2009-08-05 17:50:46 +0300 (Wed, 05 Aug 2009) | 2 lines


moved webresults site cusomizations into elaw.quills.webresults package (#37)

........

r2251 | mylan | 2009-08-05 21:25:35 +0300 (Wed, 05 Aug 2009) | 1 line


Bind off from 4webresults theme skin: rebind resources to IQuillsExtrasLayer (browser layer), change QuillsLinks? portlet registration

........

r2252 | mylan | 2009-08-05 22:28:15 +0300 (Wed, 05 Aug 2009) | 1 line


Fix bug with quills_header_macros

........

r2253 | mylan | 2009-08-06 17:45:39 +0300 (Thu, 06 Aug 2009) | 1 line


Added tests for quills

........

r2254 | mylan | 2009-08-06 17:48:25 +0300 (Thu, 06 Aug 2009) | 1 line


Added support of both qPloneComments or quintagroup.plonecomments products

........

r2255 | mylan | 2009-08-06 19:26:31 +0300 (Thu, 06 Aug 2009) | 1 line


Move entry & weblog macroses from skins to /browser (acording to quills.app v.1.7.3)

........

r2256 | mylan | 2009-08-06 20:18:07 +0300 (Thu, 06 Aug 2009) | 1 line


Debug macroses refactoring, #37

........

r2258 | mylan | 2009-08-07 15:15:54 +0300 (Fri, 07 Aug 2009) | 1 line


Update tests because of integration quills with quintagroup.plonecomments (#37)

........

Location:
quintagroup.quills.extras/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • quintagroup.quills.extras/trunk

    • Property svnmerge-integrated changed from /quintagroup.quills.extras/branches/no_webresults:1-2249 /quintagroup.quills.extras/branches/quills_81282:1-1757 to /quintagroup.quills.extras/branches/no_webresults:1-2263 /quintagroup.quills.extras/branches/quills_81282:1-1757

  • quintagroup.quills.extras/trunk/quintagroup/quills/extras/browser/weblogentry_view.pt

    r606 r1225  
    88  <body> 
    99    <metal:feed fill-slot="head_slot"> 
    10       <metal:block metal:use-macro="context/quills_header_macros/macros/feed-links"></metal:block> 
     10      <metal:block metal:use-macro="context/quills_header_macros/feed-links"></metal:block> 
    1111 
    1212    </metal:feed> 
    … …  
    1919 
    2020      <div tal:replace="structure provider:plone.abovecontenttitle" /> 
    21       <div class="weblogViewDate"> 
    22         <div class="weblogDateMonth" 
    23              tal:content="view/month" /> 
    24         <div class="weblogDateDay" 
    25              tal:content="view/day" /> 
    26       </div> 
    27  
    2821      <h1 class="documentFirstHeading"> 
    2922        <metal:field use-macro="python:here.widget('title', mode='view')"> 
    … …  
    3528           <div tal:replace="structure provider:plone.belowcontenttitle" /> 
    3629      --> 
    37       <metal:macro use-macro="context/entry_macros/macros/short-byline" /> 
    38       <metal:macro use-macro="context/entry_macros/macros/filed-under" /> 
    39       <metal:macro use-macro="context/entry_macros/macros/topic-images" /> 
    40       <p class="weblog-entry-only-excerpt"> 
     30      <metal:macro use-macro="context/quills_entry_macros/short-byline" /> 
     31      <metal:macro use-macro="context/quills_entry_macros/filed-under" /> 
     32      <metal:macro use-macro="context/quills_entry_macros/topic-images" /> 
     33      <p class="documentDescription"> 
    4134        <metal:field use-macro="python:here.widget('description', mode='view')"> 
    4235          Description 
    … …  
    5043      </div> 
    5144      <metal:sub> 
    52         <metal:macro use-macro="context/entry_macros/macros/relatedItems" /> 
     45        <metal:macro use-macro="context/quills_entry_macros/relatedItems" /> 
    5346      </metal:sub> 
    5447<!--       <div tal:replace="structure provider:quills.actionbox" /> --> 
Note: See TracChangeset for help on using the changeset viewer.