You are currently browsing the Subversion repository.
Changesets can be listed by changeset number.
The Git repository is here.

Changeset 208

• Comitted by: rool
• Date: Sunday May 20 19:12:33 2007 (over 17 years ago)

Affected files:

• rool/rails/gullery/trunk/app/views/shared/
• rool/rails/gullery/trunk/app/views/layouts/application.rhtml
• rool/rails/gullery/trunk/app/views/shared/_powered.rhtml
• rool/rails/gullery/trunk/app/views/shared/_theme.rhtml
• rool/rails/gullery/trunk/config/database.yml
• rool/rails/gullery/trunk/vendor/rails/
• rool/rails/gullery/trunk/app/views/layouts/application.mab
• rool/rails/gullery/trunk/app/controllers/account_controller.rb (diff)
• rool/rails/gullery/trunk/app/controllers/application.rb (diff)
• rool/rails/gullery/trunk/app/controllers/projects_controller.rb (diff)
• rool/rails/gullery/trunk/app/helpers/application_helper.rb (diff)
• rool/rails/gullery/trunk/app/views/projects/_asset.mab (diff)
• rool/rails/gullery/trunk/app/views/projects/_project.mab (diff)
• rool/rails/gullery/trunk/app/views/projects/index.mab (diff)
• rool/rails/gullery/trunk/app/views/projects/show.mab (diff)
• rool/rails/gullery/trunk/config/environment.rb (diff)
• rool/rails/gullery/trunk/config/routes.rb (diff)
• rool/rails/gullery/trunk/lib/authenticated_system.rb (diff)
• rool/rails/gullery/trunk/public/dispatch.cgi (diff)
• rool/rails/gullery/trunk/public/dispatch.fcgi (diff)
• rool/rails/gullery/trunk/public/dispatch.rb (diff)
• rool/rails/gullery/trunk/public/javascripts/lightbox.js (diff)
• rool/rails/gullery/trunk/public/stylesheets/lightbox.css (diff)
• rool/rails/gullery/trunk/public/stylesheets/site.css (diff)

rool/rails/gullery/trunk/app/controllers/account_controller.rb:

prev.	current
		include AuthenticatedSystem
		observer :user_observer
5
		before_filter :login_required, :only => [:update_description]
	7	@@hubssolib_permissions = HubSsoLib::Permissions.new({
	8	:update_description => [ :admin, :webmaster, :privileged ],
	9	:index => [ :admin, :webmaster, :privileged ],
	10	:login => [ :admin, :webmaster, :privileged ],
	11	:signup => [ :admin, :webmaster, :privileged ],
	12	:logout => [ :admin, :webmaster, :privileged ],
	13	})
	14
	15	def AccountController.hubssolib_permissions
	16	@@hubssolib_permissions
	17	end
	18
		def update_description
		current_user.description = @params[:value]
		if current_user.save
...	...
		end
		end
15		# Be sure to include AuthenticationSystem in Application Controller instead
16		# To require logins, use:
17		#
18		# before_filter :login_required # restrict all actions
19		# before_filter :login_required, :only => [:edit, :update] # only restrict these actions
20		#
21		# To skip this in a subclassed controller:
22		#
23		# skip_before_filter :login_required
24
		def index
		redirect_to(:action => 'signup') unless logged_in? or User.count > 0
		end
29		# If you want persistent logins, uncomment the second line of #login and add this to your login.rhtml view:
30		#
31		#
32		# Keep in mind that this will cause your session to stick around for 4 weeks. If this is undesirable, use a plain old cookie.
		def login
		return unless request.post?
		::ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS.update(:session_expires => 4.weeks.from_now) if params[:remember_me]
...	...
		end
		end
61		# Sample method for activating the current user
62		#def activate
63		# @user = User.find_by_activation_code(params[:id])
64		# if @user and @user.activate
65		# self.current_user = @user
66		# redirect_back_or_default(:controller => '/account', :action => 'index')
67		# flash[:notice] = "Your account has been activated."
68		# end
69		#end
70
		def logout
		self.current_user = nil
		flash[:notice] = "You have been logged out."

rool/rails/gullery/trunk/app/controllers/application.rb:

prev.	current
		# Filters added to this controller will be run for all controllers in the application.
		# Likewise, all the methods added will be available for all controllers.
		class ApplicationController < ActionController::Base
	4	# Hub single sign-on support. Run the Hub filters for all actions to
	5	# ensure activity timeouts etc. work properly. Gullery accounts are
	6	# only allowed for privileged Hub users. Gullery uses Acts As
	7	# Authenticated itself - the distant parent of Hub itself - so all
	8	# we do is put a wrapper around the AAA library code.
	9
	10	require 'hub_sso_lib'
	11	include HubSsoLib::Core
	12	before_filter :hubssolib_beforehand
	13	after_filter :hubssolib_afterwards
	14
	15	# Gullery's standard preamble
	16
		include AuthenticatedSystem
		helper_method :textilight, :textilize
...	...
		r.to_html.gsub(/^\s+/, '')
		end
20		end
	34	end

rool/rails/gullery/trunk/app/controllers/projects_controller.rb:

prev.	current
		class ProjectsController < ApplicationController
2
	2	include AuthenticatedSystem
	3
		before_filter :login_required, :only => [:create, :update_description, :destroy, :sort]
4
	5
		def index
		if User.count == 0
		redirect_to signup_url
		return
		end
	11	@logged_in = logged_in?
		@user = User.find_first
		@projects = Project.find :all, :order => 'position, created_at'
		end
		def show
	17	@logged_in = logged_in?
		@project = Project.find @params[:id]
		end

rool/rails/gullery/trunk/app/helpers/application_helper.rb:

prev.	current
		module ApplicationHelper
		def show_page_title
5		!@user.nil? && !@user.company.blank? ? @user.company : 'gullery photo gallery'
	5	!@user.nil? && !@user.company.blank? ? @user.company : 'Photo gallery'
		end
		def show_page_nav
		user = User.find_first
10		return 'gullery photo gallery' if user.nil?
11		nav = link_to(user.company, :controller => '/')
12		nav += ' ' + content_tag(:small, link_to((@project.name), projects_url(:action => 'show', :id => @project))) if @project
	10	return 'Photo gallery' if user.nil?
	11	nav = link_to(user.company + (@project ? ':' : ''), :controller => '/')
	12	nav += ' ' + @project.name if @project
		nav
		end
15
16
		end

rool/rails/gullery/trunk/app/views/projects/_asset.mab:

prev.	current
		@indent = 0
		li :id => "asset_#{asset.id}" do
3		if @session[:user]
	3	if @logged_in
		div.toolbar(:width => Asset.thumbnail_width) do
		span.handle { "drag" }
		span.rotate do
...	...
		span.delete { link_to_remote " delete ×", :url => capture { assets_url(:action => 'destroy', :id => asset.id) }, :confirm => "Do you want to delete this photo?" }
		end
		end
14		link_to image_tag(asset.web_path(:thumb), :width => Asset.thumbnail_width, :height => Asset.thumbnail_height), asset.web_path, :rel => 'lightbox', :title => capture { textilight(asset.caption) }
	14	link_to image_tag(asset.web_path(:thumb), :width => Asset.thumbnail_width, :height => Asset.thumbnail_height), PATH_PREFIX + asset.web_path, :rel => 'lightbox', :title => capture { textilight(asset.caption) }
		render :partial => 'asset_caption', :locals => {:asset => asset}
16		if @session[:user]
	16	if @logged_in
		in_place_editor "asset_caption_#{asset.id}", :url => capture { assets_url(:action => 'update_caption', :id => asset.id) }
		end
		end

rool/rails/gullery/trunk/app/views/projects/_project.mab:

prev.	current
		li :id => "project_#{project.id}" do
2		if @session[:user]
	2	if @logged_in
		div.toolbar(:width => Asset.thumbnail_width) do
		span.handle { "drag" }
		span.delete { link_to_remote " delete ×", :url => capture { projects_url(:action => 'destroy', :id => project.id) }, :confirm => "Do you want to delete this entire project?" }

rool/rails/gullery/trunk/app/views/projects/index.mab:

prev.	current
		render :partial => 'project', :collection => @projects
		end
9		if @session[:user]
	9	if @logged_in
		render(:partial => 'project_form')
		in_place_editor "user_description",
		:url => capture { account_url(:action => 'update_description') },

rool/rails/gullery/trunk/app/views/projects/show.mab:

prev.	current
		render :partial => 'asset', :collection => @project.assets
		end
10		if @session[:user]
	10	if @logged_in
		render(:partial => 'asset_form')
		sortable_element 'asset_list',
		:url => capture { assets_url(:action => 'sort', :project_id => @project) },

rool/rails/gullery/trunk/config/environment.rb:

prev.	current
		# Bootstrap the Rails environment, frameworks, and default configuration
		require File.join(File.dirname(__FILE__), 'boot')
	10	PATH_PREFIX = ENV['RAILS_RELATIVE_URL_ROOT']
	11
		Rails::Initializer.run do |config|
	13	# We don't run in the document root, so images etc. must come from
	14	# a non-root location too. Hijack the 'asset host' facility to get
	15	# helper-based links pointing in the right place.
	16	config.action_controller.asset_host = PATH_PREFIX
	17
		# Settings in config/environments/* take precedence those specified here
		# Skip frameworks you're not going to use
...	...
		# Force all environments to use the same logger level
		# (by default production uses :info, the others :debug)
21		# config.log_level = :debug
	28	config.log_level = :warn
		# Use the database for sessions instead of the file system
		# (create the session table with 'rake create_sessions_table')
...	...
		# Include your application configuration below
		require 'taggable'
	63
	64	ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS[:session_key] = 'gulleryapp_session_id'
	65

rool/rails/gullery/trunk/config/routes.rb:

prev.	current
	1	PATH_PREFIX ||= ''
	2
		ActionController::Routing::Routes.draw do |map|
3		map.connect '', :controller => "projects"
	5	map.connect PATH_PREFIX + '/', :controller => "projects"
5		map.signup 'signup', :controller => "account", :action => 'signup'
6		map.login 'login', :controller => "account", :action => 'login'
7		map.logout 'logout', :controller => "account", :action => 'logout'
	7	map.signup PATH_PREFIX + '/signup', :controller => "account", :action => 'signup'
	8	map.login PATH_PREFIX + '/login', :controller => "account", :action => 'login'
	9	map.logout PATH_PREFIX + '/logout', :controller => "account", :action => 'logout'
9		map.projects 'projects/:action/:id', :controller => 'projects'
10		map.assets 'assets/:action/:id', :controller => 'assets', :action => 'show'
11		map.account 'account/:action', :controller => 'account'
	11	map.projects PATH_PREFIX + '/projects/:action/:id', :controller => 'projects'
	12	map.assets PATH_PREFIX + '/assets/:action/:id', :controller => 'assets', :action => 'show'
	13	map.account PATH_PREFIX + '/account/:action', :controller => 'account'
		# Allow downloading Web Service WSDL as a file with an extension
		# instead of a file named 'wsdl'
15		map.connect ':controller/service.wsdl', :action => 'wsdl'
	17	map.connect PATH_PREFIX + '/:controller/service.wsdl', :action => 'wsdl'
		# Install the default route as the lowest priority.
18		map.connect ':controller/:action/:id'
	20	map.connect PATH_PREFIX + '/:controller/:action/:id'
		end

rool/rails/gullery/trunk/lib/authenticated_system.rb:

prev.	current
		protected
		def logged_in?
6		current_user.nil? ? false : true
	6	(!hubssolib_privileged? || current_user.nil?) ? false : true
		end
		# accesses the current user from the session.
...	...
		# user.login != "bob"
		# end
		def authorized?(user)
42		true
	42	hubssolib_privileged?
		end
		# overwrite this method if you only want to protect certain actions of the controller
...	...
		# example use :
		# a popup window might just close itself for instance
		def access_denied
90		redirect_to :controller=>"/account", :action =>"login"
	90	redirect_to '/hub/account/login'
		end
		# store current uri in the session.
...	...
		def self.included(base)
		base.send :helper_method, :current_user, :logged_in?
		end
109		end
	110	end

rool/rails/gullery/trunk/public/dispatch.cgi:

prev.	current
1		#!/usr/bin/ruby
	1	#!/bin/env ruby
		require File.dirname(__FILE__) + "/../config/environment" unless defined?(RAILS_ROOT)
...	...
		require "dispatcher"
		ADDITIONAL_LOAD_PATHS.reverse.each { |dir| $:.unshift(dir) if File.directory?(dir) } if defined?(Apache::RubyRun)
10		Dispatcher.dispatch
	11	Dispatcher.dispatch

rool/rails/gullery/trunk/public/dispatch.fcgi:

prev.	current
1		#!/usr/bin/ruby
	1	#!/bin/env ruby
		#
		# You may specify the path to the FastCGI crash log (a log of unhandled
		# exceptions which forced the FastCGI instance to exit, great for debugging)

rool/rails/gullery/trunk/public/dispatch.rb:

prev.	current
1		#!/usr/local/bin/ruby
	1	#!/bin/env ruby
		require File.dirname(__FILE__) + "/../config/environment" unless defined?(RAILS_ROOT)
...	...
		require "dispatcher"
		ADDITIONAL_LOAD_PATHS.reverse.each { |dir| $:.unshift(dir) if File.directory?(dir) } if defined?(Apache::RubyRun)
10		Dispatcher.dispatch
	11	Dispatcher.dispatch

rool/rails/gullery/trunk/public/javascripts/lightbox.js:

prev.	current
		//
		// If you would like to use a custom loading image or close button reference them in the next two lines.
38		var loadingImage = '/images/loading.gif';
39		var closeButton = '/images/x.png';
	38	var loadingImage = '/images/risc_os_open/lightbox/loading.gif';
	39	var closeButton = '/images/risc_os_open/lightbox/close.gif';
...	...
		// create keyboard message
		var objKeyboardMsg = document.createElement("div");
		objKeyboardMsg.setAttribute('id','keyboardMsg');
407		//objKeyboardMsg.innerHTML = 'press <kbd>x</kbd> to close';
	407	objKeyboardMsg.innerHTML = 'press <a href="#" onclick="hideLightbox(); return false;"><kbd>x</kbd></a> to close';
		objLightboxDetails.appendChild(objKeyboardMsg);
...	...
437		addLoadEvent(initLightbox); // run initLightbox onLoad
	438	addLoadEvent(initLightbox); // run initLightbox onLoad

rool/rails/gullery/trunk/public/stylesheets/lightbox.css:

prev.	current
1		#lightbox{
2		background-color:#333;
3		padding: 5px;
4		}
5		#lightboxDetails{
6		font-size: 0.8em;
7		padding-top: 0.4em;
8		}
9		#lightboxCaption{ float: left; }
10		#keyboardMsg{ float: right; }
11		#closeButton{ top: 5px; right: 5px; }
	1	/* Modified Lightbox CSS file. Taken originally from:
	2	* http://www.huddletogether.com/projects/lightbox/
	3	*/
13		#lightbox img{ border: none; clear: both;}
14		#overlay img{ border: none; }
	5	#lightbox
	6	{
	7	background-color:#eee;
	8	padding: 10px;
	9	}
16		#overlay{ background-image: url(/images/overlay.png); }
	11	#lightbox A,
	12	#lightbox A:hover,
	13	.lightboxplugin A,
	14	.lightboxplugin A:hover
	15	{
	16	border: none;
	17	background: inherit;
	18	}
18		* html #overlay{
19		background-color: #333;
20		back\ground-color: transparent;
21		background-image: url(/images/blank.gif);
22		filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="/images/overlay.png", sizingMethod="scale");
23		}
24
	21	#lightboxDetails
	22	{
	23	font-size: 100%;
	24	padding-top: 0.4em;
	25	}
	26
	27	#lightboxDetails KBD
	28	{
	29	font-size: 150%;
	30	}
	31
	32	#lightboxCaption { float: left; margin-top: 5px }
	33	#keyboardMsg { float: right; }
	34	#closeButton { top: 0px; right: 0px; }
	35
	36	#lightbox IMG { border: none; clear: both;}
	37	#overlay IMG { border: none; }
	38
	39	#overlay { background-image: url("/images/risc_os_open/lightbox/overlay.png"); }
	40
	41	* HTML #overlay
	42	{
	43	background-color: #333;
	44	back\ground-color: transparent;
	45	background-image: url("/images/utilities/blank.gif");
	46	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="/images/risc_$
	47	}

rool/rails/gullery/trunk/public/stylesheets/site.css:

prev.	current
	1	/* RISC OS Open Gullery theme stylesheet.
	2	*
	3	* Heavily based on the Gullery default theme.
	4	*/
2		body, p, input, textarea {
3		font-family: "Futura", "Lucida Grande", Verdana, sans-serif;
4		}
	6	@import url("/css/risc_os_open.css");
6		body {
7		background: #525252 url("/images/bgcolor.gif") fixed repeat-x top left;
8		color: white;
9		margin: 0;
10		}
11
		input {
		color: black;
		}
...	...
		#container {
		text-align: center;
22		margin: 0 auto;
23		padding: 0 10px;
24		width: 690px;
25		voice-family: "\"}\"";
26		voice-family:inherit;
27		width: 670px;
		}
29		html>body #container {
30		width: 670px;
31		}
33		#header {
34		background-color: #3B1E33;
35		/* Mozilla ignores crazy MS image filters, so it will skip the following */
36		filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/images/grad-up.png',sizingMethod='scale');
37		}
38		/* IE ignores styles with [attributes], so it will skip the following. */
39		#header[id] {
40		background: #3B1E33 url(/images/grad-up.png) repeat-x top left;
41		}
42
43
44		#content {
45
46		}
47
48		#footer {
49		font-size: 0.8em;
50		text-align: center;
51		padding-top: 4em;
52		clear: both;
53		}
54
55
		/******************************
		* HTML Elements
		******************************/
60		h1 {
61		margin: 0 0 10px 0;
62		padding-bottom: 8px;
63		border-bottom: 4px solid #333;
64		font-weight: normal;
	24	h2 {
	25	text-align: left;
		}
67		a, a:visited {
68		color: white;
69		text-decoration: none;
70		}
71		a:hover {
72		color: black;
73		background-color: white;
74		}
75
76		form {
	28	#container form {
		display: block;
		clear: both;
		text-align: center;
		padding: 1em;
		}
83		input {
	35	#container input {
		font-size: 1.2em;
		padding: 0.2em;
		margin-right: 10px;
		margin-top: 5px;
		}
90		small, small a, small a:visited {
91		color: #cccccc;
92		}
93
94		div.description {
	42	#container div.description {
		text-align: left;
		}
...	...
		#asset_list li {
		float: left;
		padding: 8px;
112		width: 216px;
113		voice-family: "\"}\"";
114		voice-family:inherit;
		width: 200px;
		}
...	...
		#asset_list li a:visited img {
		display: block;
		margin-bottom: 5px;
124		border: 0;
125		border-bottom: 4px solid #3B1E33;
	69	border: 1px solid black;
		}
		#project_list li a:hover img,
		#asset_list li a:hover img {
130		background-color: black;
131		border-bottom: 4px solid white;
	74	border: 1px solid #E5FFD4;
		}
		#project_list li small,
...	...
		******************************/
		.toolbar {
144		background-color: #333333;
145		opacity: .6;
146		filter: alpha(opacity=60);
147		padding-left: 10px;
148		text-align: right;
	87	background-color: #ada;
	88	padding-left: 10px;
	89	text-align: right;
		}
		.toolbar span {
...	...
		.inplaceeditor-form a {
		font-size: 0.8em;
		}
183
184