Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Redesigned directory page #32

Closed

Conversation

tarcieri
Copy link
Contributor

This is a branch based off the same history as bootstrapped-welcome-page. It's not 100% complete but it redesigns the directory pages with the same style as the welcome page:

directory page

Some work is clearly needed on the forms at the bottom of the page. Shouldn't be too hard, I hope!

@thedod
Copy link

thedod commented Mar 15, 2013

Haven't tried your patch yet, but screen capture looks great.
When you first did the welcome page, it wasn't useful for my public lafs-rpg site (since it doesn't expose the welcome page anyway), but a bootstrap directory page could really be helpful there (especially if I fork it and brand it a bit).
Thanks.

@tarcieri
Copy link
Contributor Author

This is a bit held up on the welcome page merge, as that contains all the CSS assets this is relying on. I will need to cherry-pick b87a671 on top of whatever history ends up getting merged for the welcome page.

That said, I'd be happy to finish this up once the welcome page is merged.

@leif
Copy link
Contributor

leif commented May 6, 2013

Here is a pull request on this pull request, which fixes the tests broken by this patch: tarcieri#1

I'm using this patch, but there are some rough spots (overlapping text, etc) that should be fixed up before it lands. I'll leave a comment here if I'm going to start working on it.

@daira
Copy link
Member

daira commented May 25, 2013

@tarcieri
Copy link
Contributor Author

tarcieri commented Sep 9, 2013

I merged @markberger's commits. This is looking close to mergeable now.

@markberger
Copy link
Contributor

@zooko So can this be merged?

@zooko
Copy link
Member

zooko commented Nov 29, 2013

Yes, by our process, it is now okay to merge this branch into trunk. I suppose the reason it hasn't been merged into trunk is that someone who has write-access to https://github.com/tahoe-lafs/tahoe-lafs hasn't yet done the "manual labor" of merging it. It says here:

"We can’t automatically merge this pull request.

_Use the command line_ to resolve conflicts before continuing. "

Can you, markberger, or someone, make a new branch which has a nice "tells a good story" sequence of commits in that branch and which merges cleanly using the github "merge this now" button?

@tarcieri
Copy link
Contributor Author

I can rebase this branch

Tony Arcieri

On Nov 28, 2013, at 9:15 PM, zooko notifications@github.com wrote:

Yes, by our process, it is now okay to merge this branch into trunk. I
suppose the reason it hasn't been merged into trunk is that someone who has
write-access to https://github.com/tahoe-lafs/tahoe-lafs hasn't yet done
the "manual labor" of merging it. It says here:

"We can’t automatically merge this pull request.

to resolve conflicts before continuing. "

Can you, markberger, or someone, make a new branch which has a nice "tells
a good story" sequence of commits in that branch and which merges cleanly
using the github "merge this now" button?


Reply to this email directly or view it on
GitHubhttps://github.com//pull/32#issuecomment-29497208
.

tarcieri and others added 4 commits November 29, 2013 13:10
This is an initial conversion of the directory pages from the old style
to the new style which is based on Twitter Bootstrap.

Still some remaining work to be done. You can see a screenshot here:

http://i.imgur.com/MPEngGx.png
@tarcieri
Copy link
Contributor Author

@zooko rebased. There was one small thing that had to be addressed by hand (rename link changed from 'move' => 'relink') which is now fixed. You should have the big green merge button now.

@daira
Copy link
Member

daira commented Dec 1, 2013

Re-reviewing.

@warner warner closed this in c4da6c9 Sep 2, 2014
@tarcieri
Copy link
Contributor Author

tarcieri commented Sep 2, 2014

🎉

meejah pushed a commit to meejah/tahoe-lafs that referenced this pull request Dec 4, 2021
Fix item LFS-01-008 from the Cure53 audit

Fixes: ticket:3822
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
6 participants