Re: [uportal-dev] Git Workflow

2011-10-27 Thread Steve Swinsburg
Yep, no worries, I just wanted to confirm the process for getting a fix into the branch. thanks again, Steve On 28/10/2011, at 12:49 PM, Eric Dalquist wrote: > Correct, if you "push upstream" you'll be pushing the commit(s) to the Jasig > uPortal repository. If you want to do a pull request y

Re: [uportal-dev] Git Workflow

2011-10-27 Thread Eric Dalquist
Correct, if you "push upstream" you'll be pushing the commit(s) to the Jasig uPortal repository. If you want to do a pull request you would go to: https://github.com/YOURUSERNAME/uPortal/tree/rel-3-2-patches Then click the Pull Request button in the upper right. Really though if the changes ar

Re: [uportal-dev] Git Workflow

2011-10-27 Thread Steve Swinsburg
Ok now we are in business, that makes a lot more sense, thanks Eric (SVN addict trying to switch;) I have successfully pushed my change up to my fork on github! So a final question. If I want to submit a pull request for that commit, I should NOT do: > # After verifying your fork looks good pu

Re: [uportal-dev] Git Workflow

2011-10-27 Thread Eric Dalquist
So in the Forking and Cloning section here: https://wiki.jasig.org/display/UPC/Git+Workflow it looks like you missed a step that should look like: $ git remote add upstream g...@github.com:Jasig/uPortal.git $ git fetch upstream Those two commands add a remote tracker named "upstream" in your

Re: [uportal-dev] Git Workflow

2011-10-27 Thread Steve Swinsburg
I'm working on the 3-2 branch and have a commit ready to be merged into the master branch (which I'd like to submit a pull request for) but I am unclear how I do that, from the branch. Here is what I have done (I already have a fork of uPortal in github) $ git clone g...@github.com:steveswinsbu

Re: [uportal-dev] CAnnot add portlets to a tab immediately after changing the column layout

2011-10-27 Thread Steve Swinsburg
Hi Jen, We thought of that as well, and assumed that was probably the original intent of the DOM manipulation, post column update. So is there no way for a newly added column to be locked by default? That was the only query we had regarding that approach. cheers, Steve On 28/10/2011, at 9:

Re: [uportal-dev] CAnnot add portlets to a tab immediately after changing the column layout

2011-10-27 Thread Jen Bourey
Hi Steve, If you'd prefer, I think it should actually be completely safe to add the "canAddChildren" class to any just-created columns. I'd make sure that it's not accidentally added to a previously-existing column, but there isn't really any way for an end-user to create a locked-down column.

Re: [uportal-dev] CAnnot add portlets to a tab immediately after changing the column layout

2011-10-27 Thread Steve Swinsburg
As it turns out, a whole chuck of DOM manipulation of the page can be removed also which speeds things up a bit between changing the layout and refreshing the page. Previously there was about a 0.5-1.0 second delay while it rewrote the DOM. That is all unnecessary now. I will update the Jira. c

Re: [uportal-dev] Git Workflow

2011-10-27 Thread Eric Dalquist
FYI for those using Eclipse. EGit doesn't have any submodule support right now. That means when you do the normal M2E workflow and have a root uPortal project with additional submodule projects for things like uportal-war the git Team options are _only_ available on the root uPortal project.

[uportal-dev] Documentation uPortal 4: Layouts, Fragments, Audience, etc...

2011-10-27 Thread Laura McCord
Hi Everyone, As people are working on uPortal 4, if any of you have started the Layout section please pay special attention to whether the documentation is accurate. The following topics are in need of verification: * define a fragment (https://wiki.jasig.org/display/UPM40/defin

[uportal-dev] 4.0.2 Release Prep

2011-10-27 Thread Eric Dalquist
We're at the end of the month which means another patch release. I'll be working on cutting the release on Monday or Tuesday (my schedule is a little bit up in the air) so plan on either having bugs merged by Monday morning or holding off until Wednesday. I'll of course send a note when I start

Re:[uportal-dev] [uportal-user] Git Workflow

2011-10-27 Thread Laura McCord
I went ahead and posted the information below in the Developer's Guide section of the uPortal manual located here: https://wiki.jasig.org/display/UPM40/GitHub for reference -Laura On 10/25/11 10:41 PM, Eric Dalquist wrote: After a few days of working with the uPortal source in GitHub we've

Re: [uportal-dev] CAnnot add portlets to a tab immediately after changing the column layout

2011-10-27 Thread Eric Dalquist
It sounds like a good solution to me :) On 10/27/11 9:03 AM, Bruce Tong wrote: I don't know very much about that part of uPortal and I don't feel I'm able to comment with any confidence on the technical merits of the patch. If you were to tell me it's the best way, then I'd believe you. If other

Re: [uportal-dev] CAnnot add portlets to a tab immediately after changing the column layout

2011-10-27 Thread Bruce Tong
I don't know very much about that part of uPortal and I don't feel I'm able to comment with any confidence on the technical merits of the patch. If you were to tell me it's the best way, then I'd believe you. If others disagree, the patch at least provides a work-around until the issue is completel

Re: [uportal-dev] CAnnot add portlets to a tab immediately after changing the column layout

2011-10-27 Thread Steve Swinsburg
Thanks for the verification. It works after you refresh the page as it gets redrawn with the correct info from columns.xsl - its just in the Javascript that generates the page which is missing out form adding the required class. In the Jira I attached a patch that refreshes the page after changi

Re: [uportal-dev] CAnnot add portlets to a tab immediately after changing the column layout

2011-10-27 Thread Bruce Tong
I saw this problem once too when giving a demo. Now that you've mentioned it, I tried to recreate it and was successful. You don't need to add a tab, just change the column layout and then try to add a portlet. On Thu, Oct 27, 2011 at 1:45 AM, Steve Swinsburg wrote: > Hi all, > > We are experienc