Merge lp://staging/~rockstar/loggerhead/unify-templates into lp://staging/loggerhead

Proposed by Paul Hummer
Status: Merged
Merge reported by: Martin Albisetti
Merged at revision: 209
Proposed branch: lp://staging/~rockstar/loggerhead/unify-templates
Merge into: lp://staging/loggerhead
To merge this branch: bzr merge lp://staging/~rockstar/loggerhead/unify-templates
Reviewer Review Type Date Requested Status
Martin Albisetti Approve
Tim Penhey Pending
Michael Hudson-Doyle Pending
Review via email: mp+721@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Martin Albisetti (beuno) wrote :

Looks great.

review: Approve
Revision history for this message
Tim Penhey (thumper) wrote :

> === added file 'loggerhead/templates/feed-link.pt'
> --- loggerhead/templates/feed-link.pt 1970-01-01 00:00:00 +0000
> +++ loggerhead/templates/feed-link.pt 2008-08-13 02:25:09 +0000
> @@ -0,0 +1,8 @@
> +<tal:feed-link>
> + <div>
> + <a tal:attributes="href python:url(['/atom']);
> + title string:RSS feed for ${branch/friendly_name}">
> + <img tal:attributes="src python:branch.static_url('/static/images/ico_rss.gif')" alt="RSS" class="rssfeed"/>
> + </a>
> + </div>
> +</tal:feed-link>

Do we really want to have the feed-link in a div all the time?
Perhaps it would be better to wrap it in a div outside of this page template.

>
> === added file 'loggerhead/templates/menu.pt'
> --- loggerhead/templates/menu.pt 1970-01-01 00:00:00 +0000
> +++ loggerhead/templates/menu.pt 2008-08-13 02:25:09 +0000
> @@ -0,0 +1,27 @@
> +<tal:menu>
> + <ul id="menuTabs">
> + <form tal:attributes="action python:branch.url('/changes', start_revid=getattr(navigation, 'start_revid', None),
> + file_id=getattr(navigation, 'file_id', None))">
> + <div id="finderBox">
> + <tal:search-box replace="structure python:search_box()" />
> + <tal:feed-link replace="structure python:feed_link(branch)" />
> + </div>
> + </form>

By putting these in the normal menu page template, doesn't that make it
harder to break them out and put them somewhere else in the page?

If the menu.pt only rendered <li> elements, then we could have more
control in the macro.pt.

> +
> + <tal:changes-active tal:condition="not:fileview_active">
> + <li><a tal:attributes="href python:url('/changes', clear=1);
> + title string:Changes;
> + id string:on">Changes</a></li>
> + <li><a tal:attributes="href python:url('/files', clear=1);
> + title string:Files">Files</a></li>
> + </tal:changes-active>
> + <tal:fileview-active tal:condition="fileview_active">
> + <li><a tal:attributes="href python:url('/changes', clear=1);
> + title string:Changes">Changes</a></li>
> + <li><a tal:attributes="href python:url('/files', clear=1);
> + title string:Files;
> + id string:on">Files</a></li>
> + </tal:fileview-active>
> + </ul>
> +</tal:menu>

Is there any way we can add extra tabs? Like in the GNOME theme?

:-( I find myself wanting a "Tweak" vote.

Revision history for this message
Martin Albisetti (beuno) wrote :

On Wed, Aug 13, 2008 at 12:26 AM, Tim Penhey <email address hidden> wrote:
>> === added file 'loggerhead/templates/feed-link.pt'
>> --- loggerhead/templates/feed-link.pt 1970-01-01 00:00:00 +0000
>> +++ loggerhead/templates/feed-link.pt 2008-08-13 02:25:09 +0000
>> @@ -0,0 +1,8 @@
>> +<tal:feed-link>
>> + <div>
>> + <a tal:attributes="href python:url(['/atom']);
>> + title string:RSS feed for ${branch/friendly_name}">
>> + <img tal:attributes="src python:branch.static_url('/static/images/ico_rss.gif')" alt="RSS" class="rssfeed"/>
>> + </a>
>> + </div>
>> +</tal:feed-link>
>
> Do we really want to have the feed-link in a div all the time?
> Perhaps it would be better to wrap it in a div outside of this page template.

Outside?
I don't quite follow what you mean by that.

>> === added file 'loggerhead/templates/menu.pt'
>> --- loggerhead/templates/menu.pt 1970-01-01 00:00:00 +0000
>> +++ loggerhead/templates/menu.pt 2008-08-13 02:25:09 +0000
>> @@ -0,0 +1,27 @@
>> +<tal:menu>
>> + <ul id="menuTabs">
>> + <form tal:attributes="action python:branch.url('/changes', start_revid=getattr(navigation, 'start_revid', None),
>> + file_id=getattr(navigation, 'file_id', None))">
>> + <div id="finderBox">
>> + <tal:search-box replace="structure python:search_box()" />
>> + <tal:feed-link replace="structure python:feed_link(branch)" />
>> + </div>
>> + </form>
>
> By putting these in the normal menu page template, doesn't that make it
> harder to break them out and put them somewhere else in the page?

I agree, search can/should be separate.
Can you do this with the current HTML or do you need me to tweak it a little?

> Is there any way we can add extra tabs? Like in the GNOME theme?

More <li>'s should do it. Any reason why not?

> :-( I find myself wanting a "Tweak" vote.

BB has set high standards for all of us :)

--
Martin

Revision history for this message
Paul Hummer (rockstar) wrote :

Martin Albisetti wrote:
> On Wed, Aug 13, 2008 at 12:26 AM, Tim Penhey <email address hidden> wrote:
>
>>> === added file 'loggerhead/templates/feed-link.pt'
>>> --- loggerhead/templates/feed-link.pt 1970-01-01 00:00:00 +0000
>>> +++ loggerhead/templates/feed-link.pt 2008-08-13 02:25:09 +0000
>>> @@ -0,0 +1,8 @@
>>> +<tal:feed-link>
>>> + <div>
>>> + <a tal:attributes="href python:url(['/atom']);
>>> + title string:RSS feed for ${branch/friendly_name}">
>>> + <img tal:attributes="src python:branch.static_url('/static/images/ico_rss.gif')" alt="RSS" class="rssfeed"/>
>>> + </a>
>>> + </div>
>>> +</tal:feed-link>
>>>
>> Do we really want to have the feed-link in a div all the time?
>> Perhaps it would be better to wrap it in a div outside of this page template.
>>
>
> Outside?
> I don't quite follow what you mean by that.
>
>
I think he means back into macros.pt I can do this easily, and I agree.
>>> === added file 'loggerhead/templates/menu.pt'
>>> --- loggerhead/templates/menu.pt 1970-01-01 00:00:00 +0000
>>> +++ loggerhead/templates/menu.pt 2008-08-13 02:25:09 +0000
>>> @@ -0,0 +1,27 @@
>>> +<tal:menu>
>>> + <ul id="menuTabs">
>>> + <form tal:attributes="action python:branch.url('/changes', start_revid=getattr(navigation, 'start_revid', None),
>>> + file_id=getattr(navigation, 'file_id', None))">
>>> + <div id="finderBox">
>>> + <tal:search-box replace="structure python:search_box()" />
>>> + <tal:feed-link replace="structure python:feed_link(branch)" />
>>> + </div>
>>> + </form>
>>>
>> By putting these in the normal menu page template, doesn't that make it
>> harder to break them out and put them somewhere else in the page?
>>
> I agree, search can/should be separate.
> Can you do this with the current HTML or do you need me to tweak it a little?
>
I think we'll need to tweak it, but with some guidance, we can probably
do it in the same branch.
>> Is there any way we can add extra tabs? Like in the GNOME theme?
>>
> More <li>'s should do it. Any reason why not?
>
I think that's where you go to edit the menu template itself.
>> :-( I find myself wanting a "Tweak" vote.
>>
> BB has set high standards for all of us :)
>
John Arbash Meinel made the same comment when reviewing my branch for
bzr-stats

--
Paul Hummer
Launchpad Code Team

Revision history for this message
Tim Penhey (thumper) wrote :

On Wednesday 13 August 2008 16:00:28 Martin Albisetti wrote:
> >> === added file 'loggerhead/templates/menu.pt'
> >> --- loggerhead/templates/menu.pt 1970-01-01 00:00:00 +0000
> >> +++ loggerhead/templates/menu.pt 2008-08-13 02:25:09 +0000
> >> @@ -0,0 +1,27 @@
> >> +<tal:menu>
> >> + <ul id="menuTabs">
> >> + <form tal:attributes="action python:branch.url('/changes',
> >> start_revid=getattr(navigation, 'start_revid', None), +
> >>
> >> file_id=getattr(navigation, 'file_id', None))"> + <div
> >> id="finderBox">
> >> + <tal:search-box replace="structure python:search_box()" />
> >> + <tal:feed-link replace="structure python:feed_link(branch)"
> >> /> + </div>
> >> + </form>
> >
> > By putting these in the normal menu page template, doesn't that make it
> > harder to break them out and put them somewhere else in the page?
>
> I agree, search can/should be separate.
> Can you do this with the current HTML or do you need me to tweak it a
> little?
>
> > Is there any way we can add extra tabs? Like in the GNOME theme?
> More <li>'s should do it. Any reason why not?

I guess I was thinking of having just a single page to edit to theme something,
but I guess two files isn't too bad.

> > :-( I find myself wanting a "Tweak" vote.
>
> BB has set high standards for all of us :)

We have the power :-)

214. By Paul Hummer

Moved the div out of the feed_link template

215. By Paul Hummer

Moved the form tags for the search box into the search template

216. By Paul Hummer

Moved search and rss out of the menu

Subscribers

People subscribed via source and target branches