[13:13] <daker_> hey cjohnston
[13:15] <cjohnston> hey daker_
[13:16] <cjohnston> got some time?
[13:17] <cjohnston> daker_: Amoz did alot of the work, Just need help cleaning up a few things
[13:23] <daker_> ok
[13:24] <cjohnston> https://code.launchpad.net/~chrisjohnston/ubuntu-community-webthemes/ubuntu-updated-design-guidelines
[13:24] <cjohnston> https://code.launchpad.net/~chrisjohnston/summit/ubuntu-updated-design-guidelines
[13:26] <cjohnston> I'm uploading a new DB so you don't get errors
[13:30] <cjohnston> daker_: http://ubuntuone.com/3R0N0lnoQu5XdFzOA7m065
[13:34] <cjohnston> daker_: so far the issues I have found is the main-nav li ends too far to the right and the sub-nav (ive only worked on summit.html for the sub-nav) is too low and behind the main-content
[13:36] <daker_> ok thanks
[13:49] <daker_> cjohnston: should i work on this https://code.launchpad.net/~chrisjohnston/summit/ubuntu-updated-design-guidelines ?
[13:58] <cjohnston> daker_: both, yes.. the theme stuff is going into the ubuntu-community-webthemes but there are some changes needed in summit
[13:58] <cjohnston> gonna forward an email.. give me a sec
[14:01] <cjohnston> daker_: mail
[14:03] <daker_> ok
[14:12] <cjohnston> daker_: I'd like to remove out of our old CSS everything that's no longer needed too.. to clean stuff up
[14:14] <daker_> sure
[14:15] <daker_> cjohnston: is summit using Django-1.3.1 ?
[14:15] <cjohnston> yes
[14:15] <cjohnston> because its on its own server
[14:16] <cjohnston> they wont let us put LTP there
[14:16] <cjohnston> ive tried
[14:16] <cjohnston> daker_: I'll try this week to get a time line for an upgrade for LTP.. last I heard they were waiting on hardware..
[14:16] <cjohnston> but thats been months
[14:25] <daker_> ok
[14:26] <daker_> cjohnston: http://pastebin.com/NFdZwqZM
[14:28] <cjohnston> daker_: hrm
[14:28] <cjohnston> are you doing make or setup your own virtualenv
[14:29] <Amoz> hey guys
[14:30] <daker_> cjohnston: yep make init
[14:31] <cjohnston> hey Amoz
[14:31] <Amoz> isn't make spawning a new process for every line in the makefile?
[14:31] <cjohnston> daker_: try make clean  then try it again
[14:31] <cjohnston> i dont like make.. i like making your own virtual env
[15:15] <daker_> mhall119: cjohnston i am out of idea make init doesn't want to work :/
[15:16] <cjohnston> daker_: try summit.readthedocs.org
[15:28] <cjohnston> nigelb: ^^
[15:28] <nigelb> er, what?
[15:38] <cjohnston> nigelb: daker is having issues getting make to work..
[15:38] <cjohnston> thoughts?
[15:38] <nigelb> don't use make.
[15:39] <Amoz> lol
[15:39] <cjohnston> thats my opinion
[16:05] <daker_> cjohnston:
[16:05] <daker_> AttributeError at /
[16:05] <daker_> 'Settings' object has no attribute 'THEME_MEDIA'
[16:06] <cjohnston> daker_: python manage.py runserver --setings ubuntu_settings
[16:09] <Amoz> cjohnston, so what do you want to do with the 960 bug?
[16:10] <cjohnston> Amoz: i dont see any issues with the 960
[16:10] <cjohnston> as you see by my screenshot yesterday, its the proper width
[16:11] <Amoz> link it again please
[16:11] <Amoz> the 960.css overrides the core.css header#page-header padding
[16:12] <Amoz> from 0px 20px from core.css, to 0px 10px in 960.css
[16:12] <Amoz> that's the issue
[16:12] <cjohnston> right.. but only on a couple of pages
[16:13] <cjohnston> http://ubuntuone.com/3J7pjP8d94o7z1h9noMJD3
[16:16] <Amoz> cjohnston, so how do you want to fix that bug then?
[16:16] <cjohnston> Amoz: what bug?
[16:16] <Amoz> in the screenshot?
[16:16] <cjohnston> that's one of the things daker_ is going to hopefully look at
[16:21] <Amoz> one can set the #main-nav width to 960px; that will fix the glitch
[16:21] <Amoz> however, the padding will be only 10px
[16:21] <Amoz> because of the 960.css
[16:22] <Amoz> cjohnston, I can push if you want to see it
[16:22] <cjohnston> please
[16:23] <cjohnston> 960 is only called on a couple of pages
[16:23] <cjohnston> so it shouldnt be effecting the main pae
[16:23] <cjohnston> page
[16:23] <Amoz> what do you mean "called" ?
[16:23] <Amoz> included in the template?
[16:24] <Amoz> on my main page it's included anyhow
[16:24] <cjohnston> Amoz: http://summit.ubuntu.com/  vs http://summit.ubuntu.com/uds-p/2011-10-31/display
[16:25] <Amoz> you can branch from my lp:~fougner/+junk/light-django-theme-new-design
[16:25] <cjohnston> wait.. i may be backwards
[16:25] <Amoz> yeah
[16:25] <Amoz> the 960 is included in main
[16:25] <cjohnston> Amoz: lets just remove the 960 reference for now
[16:26] <cjohnston> and then fix everything else to work as it should
[16:26] <cjohnston> please
[16:26] <Amoz> okay, check out my branch first
[16:27] <Amoz> I fixed the boxshadow as well
[16:27] <cjohnston> i dont care to have the wide nav bar on the grid view since its no longer the main view
[16:27] <cjohnston> the last revision i see is 22 hours old
[16:28] <cjohnston> Amoz: I have to take off for a bit..
[16:29] <Amoz> oh, sorry
[16:29] <cjohnston> I pasted my two branches above where you can see the sub-nav not working.. maybe you and daker can collaborate
[16:29] <Amoz> cjohnston, okay
[16:29] <cjohnston> daker_: Amoz, Amoz daker_
[16:29] <cjohnston> I should be back in 1.5 hours
[16:29] <cjohnston> :-)
[16:29] <cjohnston> o/
[16:30] <Amoz> bye ^^
[16:30] <Amoz> hello daker_
[17:53] <cjohnston> Amoz: im back
[18:07] <Amoz> cjohnston, cool
[18:08] <cjohnston> Amoz: did you get a chance to remove the 960 stuff?
[18:09] <Amoz> cjohnston, yeah, kinda
[18:09] <Amoz> but the 960 styles were holding some divs in place
[18:09] <Amoz> footer, etc.
[18:10] <Amoz> so now they're spanning the whole site and need to be set in the default.css or core.css
[18:10] <cjohnston> I believe its already set in core, just needs to be changed what its called
[18:13] <Amoz> cjohnston, nope, the layouts are defined in core-grid
[18:13] <Amoz> and that's just general classes
[18:14] <Amoz> and the original design is using a wrapper IIRC
[18:14] <cjohnston> our original design or the one by canonical
[18:15] <Amoz> canonical
[18:15] <cjohnston> what happens if you wrap the whole thing in wrapper and inner wrapper
[18:15] <cjohnston> like in their design
[18:18] <Amoz> it will be easier to implement their stylesheets, if the html templates are more similar to theirs
[18:18] <cjohnston> work on what we would need to make it work best and we will see how much work will be required
[18:18] <Amoz> but then we break the html templating, as you said we shouldn't
[18:18] <cjohnston> if you dont mind
[18:19] <Amoz> I'd like to know and see the rest or the sites using the same template/themes etc.
[18:19] <Amoz> that way I can make a more informed decision
[18:19] <cjohnston> technically the other sites use ubuntu_website_base.html.. summit is the only one that uses website_base.html so if we only modify website_base.html, then their sites wouldnt be effected as long as we leave all the old stuff
[18:19] <cjohnston> loco.ubuntu.com  lp:loco-team-portal
[18:19] <cjohnston> i dont know anything about jonos site
[18:21] <Amoz> I'll check it out, need to eat and stuff first tho
[18:21] <cjohnston> k
[18:52] <cjohnston> Amoz: i removed the 960 and added the wrapper and inner-wrapper
[18:52] <cjohnston> still having issues on my end tho
[18:57] <cjohnston> Amoz: looks like leaving the old css is whats screwing things up
[18:57] <cjohnston> i commented that stuff out and some issues were fixed
[18:57] <cjohnston> the header one is fixed
[19:21] <daker_> cjohnston: i am lost :/
[19:21] <Amoz> cjohnston, maybe a few quirks would be fixed if you remove the old css
[19:21] <Amoz> cjohnston, but I'm checking everything in chrome developer tools to see applied styles
[19:21] <cjohnston> Amoz: a few quirks were fixed by removing it
[19:21] <Amoz> and I'm quite sure the old css isn't messing with the header
[19:22] <cjohnston> those two branches above are now updated
[19:22] <Amoz> could you list the branches pls ?
[19:22] <cjohnston> https://code.launchpad.net/~chrisjohnston/ubuntu-community-webthemes/ubuntu-updated-design-guidelines
[19:22] <cjohnston> https://code.launchpad.net/~chrisjohnston/summit/ubuntu-updated-design-guidelines
[19:23] <cjohnston> if you just merge them you will get your stuff from yesterday, plus my changes
[19:23] <cjohnston> whats wrong daker_
[19:25] <cjohnston> Amoz: I just pushed revno 39 to the theme branch
[19:26] <daker_> i don't know form where i should start
[19:26] <daker_> got simmit working
[19:26] <daker_> summit*
[19:26] <cjohnston> daker_: now, merge in my two branches that I posted a couple minutes ago... the first one goes into the ubuntu_website directory, the second into the summit directory
[19:30] <daker_> cjohnston: ok done, i see the new theme, now how do you make changes ?
[19:30] <Amoz> edit the css-files in the ubuntu_website dir
[19:31] <daker_> ok
[19:31] <cjohnston> daker_: ubuntu_website/media/css/core* is the css.. the templates are just like LTP... we use ubuntu_website/templates/website_base.html  and common/templates/base.html
[19:32] <cjohnston> i just pushed revno 40.. which makes changes to the subnav.. but they are in the wrong place on the page
[19:32] <cjohnston> http://127.0.0.1:8000/uds-p/
[19:32] <cjohnston> is the page im talking about
[19:46] <Amoz> cjohnston, I'm porting the html theme now
[19:46] <Amoz> trying that way instead
[19:46] <cjohnston> k
[19:49]  * Amoz YTs rebecca black - friday and goes into haxor mode
[19:50] <cjohnston> lol
[19:52] <Amoz> dude
[19:52] <Amoz> cjohnston, someone's removing the li tags in the subnav
[19:52] <cjohnston> ?
[19:52] <Amoz> I'm editing the sub_nav_links block in website_base.html
[19:52] <Amoz> but on the site the li tags are nowhere to be seen
[19:53] <Amoz> somewhere... they get overriden and removed
[19:53] <cjohnston> Amoz: correct
[19:53] <cjohnston> if you look on http://127.0.0.1:8000/uds-p/ they are there
[19:53] <Amoz> nope
[19:53] <cjohnston> if you merged in both of my branches they are
[19:53] <Amoz> I didn't merge anything
[19:53] <cjohnston>     <li><a href="/uds-p/tracks" title="Tracks">Tracks</a></li>
[19:53] <cjohnston>     <li><a class="sub-nav-item" href="/uds-p.ical">All Sessions (iCal)</a></li>
[19:53] <cjohnston>     
[19:53] <Amoz> I'm starting over from scratch
[19:53] <cjohnston>     <li><a class="sub-nav-item" href="/past/">Past Summits</a></li>
[19:53] <Amoz> :O
[19:53] <cjohnston> right..
[19:54] <cjohnston> thats django templates
[19:54] <cjohnston> block sub-nav-links in website_base gets replaced
[19:54] <Amoz> by what?
[19:54] <Amoz> in that case we have to change it as well
[19:54] <cjohnston> in the case of /uds-p/ its schedule/templates/schedule/summit.html
[19:55] <cjohnston> Amoz: http://bazaar.launchpad.net/~chrisjohnston/summit/ubuntu-updated-design-guidelines/revision/310  look under that same file name in that MP...
[19:56] <Amoz> I see your point in not editing the html, but you'll have a hard time getting the design right if tags are removed
[19:56] <Amoz> such as li
[19:56] <cjohnston> you have to add them on the pages that use it
[19:56] <Amoz> that means the original design using both anchors and li tags, needs to be styled into ONE element
[19:56] <cjohnston> I'm fine with adding <li> around the main-nav and sub-nav links
[19:57] <cjohnston> just as I did in my branch
[19:57] <Amoz> yeah but when I first told you I wanted to port the html and not the css, you told me not to do the html
[19:58] <cjohnston> some things in the html have to be done.. I was saying not to redo all of it
[19:58] <Amoz> okay
[20:01] <Amoz> there isn't a quick way to move the working dir to another computer I suppose..
[20:06] <cjohnston> rsync or push a branch and pull it again
[20:08] <Amoz> cjohnston, I was referring to the whole environment
[20:08] <cjohnston> not really
[20:09] <Amoz> okay :(
[20:09] <Amoz> gotta set it up again then
[20:09] <cjohnston> shouldnt be too bad since you have done it befor
[20:09] <cjohnston> e
[20:11] <Amoz> :P
[20:32] <Amoz> cjohnston, how's the weather in FL today?
[20:32] <Amoz> :)
[20:36] <Amoz> takes forever to setup the prerequsities
[20:40] <cjohnston> raining..
[20:41] <cjohnston> which is messing up my smoking process for dinner
[20:41] <Amoz> smoking process?
[20:41] <cjohnston> smoking pork
[20:41] <Amoz> o.O
[20:42] <Amoz> now
[20:42] <Amoz> ready
[20:42] <Amoz> chek dis out
[20:42] <Amoz> PM
[20:43] <cjohnston> deveoper summit in the header is too far to the right
[20:43] <Amoz> tell me what you think
[20:43] <Amoz> I know
[20:43] <cjohnston> remove the <hr>s from the website_base
[20:43] <Amoz> small quirks like that is expected
[20:43] <Amoz> this is the big structure/layout
[20:43] <Amoz> also the footer isnt ported yet
[20:44] <Amoz> but the header and menu looks good
[20:44] <Amoz> and the main content
[20:44] <Amoz> rite?
[20:44] <cjohnston> ya..
[20:44] <cjohnston> i think so
[20:44] <Amoz> good
[20:44] <cjohnston> for some reason the right side code on uds-p is being all screwy
[20:45] <cjohnston> mind pushing the branches and let me see?
[20:45] <Amoz> NO!
[20:45] <Amoz> iz mine
[20:45] <cjohnston> lol
[20:45] <Amoz> ^^
[20:45] <Amoz> ofc u can
[20:45] <Amoz> w8 plz
[20:48] <Amoz> there
[20:48] <Amoz> cjohnston,
[20:50] <cjohnston> Amoz,
[20:50] <Amoz> cjohnston,
[20:52] <cjohnston> ya
[20:52] <Amoz> you highlit me
[20:54] <cjohnston> link please?
[20:55] <Amoz> lazy man huh? ;)
[20:55] <Amoz> http://bazaar.launchpad.net/~fougner/+junk/light-django-theme-new-design
[20:55] <Amoz> there
[20:56] <Amoz> I thought you already had it
[20:58] <cjohnston>  <a href="/">Developer Summit</a> shouldn't be in website_base.html
[20:59] <cjohnston> change the <span id="loco"> to h2... the block will do the rest
[21:04] <Amoz> just h2?
[21:04] <Amoz> not #loco
[21:11] <cjohnston> i thought you were porting the html
[21:12] <cjohnston> if your porting the html that span can go away to match their hrml
[21:12] <cjohnston> html
[21:14] <cjohnston> Amoz: any reference in the old css to top-nav needs to be brought to core
[21:14] <cjohnston> you took the site down :-(
[21:14] <Amoz> haha
[21:14] <Amoz> yeah
[21:15] <Amoz> I was doing changes
[21:15] <Amoz> I need to learn more bzr ...
[21:15] <cjohnston> bzr is cool
[21:16] <Amoz> yeah it is
[21:16] <Amoz> really awesome
[21:16] <Amoz> like git but easier imo
[21:16] <cjohnston> hehe
[21:16] <Amoz> at least for simple stuff
[21:16] <cjohnston> i have some friends trying to convince me that git is the best thing in the world
[21:17] <cjohnston> Amoz: if you run byobu you can leave the server running while working in another terminal
[21:17] <Amoz> well git is really awesome as well
[21:17] <Amoz> but for ubuntu dev, bzr is sooo integrated
[21:17] <Amoz> cjohnston, I know that :P
[21:22] <Amoz> cjohnston, if I have a normal conflict in a branch and I want to just pull in from another branch and use the file from there
[21:22] <Amoz> how can I do that?
[21:23] <cjohnston> i dont understand
[21:23] <cjohnston> if you just want one file, go download it from LP
[21:23] <cjohnston> im not sure what a normal conflict is
[21:24] <Amoz> text conflict
[21:24] <Amoz> I just want the pulled file to overwrite the local conflicting one
[21:25] <cjohnston> just download the file from launchpad
[21:34] <Amoz> cjohnston, there, watch it now
[21:34] <Amoz> the branch should be pushed as well
[21:34] <Amoz> gotta go for tonite
[21:34] <Amoz> gf's whining
[21:35] <cjohnston> :-/
[21:35] <cjohnston> lol
[21:35] <cjohnston> thanks for your help
[21:35] <cjohnston> ill prolly merge it after dinner and do some work
[21:36] <Amoz> cool
[21:36] <Amoz> fix top-nav etc.
[21:36] <cjohnston> yup
[21:36] <Amoz> but you know what
[21:36] <Amoz> please put it in a separate stylesheet
[21:37] <Amoz> it's so much easier to keep track of upstream (canonical) design if our own extras are in a separate file
[21:37] <cjohnston> ok
[21:37] <Amoz> cya!
[21:37] <cjohnston> later
[23:19] <daker_> cjohnston: i fixed the the subnav, where i should push ?
[23:25] <cjohnston> daker_: I think he got it fixed as well.. daker_ whats your though.. redoing the CSS or redoing the HTML? if we redo the html we have to redo the html on all the sites, but if they release another theme upadte and they use the same names of things we just have to ap;ly the updated css
[23:26] <daker_> redoing the css only is very hard
[23:26] <cjohnston> daker_: in that case: http://bazaar.launchpad.net/~fougner/+junk/light-django-theme-new-design
[23:27] <cjohnston> I don't think Amoz pushed his changes to the summit branch, but i dont think much needs to change in the summit branch, just li's that I've seen so far.. everything else is in website_base.html
[23:28] <daker_> i have a solution
[23:28] <cjohnston> whats that
[23:28] <daker_> why not to fork light-django-theme ?
[23:29] <cjohnston> I think updating light-django-theme would be better than forking it..
[23:29] <daker_> ok :)
[23:29] <cjohnston> i think that would make it harder to update sites
[23:30] <daker_> how many site use it ?
[23:30] <cjohnston> i know of three
[23:30] <daker_> sites*
[23:30] <cjohnston> but i dont know
[23:32] <daker_> awe
[23:33] <cjohnston> ?
[23:33] <daker_> this need a lot work
[23:33] <daker_> of*
[23:34] <cjohnston> his branch or something else
[23:36] <daker_> changing the html will affect the tree other sites
[23:36] <cjohnston> cright
[23:36] <cjohnston> right
[23:38] <cjohnston> daker_: if we update the new website_base.html file and leave ubuntu_base.html then sites can update if they want
[23:39] <daker_> also we should leave the old css
[23:39] <cjohnston> yes
[23:39] <cjohnston> we may need to rename a couple files
[23:44] <cjohnston> it would be nice if we could all work on one team branch, but with him not being a team member, he has to ask for merges
[23:45] <daker_> we can do it
[23:48] <cjohnston> daker_: do you have time to go from his new branch and work on it in the next couple hours?
[23:49] <daker_> sure
[23:49] <cjohnston> awesome
[23:49] <cjohnston> let me know what help you need
[23:49] <cjohnston> im trying to work on something for the wife, but if you need any assistance I'll be happy to help
[23:49] <daker_> but i need to go to sleep
[23:49] <cjohnston> I'd love to get this released for Summit in the next couple days and then LTP in the few days after that
[23:50] <cjohnston> ok..
[23:50] <cjohnston> do me a favor, commit whatever you have done before you go to bed and give me and Amoz a link to the branch so we can pick up from where you left off