Merge lp://staging/~l3on/ubuntu-packaging-guide/new-sidebar into lp://staging/ubuntu-packaging-guide

Proposed by Leo Iannacone
Status: Merged
Merged at revision: 104
Proposed branch: lp://staging/~l3on/ubuntu-packaging-guide/new-sidebar
Merge into: lp://staging/ubuntu-packaging-guide
Diff against target: 312 lines (+165/-38)
7 files modified
BORROWED-CODE (+3/-0)
Makefile (+3/-1)
debian/control (+2/-2)
themes/ubuntu/layout.html (+4/-35)
themes/ubuntu/sidebar.html (+55/-0)
themes/ubuntu/static/home.css (+77/-0)
themes/ubuntu/static/main.js (+21/-0)
To merge this branch: bzr merge lp://staging/~l3on/ubuntu-packaging-guide/new-sidebar
Reviewer Review Type Date Requested Status
Daniel Holbach Approve
Review via email: mp+105360@code.staging.launchpad.net

Description of the change

This patch tries to provide a new Sidebar for ubuntu-packaging-guide.

A build-test can be found here:
http://people.ubuntu.com/~l3on/upg/index.html

What I used:
 * Images/icons come from Humanity icon theme.
 * Jquery (added to the "_static" dir, of course we should use instead
   jquery lib shipped with with Ubuntu, but I do not know how I can do
   it)

Have a great day.

Leo.

To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

Thanks a lot for your work on this Leon!

I have a few questions:

 - Why do you reset LANGS? I'm not sure I understand what's going on. :-)
 - Do we specifically need jquery 1.6.1? Or is anything >= 1.6.1 fine? If so,
   we could rely on the system jquery, which has been >= 1.6.1 since oneiric.
 - Could you document in BORROWED-CODE where you got the icons from?

Thanks again for your great work! This is great!

review: Needs Information
89. By Leo Iannacone

Revert LANGS reset

90. By Leo Iannacone

Added information where new icons come from

Revision history for this message
Leo Iannacone (l3on) wrote :

> Thanks a lot for your work on this Leon!

You're welcome Daniel!

> I have a few questions:
>
> - Why do you reset LANGS? I'm not sure I understand what's going on. :-)

That was a push mistake, I mean: I reset LANGS for speed up test builds and I forgot to revert before propose the merge. [fixed]

> - Do we specifically need jquery 1.6.1? Or is anything >= 1.6.1 fine? If so,
> we could rely on the system jquery, which has been >= 1.6.1 since oneiric.

I checked if everything works fine also with jquery 1.7.1, and it does... So, no problem with jquery >= 1.6.1

> - Could you document in BORROWED-CODE where you got the icons from?

Yes, of course! [done]

> Thanks again for your great work! This is great!

Thank you! :)

Revision history for this message
Daniel Holbach (dholbach) wrote :

Please let me know if the changes in https://code.launchpad.net/~l3on/ubuntu-packaging-guide/new-sidebar/+merge/105360 are alright with you.

Revision history for this message
Daniel Holbach (dholbach) wrote :
91. By Leo Iannacone

Merged from dholbach

Revision history for this message
Daniel Holbach (dholbach) wrote :

Great work, Leo! Grazie mille!

I have two small issues still:
 - there's a merge conflict in BORROWED-CODE - do you think
   you could fix it? (It looks pretty easy to fix)
 - this seems not to work for the singlehtml view, where
   "jump to top" would be superhelpful to have

Thanks again.

review: Needs Fixing
92. By Leo Iannacone

Fix javascript location in singlehtml

93. By Leo Iannacone

Fix toc in singlehtml mode

94. By Leo Iannacone

Prevent toc to being half showed in "fixed-mode" when the windows is not
enough big. This fixes toc style for singlehtml specially, where toc is
very long.

95. By Leo Iannacone

Fixed path for new images

96. By Leo Iannacone

Merging with original tree.

Revision history for this message
Leo Iannacone (l3on) wrote :

Hi Daniel!

How are you? :)

I worked a bit on those issues..

 - BORROWED-CODE should be fixed (I think)

 - I worked a bit on singlehtml, toc now is fixed.
   Anyway I found there a new problem regarding toc and "if the browser window is not enough big", more precisely: if windows.height < toc.height, you'll see only a part of the entire toc.
   I think the best way to fix it is avoid this behaviour if the window is too small (that's what I did).
   Anyway, if we could "split" theme for singlehtml and html version, we would be able to make the JUMP_TO_TOP link smarter for this case...

Best,

Leo.

97. By Leo Iannacone

Revert Makefile to revision 96
http://bazaar.launchpad.net/~ubuntu-packaging-guide-team/ubuntu-packaging-guide/trunk/revision/96

Revision history for this message
Daniel Holbach (dholbach) wrote :

This looks great to me. For some reason though when I scroll down (or use cursor down), the ToC jumps quite a bit, sometimes it shows, then it's gone, then it shows again, etc.

Do we have any idea why this is? Can anyone try this and see if it fails for you as well?

review: Needs Information
Revision history for this message
Leo Iannacone (l3on) wrote :

Hi Daniel,

you're completely right.

For some reason, I did not see that "flickering" before commit last changes.

Anyway, I think I fixed it in the rev98.

Can you check if everything works fine now?

Leo.

98. By Leo Iannacone

Fix flickering when add/remove class .fixed to sidebar

99. By Leo Iannacone

Use variable instead of static name in main.js

Revision history for this message
Daniel Holbach (dholbach) wrote :

Great work Leo! Merged and updated debian/copyright accordingly.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches