=== Turl1 is now known as Turl [04:45] mhall119: um- I was just looking at how you merged source into the branch - I might have a tip for you when you're online [12:56] MTecknology: I'm always open to tips [13:57] mhall119: you are disturbing me [14:08] cjohnston: I do what I can ;) [15:05] cjohnston: you are not distrurbing me [15:07] mhall119: so.. my suggestion is to do an actual merge rather that a pull/push - that's going to kill youi down the road [15:10] mhall119: I'm guessing what you did was bzr branch lp:~ubuntu-drupal-devs/ubuntu-website/xyz; cd xyz; bzr push lp:light-drupal-theme [15:10] What I would have done (for a new branch) [15:11] mkdir light-drupal-theme; cd light-drupal-theme; bzr init; bzr merge lp:~ubuntu-drupal-devs/ubuntu-website/xyz; bzr commit -m "blah"; bzr push light-drupal-theme [15:12] mhall119: then it's a single revision with all the changes you're signing off on [15:13] mhall119: for updating - bzr brach lp:light-drupal-theme; cd light-drupal-theme; bzr merge lp:~ubuntu-drupal-devs/ubuntu-website/xyz; bzr commit -m "foo"; bzr push lp:light-drupal-theme [15:19] MTecknology: the light-drupal-theme was already there, I did a branch of that, then pulled from yours,then pushed back [15:19] I guess I should have merged instead of pulling [15:19] I'm still learning the "proper" way of doing things in bzr [15:20] going between that and hg at work, sometimes I get confused [15:25] mhall119: i bet - I could walk you through it if you want [15:25] no need, I understand what you're saying [15:25] and thanks [15:25] mhall119: hope i helped some [15:26] absolutely did [15:34] mhall119: doing that will let you 1) sign off 2) ignore first branch in future 3) keep revisions (changes) low (100 revisions in a testing branch turns into one [15:39] mhall119: it might not be a horrible to remake everything to revision 1 for those branches either - just a thought [15:40] yeah, I'd have to delete the branch and start over [15:42] newz2000: is it okay if I delete the lp:ubuntu-website/light-drupal-theme branch and redo it the way MTecknology recommends? [15:42] mhall119: you don't need to delete [15:42] I don't? [15:44] nope [15:45] okay, now you've got my full attention, how do I get rid of the pull history on a branch already in launchpad? [15:46] there's two options [15:46] the long way; and the fast way [15:46] * mhall119 is listening [15:48] the long way is better for established branches that are regularly used - the fast way is great to just quickly change it [15:48] would you mind explaining both, so I know the difference and which to use in future cases too? [15:49] bzr uncommit will let you roll back changes - if somebody branched that version, then get the sync on bzr pull, either way their own changes get broken [15:50] you usually use that if you're rolling back only one or two changes [15:50] the other way; you start fresh - but with no previous deletes [15:50] if I uncommit on my local branch, then push to LP, will it uncommit the ones in the LP branch too? [15:51] ya [15:51] oh, I had just assumed it wouldn't [15:51] the way i'd suggest will do essentially the same - but it'll bring you back to revision 0 [15:53] mkdir tmp; cd tmp; bzr init [15:53] bzr merge lp:ubuntu-drupal-theme [15:53] bzr commit -m "Your own message" [15:53] bzr push lp:ubuntu-website/light-drupal-theme --overwrite [15:54] either way you need to attach --overwrite because you're going back in time - and developers don't like time travel :P [15:54] heck.... [15:54] okay, that makes sense [15:55] mkdir tmp; cd tmp; bzr init; bzr mergelp:ubuntu-website/light-drupal-theme; bzr commit -m "foo"; bzr push lp:ubuntu-website/light-drupal-theme --overwrite [15:55] you can exclude any other branches from it :P [15:56] pushing now [15:56] Remaking branch to merge instead of pull from drupal dev's branch [15:58] newz2000: You should fix up 'bzr whoami' It's kinda ugly right now - Matthew Nuzum [15:59] MTecknology: did I do that right? [15:59] mhall119: yup [16:00] mhall119: take a peak - https://code.edge.launchpad.net/~ubuntu-website-community/ubuntu-website/light-drupal-theme [16:00] but the changelog still has it as revision 32 [16:00] not here [16:00] Recent revisions [16:00] 1. By Michael Hall 1 minute ago [16:00] Remaking branch to merge instead of pull from drupal dev's branch [16:01] http://bazaar.launchpad.net/~ubuntu-website-community/ubuntu-website/light-drupal-theme/changes [16:01] :S [16:02] mhall119: that's odd [16:03] * mhall119 hopes he didn't screw things up [16:04] oh, interesting, I now have negative revision numbers [16:04] hey guys [16:04] previous rev 31 is not rev 0, previous 30 is not -1, etc [16:04] that's a cool way of doing it [16:05] I got some updates: http://stas.nerd.ro/pub/light-base-theme/wp/ [16:05] :) [16:05] * newz2000 is still on the phone, bb soon [16:05] mhall119: I just asked what happened with that in #lp [16:05] I saw [16:06] I wonder if it's just sequentially numbering revisions, instead of using the actual revision # [16:08] it's odd - /me looks [16:09] Branched 1 revision(s). [16:14] mhall119: the only thing I could think of is 1) something is messed up on their end or 2) bzr branch lp:ubuntu-website/light-drupal-theme; cd light-drupal-theme; bzr reconcile; bzr push lp:ubuntu-website/light-drupal-theme --overwrite [16:14] mhall119: or your original plan of deleting - I'd wait a bit though and see if maybe it's a loggerhead bug [17:22] hi gang, I'm here [17:22] * newz2000 reads the history [17:23] that is ugly [17:23] * newz2000 will do [17:26] hi webbers! We'd like to give more visibility to operation cleansweep, I'd like to ask/wonder what it would take to get the patch review slider we made on planet? https://wiki.ubuntu.com/OperationCleansweep [17:27] newz2000: I tagged the theme as beta http://stas.nerd.ro/pub/light-base-theme/wp/ [17:28] code is on lp, rev 6 [17:29] stas: it's looking good, did you get help on the comments? [17:29] newz2000: nope, done by myself [17:29] :-( [17:30] I will post a video on how to manage it [17:31] since there are 8 or 9 widgets [17:31] and some of them offer fantastic content management [17:32] also, there are some css/js easter eggs like .awesome class and .slider class [17:32] :-) [17:33] awesome generates those fancy buttons and .slider generates a slider from an element's children img tags [17:37] btw wp.30 is out :) [17:37] I just updated [17:37] as in, 15 seconds ago [17:38] I wonder if I should switch from svn to a normal release [17:38] I've been on 3.0 since beta/alfas and it was pretty stable [17:38] yeah, me too [17:39] haven't had one issue [17:39] wp-devs are celebrating :) [17:44] knome: when you got some time, test the new theme rev.6 in lp [18:00] stas: jono is excited by your theme, he wants to use it right away [18:00] but he has to use it on 2.x, do you think he'll be OK? [18:00] newz2000: give me a sec so I can add some compatibility checks [18:00] ok [18:02] newz2000: oh, no I think he's safe, I rewrote today that part with required wp3.0 api [18:02] to be sure I can make an install locally with 2.9 [18:03] hi [18:03] stas: I'll test too [18:03] btw, I will be very difficult to reach tomorrow, I may have Jono or his minions come here for help if they need it [18:05] newz2000: that means I will do the most today so there be no problems tomorrow [18:06] :-) I'm going to email some people to help test the theme [18:06] newz2000, i'll test it [18:07] daker: awesome [18:07] stas, wp 2.9 or 3.0 ? [18:08] I think we'll have more 2.9 users initially, if you can test with that it'd be awesome [18:08] great [18:13] stas, just to make sure i am right, bzr branch lp:~sushkov/ubuntu-website/light-wordpress-theme ? [18:14] we should merge that in I think [18:14] newz2000: works flowlessly with 2.9 [18:14] great [18:14] daker: yes [18:15] newz2000: got a vide, posting it in a second [18:19] * stas zomg on core 2 duo 2.4Ghz and still coding 5m of ogm vide [18:19] yeah, I've been creating some ogg video this week too [18:20] the crazy thing is that h.264 takes about 1m per 1m of video, ogg takes like 5m per 1m [18:20] yeah... it takes as long as creating one :) [18:21] stas: what do you use for screencasts? [18:21] gtk-recordmydesktop [18:21] is there something better? [18:21] I don't know, when I tried that a while back it crashed my desktop [18:21] so now I boot into another os and use a non-free tool [18:22] I've used gtk-recordmydesktop [18:23] it worked for me, but afaik it works ok only on gnome wm [18:23] I've used istanbul before too [18:23] I should try again I guess [18:24] * stas ~80% [18:25] It would be awesome if vimeo could do it. Then one tool for editing and capturing. [18:25] oops, not vimeo [18:26] pitivi [18:27] yep [18:27] ok i got the ogm [18:27] im trying to put it on youtube but its really slow [18:45] newz2000: http://ubuntuone.com/p/7LP/ [18:45] stas: is that a video? [18:45] amazingly ubuntu one was the fastest :) [18:45] yes [18:45] using 2.9 [18:45] cool, I'll send an email [18:45] then I think I'll get some lunch and come back and help test myself [18:46] stas: should we ask people to file bugs or do you want emails back to the list? [18:46] newz2000: great, I'll be waiting, till then Ill finish some wp localizations [18:46] newz2000: bugs [18:46] I love lp [18:46] or if they are easier with emails [18:46] be then emails [18:47] Is there a way to link new bugs with the branch? [18:47] the video is shows how to install the theme, set up the main page and blog page and how to add menus [18:47] newz2000: dunno [18:48] newz2000: what do you mean? [18:48] so when someone reports a new bug we know it's for the wordpress code, not drupal or something else [18:48] ah, found it [18:48] https://bugs.launchpad.net/ubuntu-website/light-wordpress-theme [18:48] usually branches are associated with bugs when the branch contains a fix [18:49] right? [18:49] we have a series for each project (wordpress, drupal, base, etc) [18:49] oh, you mean against the series [18:49] ok [18:49] thought you were talking about the bzr branch [18:50] well, I was but the series seems to be the answer [18:52] ok, I better go eat, be back in a bit [18:57] moved light-django-theme to a branch owned by ~ubuntu-website-community [19:03] stas, how can i add a sidebar ? [19:04] daker: the sidebars are available only for news aka blog pages and single post pages [19:04] there's no need for sidebar for static pages [19:04] I wanted to save more space for content [19:13] the default.css is still pointing to http://s.ubuntu.ru/ for a lot of images [19:14] https://bugs.launchpad.net/ubuntu-website/+bug/595621 [19:14] I've submitted a merge proposal to light-base-theme [19:14] I added light-wordpress-theme and light-drupal-theme to the bug, because I'm not sure if you're using the same css or not [19:15] stas: MTecknology ^^ [19:15] mhall119: nope light-wordpress-theme doesn't depend on light-base-theme css [19:16] stas, http://imagebin.org/101657 [19:17] daker: thats why I posted the video [19:17] ah :) [19:17] delete the widget title for pages widget [19:18] mhall119: hm? [19:19] MTecknology: the default.css from light-base-theme was referencing images on another server [19:19] mhall119: the drupal version isn't yet based on the base theme [19:20] oh, I thought that's what the new branch was that I was screwing up earlier [19:20] nope, that's the ubuntu-drupal version that we've been working on for a while now [19:21] oh, ok [19:21] I'll take you off the list too then [19:21] I need to fix some bugs and start taking some parts off and basing against the base-theme version [19:52] mhall119: https://bugs.edge.launchpad.net/ubuntu-drupal-theme/+bug/595644 [19:58] MTecknology: cool, are you on the ubuntu-website-community team? [19:58] mhall119: no [19:58] hey stas, around still? [19:59] hey [19:59] newz2000: yep [19:59] hey jono [19:59] stas: I just got back, jono is trying to test [19:59] mhall119: it's just cjohnston, newz2000, and you [19:59] says its not listed in his themes… any tricks? [19:59] oh cool, hey jono [19:59] hey stas [19:59] newz2000: can you add MTecknology to the ubuntu-website-community team so he can maintain the light-drupal-theme branch? [19:59] lets see if you guys can build a cool website out of it without my help :) [19:59] mhall119: yes, what's his lp nick? [20:00] <- newz2000 [20:00] that's not pretty.... :( [20:00] * MTecknology <- newz2000 [20:00] there :) [20:01] so I am running the branch on my new website I am building for ubuntu.com [20:01] ok, give me a moment [20:01] happy to test [20:01] jono: what wp version? [20:01] ping me when you have an update, I am just working on something else at the moment [20:01] stas, most recent 2.x [20:01] I am running it out of svn so I can upgrade easily [20:01] ok, should work [20:01] cool [20:01] stas: do we just cd wp-content/themes && bzr branch lp:~sushkov/ubuntu-website/light-wordpress-theme [20:01] just tested it with 2.9, there's a video if you got 5m free [20:01] ? [20:01] ahhh it is in the broken themes section [20:01] says the template is missing [20:02] newz2000, thats what I did [20:02] jono: its a child theme, install thematic framework [20:02] install what? [20:02] stas: ah [20:02] a theme, called thematic [20:02] ok, have a link? [20:02] http://wordpress.org/extend/themes/thematic [20:02] use themes -> add new [20:03] right [20:03] stas: do we put this theme inside the thematic folder? [20:03] nope [20:03] or next to it? [20:03] no outside [20:03] next ot it [20:03] its a dependancy [20:03] thematic for wordpress is like zen theme for drupal [20:04] i should add a screenshot to it btw [20:04] ok, I see it now [20:04] jono: if you're in a rush, you may need to wait... [20:04] it will take a little time to get it looking good [20:04] I mean you need to fiddle with it a bit [20:05] ok it works [20:05] thanks chaps [20:05] I will wait for you to refine it and in the meantime I will check the video [20:06] stas, do you have a feature so I can exclude pages from the nav bar? [20:06] that will be key for me [20:07] you need a plugin for wordpress 2.9 [20:07] in wordpress 3.0 its all included [20:07] I need to check exactly what can we use in 2.9 [20:08] stas, odd, with other themes I have used it has been of the theme [20:09] I ask because IS are really uncomfortable about including lots of plugins [20:09] so I am trying to keep the plugin count *really* low, and preferably no plugins [20:10] stas: this will be a reoccurring prob since the locos often use canonical's hosting [20:10] can you build this into the theme stas? [20:10] jono: yes, I think I can [20:10] stas: do you like working on your own or do you want me to push for more wp help? [20:11] how hard would be to upgrade to 3.0? [20:11] stas, awesome [20:11] newz2000: i can handle everything by myself so far, though i avoid doing tests, too lazy :) [20:11] stas, unlikely [20:12] easy for me to upgrade, but IS won't run it [20:12] stas: not going to be at the top of IS's priority list [20:12] they will run 2.x until 3.x is fully stable [20:12] jono: went stable today! [20:12] IS means what? [20:12] sys admins [20:12] newz2000, hah, it is a .0 release thoiugh [20:12] newz2000, dude, you know what IS are like :-) [20:13] yeah, totally [20:13] newz2000, maybe we should not second guess IS and check with them [20:13] newz2000, let me do this now [20:14] how bad are your sysadmins? If they need help I can assist them :) [20:14] * mhall119 is once again amazed by bzr [20:15] ok talking with elmo now [20:15] stas: they've got a lot of responsibility and if they mess up they end up on the front page of slashdot and digg [20:15] * newz2000 has been there, that kind of popularity is no fun [20:15] ok, now I understand their position :) [20:15] heh [20:16] there some good features added into wp 3.0 so I would consider upgrading, even if it's a .0 [20:17] stas, newz2000 ok elmo confirmed 3.x will be fine [20:17] which is awesome [20:17] kewl [20:17] wow, I'm stunned [20:17] same here [20:17] so stas, focus on 3.x [20:18] I will upgrade my test site and test there too [20:18] maybe 3.x has something they're waiting some long time so it worth [20:18] hah [20:18] he may have been drunk, also [20:18] lol [20:18] :) [20:18] stas: you're right, actually… it lets them ditch mu [20:19] jono: I will try to create an export xml with a demo wordpress loco website so you can test everything without creating content and stuff like that manually [20:20] stas, its ok, I have the content already in place, I just need to make sure the theme can display it right [20:20] also that xml file can be used as a skeleton for loco websites as we discussed it with newz2000 yesterday [20:20] I will keep developing my content in another theme and then move it to the new theme when ready [20:20] stas, I assume the nav bar shows the pages on the site [20:20] and the lower nav bar are subpages? [20:21] jono: yes, in wp 3.0 you got a new feature where you can create custom menus, so you can place whatever you want in those nav bars [20:21] stas, awesome [20:21] i will play with it and see what I can do [20:21] jono: yes, but not necessary, I placed there sublist pages, but you can place there a twitter status [20:21] stas, so just so you know, you new theme will be driving developer.ubuntu.com and uds.ubuntu.com [20:21] :) [20:21] those are the sites I signed up to work on [20:22] jono: wow, thats awesome, you better keep me updated if there's something broken or that requires attention, so I can fix it asap [20:23] stas, will do, I will be testing on my local sites, so we will stay in touch [20:23] you're on the hook now stas [20:23] these will not be blogs but conventional websites [20:23] don't want to be on the frontpage of slashdot [20:23] stas, does your theme support widgets? [20:23] great, I need to write some docs for it then [20:23] stas, was ;) [20:23] mhall119, lool [20:23] lol [20:23] hey jono :) [20:23] hey knome [20:24] jono: yes, but I moved them only to blog view, and left the above footer widget area and asides for the rest [20:24] jono: I'll post a video with all those features ok [20:25] knome: thanks for the tips on those widgets/asides :) [20:25] stas, no problem [20:25] thanks stas [20:25] stas, if you need more ideas, just poke me [20:25] so where do I configure the nav? [20:25] ahh I see it [20:25] stas, which theme were you talking about? the wp? [20:25] knome: wp [20:25] stas, okay [20:26] it says the current theme doesnt support menus in the menu editor [20:26] stas, i'll give it a go later today or tomorrow [20:26] is that right stas? [20:26] jono: did you create any menus? [20:26] not yet [20:26] my previous theme just used the pages [20:26] create a custom menu with some pages/links [20:27] ok [20:27] * stas going to rec a video how to use the theme brb [20:27] done that [20:28] how do I add it to the nav? [20:29] jono: HI! [20:30] hey MTecknology [20:30] jono: haven't noticed you in a while - figured i have to pounce [20:34] stas, ^^ how to add the menu to the nav? [20:34] look at widgets [20:34] there should be a widget called custom menu [20:35] ahhh ok [20:35] add it, a dropdown list shold appear in options [20:37] awesome it [20:37] works [20:37] so to have the submenu in the grey bar [20:37] how does that work [20:37] how do I define a subpage for a page? [20:37] to put in that menu [20:41] oh hang on [20:41] I might have this [20:41] ahhh no it didnt work [20:43] stas, ^^ [20:43] so I just need to figure out how to get subpages in the gray sub-nav [20:45] * newz2000 has to move on to other tasks now [20:47] thanks newz2000 [20:51] progess so far on updating loco-directory to the new theme: http://family.ubuntu-fl.org:8001/ [20:52] only teams pages and about are using the new theme so far [20:57] jono: i finished the video [20:57] stas, cool [20:57] just a sec so I can upload [20:58] jono: I think I will remove that secondary widget menu and add there automatic subpages listing [20:58] its the best afaik and will require no additional plugins [20:58] just the theme [20:58] stas, would would be perfect [20:59] stas, although you will want to make sure you can exclude pages from the submenu [20:59] I was using widget context for that [20:59] it adds some nice controls over widgets [20:59] http://konstruktors.com/wp-content/uploads/2009/07/widget-context-settings-0.4.1.png [21:00] adds that wide widget context options panel [21:00] is that a plugin? [21:01] yes [21:01] its not included in core [21:01] too bad actually [21:01] * stas video is still encoding ~20% [21:02] stas, so I have a proposal for you: [21:02] jono: shoot [21:03] ok, so imagine we have: [21:03] Page [21:03] Sub-page [21:03] Sub-page 2 [21:03] Sub-page 3 [21:03] one page with three sub-pages [21:03] ok [21:04] the optimal workflow for me is that I set it up like this in WP and then when I click on Page in the nav, the sub-pages automatically appear in the grey bar [21:04] but then I can somehow explicitly exclude a sub-page from the nav [21:04] without plugins [21:04] can you do this inside the theme? [21:04] actually, dude [21:04] ignore me [21:04] ignore the excluding pages requirement [21:05] can you just have the grey box just automatically show the sub-pages? [21:05] jono: sure, thats what I was talking right before you started the proposal :) [21:06] stas, perfect! [21:06] that would solve me problem perfectly [21:06] if you can hack on this, I will update my branch [21:06] ok commit to follow soon [21:07] nice! [21:07]