[01:11] mhall119: is there a way to tell how many hundreds of thousands of lines my merge was? [01:14] hehe [01:14] mhall119: don't shoot me for a 2000 line merge [09:48] cjohnston: oh hai, trying out subway IRC [13:07] Amoz: your server was down last night when I got home [13:07] Amoz: I'm off to do stuff with the kids this morning [13:07] do you have any known issues with the theme [14:28] cjohnston: ah, sorry I didn't leave it on. I don't want the builtin server to be activated for too long. I need to fix a real django environment for deployment [14:29] cjohnston:hmm not afaik === mars is now known as Guest83177 [15:53] Amoz: sounds good.. [15:53] Amoz: are you around still? [17:14] Amoz: you have a mod_python error [17:19] i know [17:19] I'm setting up wsgi [17:19] ahh [17:27] cjohnston, hmm, how do I get the virtualenv stuff deployed in the real world? [17:27] the south module e.g. ? [17:27] Amoz: that I don't know [17:28] :-/ [17:28] maybe imbrandon does [17:28] I just got it running on my site [17:28] linaro.chrisjohnston.org [17:28] but it isnt using vitrualenv [17:29] and mhall119 already had summit.chrisjohnston.org working [17:30] Amoz: linaro.chrisjohnston.org is using your changes [17:30] so a few fixes that I see off the top [17:30] The ubuntu logo needs to be the linaro connect logo [17:31] remove the logo from the footer completely, they dont want it [17:31] the extra.css stuff isnt getting used for some reason [17:33] you dont seem to have copied over the current lp:ubuntu-community-webthemes/light-django-theme [17:33] there are some fixes that are missing [17:34] I need to go jump in the shower.. I'll be back in a bit [17:54] I'm back Amoz [17:55] cjohnston extra.css ? [17:56] extra_sytles.css [17:56] it's used [17:56] otherwise stuff wouldn't be green [17:56] http://linaro.chrisjohnston.org/test-summit/ [17:56] the actions box is supposed to have a grey background [17:57] there's no styles for that in extra_styles.css afaik [17:58] Amoz: I think your going to need to merge lp:ubuntu-community-webthemes/light-django-theme into your branch [17:58] your branch is old and missing a bunch of stuff [17:59] probably [18:02] cjohnston, i get a lot of conflicts trying to merge that one [18:02] yup [18:03] it's probably better to start out from that branch and manually do the linaro changes [18:03] Amoz: if I were you, I would pull a fresh branch of the old linaro theme, merge in the new ubuntu theme, then copy from your current branch the linaro changes [18:04] you mean, this one ? lp:~linaro-infrastructure/ubuntu-community-webthemes/light-django-linaro-theme [18:04] and then lp:ubuntu-community-webthemes/light-django-theme [18:04] merge [18:04] yes.. bzr branch ^^ bzr merge lp:ubuntu-community-webthemes/light-django-theme [18:04] k [18:04] then copy the changes you already made over [18:04] will try later [18:05] make sure to bzr rm the ubuntu stuff htat isnt needed [18:05] ubuntu logo etc. ? [18:05] ya [18:05] the ubuntu logo [18:05] the orange header backgroudn [18:16] I should let the old default.css stay, if I forgot to put styles in extra_styles.css [18:16] nah [19:56] Amoz: ping [20:53] cjohnston pong [20:54] Amoz: when do you think you will be able to look at the linaro theme some more? [21:13] as soon as you fix my django server ^^ [21:23] lol [21:25] my god [21:25] what [21:25] subway IRC is quite unstable [21:25] but it's wonderful at the same time [21:25] I'd love to see some more features tho [21:25] hmm [21:25] Amoz: do you want access to my server [21:26] nah [21:26] k [21:26] do you have a django server setup correctly? [21:26] there are posts out there that explain how to do it [21:26] yeah [21:26] I know [21:27] yes.. but not through virtualenv [21:27] so how did you get it to work then? [21:27] the south module e.g. [21:28] mhall119 did it [21:28] I.can give you the bash history [21:30] ooh you [21:30] yes please [21:30] k [21:38] http://paste.ubuntu.com/898420/ [21:38] http://paste.ubuntu.com/898422/ [21:42] cjohnston: thx [21:42] pyup [22:08] Amoz: any help? [22:09] do I really need postgre? [22:09] no [22:09] you can use mysql [22:09] sqlite ? [22:10] probably [22:44] ugh [22:45] OperationalError [22:45] OperationalError at / unable to open database file [22:45] cjohnston: [22:45] okay, please let me use your server instead [22:45] pleeeeeease [22:45] I'm sick of this :P [22:46] it's fun at firt [22:46] first [22:46] then it's just.. annoyinh [22:46] ok.. one sec [22:46] whats your lp id again [22:47] fougner [22:49] cjohnston: why? :P [22:49] ssh id [22:50] ah [22:50] lol [22:51] ssh ubuntu@summit.chrisjohnston.org [22:51] it should dump you into byobu [22:51] I started with a clean old linaro theme, and merged in the new ubuntu theme [22:51] there are 8 conflicts [22:52] bbiaf, dinner [23:05] back [23:16] cjohnston: hmm, exactly what was missing compared to the new lightthemes? [23:16] in linaro [23:16] also, the conflicts are mostly fileconflicts [23:17] the website_base.html was wrong [23:17] extra_styles.css was wrong [23:18] i assume that the form css changes in core.css [23:25] the website_base is easily copied [23:25] in my branch i mean [23:25] I think it's easier to just start out from my branch, after fixing those things [23:26] technically you could just copy over all the core files website_base and any images that are required.. and extra_styles [23:28] I must be tired [23:28] which branch are you referring to as "wrong" ? [23:28] "website_base.html was wrong" [23:29] https://code.launchpad.net/~fougner/+junk/light-django-linaro-theme-new-design [23:30] remember how there was that row thing in website_base.html that was causing me issues? [23:30] that has that [23:31] I dont remember what was wrong, could you show me? [23:32] http://bazaar.launchpad.net/~fougner/+junk/light-django-linaro-theme-new-design/view/head:/templates/website_base.html#L116 [23:33] ah [23:33] thx [23:33] there may be more [23:34] and I know that the extra styles is missing stuff.. and then i made changes to core.css after the other changes that its missing [23:34] so i assume its missing those as well [23:35] on http://bazaar.launchpad.net/~fougner/+junk/light-django-linaro-theme-new-design/changes if you just download the website_base.html, core*.css, and extra_styles.css and replace yours with the ones in the ubuntu branch i think you will pick everything up [23:37] we have too much branches now [23:37] we should merge and push to trunk as soon as something is "progressed" [23:37] it'll be so much easier imo [23:38] that way we can branch just one branch [23:38] and base all our work from one single branch [23:38] instead of having lots of different branches with diverging-problems [23:39] ya.. [23:39] thats where team branches come in handy.. [23:41] hm [23:41] so from the turnk [23:41] trunk [23:41] I should take the core files [23:42] core* website_base extra_css [23:42] extra sytles [23:51] cjohnston:done [23:51] ok.. [23:51] you want me to commit and push? [23:51] please [23:52] Amoz: did you do it on your server or mine [23:52] done [23:52] mine [23:52] feel more comfortable breaking stuff on my own server [23:53] and I really don't need the django-server, I would just be nice to have it up 24/7 on a real ting [23:53] not the builtin django dev server [23:53] but till I figure the djangoserver out I'll have to live with it [23:53] :P [23:54] ya.. [23:54] in my branch [23:54] ask mhall119 on Monday [23:54] still need to remove the old files [23:54] but it's 1am now [23:54] need sleep [23:54] gnite man [23:55] ok [23:55] ill work on it and tell you what branch to merge in in the mornin [23:55] okay, sounds goo [23:55] d