scottmotte-merb_auth_slice_multisite 0.7.3 → 0.7.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/VERSION.yml +1 -1
- data/app/views/exceptions/unauthenticated.html.erb +16 -16
- metadata +2 -2
data/VERSION.yml
CHANGED
|
@@ -1,17 +1,18 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
1
|
+
<% @login_param = Merb::Authentication::Strategies::Multisite::Base.login_param %>
|
|
2
|
+
<% @password_param = Merb::Authentication::Strategies::Multisite::Base.password_param %>
|
|
3
|
+
<% @site_id_param = Merb::Authentication::Strategies::Multisite::Base.site_id_param %>
|
|
4
|
+
<%
|
|
5
|
+
# make @current_site value. application.rb does not get call
|
|
6
|
+
# because the authentication is protected at the rack level - which is better,
|
|
7
|
+
# but it means I have to add the following duplicate line of code as far as I know.
|
|
8
|
+
@current_site = Site.first(:subdomain => request.first_subdomain)
|
|
9
|
+
%>
|
|
10
|
+
|
|
11
|
+
<div id="login_fields">
|
|
12
|
+
<h3>
|
|
13
|
+
Login
|
|
14
|
+
</h3>
|
|
15
|
+
<%= error_messages_for session.authentication %>
|
|
15
16
|
<form action="<%= slice_url(:merb_auth_slice_multisite, :perform_login) %>" method="POST" accept-charset="utf-8" id="login_form">
|
|
16
17
|
<input type="hidden" name="<%= @site_id_param.to_s %>" value="<%= @current_site.id %>" id="<%= @site_id_param.to_s %>">
|
|
17
18
|
<input type="hidden" name="_method" value="PUT" />
|
|
@@ -29,8 +30,7 @@
|
|
|
29
30
|
</div> <!-- close: formRow -->
|
|
30
31
|
</form>
|
|
31
32
|
</div>
|
|
32
|
-
|
|
33
|
-
<div id="forgot_password">
|
|
33
|
+
<div id="forgot_password_fields">
|
|
34
34
|
<form action="/send_password" method="post" accept-charset="utf-8" id="send_password_form">
|
|
35
35
|
<input type="hidden" name="<%= @site_id_param.to_s %>" value="<%= @current_site.id %>" id="<%= @site_id_param.to_s %>">
|
|
36
36
|
<div class="formRow">
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: scottmotte-merb_auth_slice_multisite
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.7.
|
|
4
|
+
version: 0.7.4
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- scottmotte
|
|
@@ -9,7 +9,7 @@ autorequire:
|
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
11
|
|
|
12
|
-
date: 2009-
|
|
12
|
+
date: 2009-05-01 00:00:00 -07:00
|
|
13
13
|
default_executable:
|
|
14
14
|
dependencies: []
|
|
15
15
|
|