El Dorado

Hi Trevor,

Thanks for much for creating this great Rails project. I am planning to try and integrate el dorado with my current site so I can use one login system and use the user functions with my current framework. I currently only have a login system on my site just for administration so blowing that away won't be a big deal.

What do you think is the best way to go about this? Make a backup copy of my site and slowly start merging the files from el dorado?

One thing I am worried about is the database migrations. If I do this then I don't think the database migrations will work anymore.

I'm sure you've seen this plenty of times before. Let me know what you think! Thanks again!

I'm not sure, really. It depends on how much you're planning to change and so-forth. I'd suggest forking on cloning the git repo and making a branch. From that branch, you could pull in your work and either do everything manually, or try and nasty merge. If you're looking for something based on engines that might be more clean for integrating into existing code, check out adva_cms: http://github.com/svenfuchs/adva_cms/tree/master

Thanks for the suggestion. I think I'm going to attempt the nasty merge :P

I'll let you know how it goes.

Good luck!

hey trevor,

was wondering if you could give me some help with git. i've never really used it much before but want to try it to do the nasty mere.

i've created my initial repository:
git init
git add .
git commit

i created my initial branch:
git checkout -b 1.0

but, how should i go forward if i'm trying to merge?

create another branch:
git check -b 1.1

then copy over my files and run one of the git merge commands to combine both branches?

sorry for the newbie question. i thought you would know best!

Well, you should keep "master" in line with mine, and have your own branch called "custom" or something like that. Then, you could work in "custom" and merge back in the changes from "master" into "custom" from time to time.

So,

git checkout -b custom
(from within custom)
make changes, commit, etc
(then eventually, from the custom branch)
git merge origin/master (or switch to master and "git pull", then back to "custom" and "git merge master)

Basically, the idea would be to have a "custom" branch that had all your changes, and then you could merge in my changes as you saw fit into that branch.

That's pretty advanced git stuff, though, so don't feel bad if it takes a while to figure it all out. Git is great, but it's not really that easy to use when you're starting out.

thanks for the advice. I decided to just do this one by hand. I think I'll learn how to use git branches in the future.

I have pretty much integrated my whole site manually...which was alot easier than i thought, but I'm having trouble with some of the CSS.

Some of my forms are looking pretty messy because I have been using tables. They are stretched out to 100% and I'm having a hard time removing the row and column borders. A few have multiple columns so I couldn't get them working very well with CSS.

What I was wondering is there someway to override your default table parameters?

which are:

table {
width: 100%;
border: 1px solid #35604d;
margin-bottom: 10px;
}

and

tbody td {
padding: 5px;
vertical-align: top;
border-top: 1px solid #cedeb9;
border-right: 1px solid #cedeb9;
}

so I can remove the td border and 100% table width?

I tried using my css style:

table.color1 {
border: 1px solid black;
background: beige;
padding: 5px
}

but it still inherits the properties of table {}

Do you think I should just change the default options for table {} and make a new class with the 100% for the other tables?

thanks!

nevermind! i just figured it out...i used these CSS classes:

table.form {
width: auto;
border-collapse: collapse;
}

tbody td.no_border {
padding: 5px;
vertical-align: middle;
border-top: 0px solid;
border-right: 0px solid;
}