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