trusty-multi-site-extension 2.0.0.pre.beta → 2.0.1.pre.beta

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWIxODlhMmY0ODI2ODU0NTRiYTMzN2RmOGI2ZDU5ZDcxODQxNDJjYQ==
+    N2NmZTgwZWQ2NWE3MmIzOWY1MjVjZGYwNjZmOGY3MWZiMTIzMzRkNg==
   data.tar.gz: !binary |-
-    MzUyN2E3ZWNjYzNjZGU2YmIyMjM3OGJhN2Y1Yzg0NTljODhlNmE5Yg==
+    YjgwNTlmMGNhMDkyZjgzMDc2ZTIwNmMzNjMzZjRmNGE0MWRhODczNA==
 SHA512:
   metadata.gz: !binary |-
-    ZGFkNmQ2NjQwZjRjNjQzM2YzMjdhMWM3Y2I2Y2U1ZWZkYmU2YTUwY2FjYWU0
-    NTBjODMyMWZhMDgxMWEwNjcwMjQxNzg3NzAxY2I5NzZkMGY4MDU3NDFjN2Mz
-    MmMyODI2OTJlNjg5ODQxNmVmZDFiOTRjODlhNmZlNGU5NDMxZTI=
+    MzE4MWUyYTEwMWQ5MjVhZjQ4YjFhOWNiNjk4YmI5NGI1YzNkMjA0YWY3Mzgw
+    ZjUyZjhkZDEwMDVlOTU1YTgyMjFmMjBkZjQwYjc4Njc0YTk4NzFlN2MyOGVk
+    YjIxMGM4ODEyMDUwYzRmODEwYWI0NzA2NDFkZGVmMWMzMDgzMzA=
   data.tar.gz: !binary |-
-    NTk3MzI1Y2YxMjJmNWEyYTU5MzAyYzQ5MjA3NGMyNDM4NmRhMjdiNWNiOTdi
-    MGVjOTEyZjE5Yjc0ZjVmNTRlMzQ2NDlkOGM2NDFiN2ZiY2Q4M2JhNDMwZTM4
-    ODgyOTZhYjA1N2YwMDk3NDJhZTI2ZGI0YmFkNDAwZDMxMmFjYmQ=
+    MTE4OTM5NDUwZmM2NWI5ODc2Y2ViNGEyMmEwNGY3M2NhMGQwYzc4M2U1MmJk
+    ZWFhOWE4YjhjYzBkZjAyODBmYWQ2MmEyYjljZDMxNGJmM2RmYjUzNGYxOTlh
+    MGQxZGJjMDUyZjgxYmRhMzNkYmQyZWI5NmRhODhlMzc4NTE2MTg=

data/app/assets/stylesheets/admin/_multi_site_main.scss

@@ -0,0 +1,52 @@
+#content table.index tr.node td {
+  padding: .5em;
+}
+
+#content table.index .node .site small {
+  color: #666;
+  font-size: 90%;
+  font-style: italic;
+  font-weight: normal;
+  margin-left: .5em;
+}
+
+#content table.index .node .site a, #content table.index .node .site a:visited {
+  font-size: 115%;
+  font-weight: bold;
+  color: black;
+  text-decoration: none;
+}
+
+#content .form-area p.domain {
+  float: left;
+  width: 40%;
+  margin: 1em 1em 0 0;
+  overflow: hidden;
+}
+
+#content .form-area p.subtitle {
+  margin: 1em 0 0 0;
+}
+
+#content .form-area p.domain label, #content .form-area p.homepage label {
+  display: block;
+  position: relative;
+}
+
+#content div.form-area p.domain .textbox, #content div.form-area p.homepage .textbox, #content div.form-area p.subtitle .textbox, #content div.form-area p.subtitle select {
+  font-family: Georgia,Palatino,"Times New Roman",Times,serif;
+  font-size: 140%;
+  width: 100%;
+}
+
+#content div.form-area p.homepage {
+  float: right;
+  width: 16%;
+  margin: 1em 0 0 0;
+  overflow: hidden;
+}
+
+p.formnote {
+  clear: both;
+  padding: 2em 0;
+}

data/app/assets/stylesheets/admin/_site_chooser.scss

@@ -0,0 +1,96 @@
+#site_chooser{
+  width: 20%;
+  border-collapse: collapse;
+  float: right;
+}
+
+
+/* BE SURE TO INCLUDE THE CSS RESET FOUND IN THE DEMO PAGE'S CSS */
+/*------------------------------------*\
+	NAV
+\*------------------------------------*/
+#nav{
+  list-style:none;
+  font-weight:bold;
+  margin-bottom:10px;
+  /* Clear floats */
+  width:100%;
+  padding-top: 10px;
+  padding-bottom: 10px;
+  padding-left: 5px;
+  margin: 0px;
+  cursor: pointer;
+  /* Bring the nav above everything else--uncomment if needed.
+  position:relative;
+  z-index:5;
+  */
+}
+#nav li{
+  margin-right:10px;
+  position:relative;
+  color: #66d9e0;
+}
+#nav a{
+  display:block;
+  padding:5px;
+  color:#fff;
+  background:#000;
+  text-decoration:none;
+}
+#nav a:hover{
+  color:#fff;
+  background:#000;
+  text-decoration:underline;
+}
+
+/*--- DROPDOWN ---*/
+
+#nav ul{
+  background:#fff; /* Adding a background makes the dropdown work properly in IE7+. Make this as close to your page's background as possible (i.e. white page == white background). */
+  background:rgba(255,255,255,0); /* But! Let's make the background fully transparent where we can, we don't actually want to see it if we can help it... */
+  list-style:none;
+  position:absolute;
+  /*left:-9999px;*/ /* Hide off-screen when not needed (this is more accessible than display:none;) */
+  margin-top:10px;
+  visibility: hidden;
+  opacity: 0;
+  -webkit-transition: opacity 0.2s;
+  -moz-transition: opacity 0.2s;
+  -ms-transition: opacity 0.2s;
+  -o-transition: opacity 0.2s;
+  transition: opacity 0.2s;
+
+}
+#nav ul li{
+  float:none;
+}
+#nav ul a{
+  white-space:nowrap; /* Stop text wrapping and creating multi-line dropdown items */
+}
+#nav:hover ul{ /* Display the dropdown on hover */
+  visibility: visible;
+  opacity: 1;
+  -webkit-transition: opacity 0.2s;
+  -moz-transition: opacity 0.2s;
+  -ms-transition: opacity 0.2s;
+  -o-transition: opacity 0.2s;
+  transition: opacity 0.2s;
+  /*left:0;*/ /* Bring back on-screen when needed */
+  z-index: 99999;
+
+}
+#nav li:hover a{ /* These create persistent hover states, meaning the top-most link stays 'hovered' even when your cursor has moved down the list. */
+  background:#000;
+  text-decoration:underline;
+}
+#nav li:hover ul a{ /* The persistent hover state does however create a global style for links even before they're hovered. Here we undo these effects. */
+  text-decoration:none;
+}
+#nav a.site-link:hover { /* Here we define the most explicit hover states--what happens when you hover each individual link. */
+  color: #66d9e0;
+  -webkit-transition: all 0.2s;
+  -moz-transition: all 0.2s;
+  -ms-transition: all 0.2s;
+  -o-transition: all 0.2s;
+  transition: all 0.2s;
+}

data/app/assets/stylesheets/admin/multi_site.scss

@@ -1,121 +1,5 @@
-#content table.index tr.node td {
-  padding: .5em;
-}
+@import "multi_site_main";
+@import "site_chooser";
 
-#content table.index .node .site small {
-  color: #666;
-  font-size: 90%;
-  font-style: italic;
-  font-weight: normal;
-  margin-left: .5em;
-}
 
-#content table.index .node .site a, #content table.index .node .site a:visited {
-  font-size: 115%;
-  font-weight: bold;
-  color: black;
-  text-decoration: none;
-}
 
-#content .form-area p.domain {
-  float: left;
-  width: 40%;
-  margin: 1em 1em 0 0;
-  overflow: hidden;
-}
-
-#content .form-area p.subtitle {
-  margin: 1em 0 0 0;
-}
-
-#content .form-area p.domain label, #content .form-area p.homepage label {
-  display: block;
-  position: relative;
-}
-
-#content div.form-area p.domain .textbox, #content div.form-area p.homepage .textbox, #content div.form-area p.subtitle .textbox, #content div.form-area p.subtitle select {
-  font-family: Georgia,Palatino,"Times New Roman",Times,serif;
-  font-size: 140%;
-  width: 100%;
-}
-
-#content div.form-area p.homepage {
-  float: right;
-  width: 16%;
-  margin: 1em 0 0 0;
-  overflow: hidden;
-}
-
-p.formnote {
-  clear: both;
-  padding: 2em 0;
-}
-
-
-/* BE SURE TO INCLUDE THE CSS RESET FOUND IN THE DEMO PAGE'S CSS */
-/*------------------------------------*\
-	NAV
-\*------------------------------------*/
-#nav{
-	list-style:none;
-	font-weight:bold;
-	margin-bottom:10px;
-	/* Clear floats */
-	width:100%;
-    padding-top: 10px;
-    padding-bottom: 10px;
-    padding-left: 5px;
-    margin: 0px;
-	/* Bring the nav above everything else--uncomment if needed.
-	position:relative;
-	z-index:5;
-	*/
-}
-#nav li{
-	margin-right:10px;
-	position:relative;
-}
-#nav a{
-	display:block;
-	padding:5px;
-	color:#fff;
-	background:#333;
-	text-decoration:none;
-}
-#nav a:hover{
-	color:#fff;
-	background:#CC494C;
-	text-decoration:underline;
-}
-
-/*--- DROPDOWN ---*/
-
-#nav ul{
-	background:#fff; /* Adding a background makes the dropdown work properly in IE7+. Make this as close to your page's background as possible (i.e. white page == white background). */
-	background:rgba(255,255,255,0); /* But! Let's make the background fully transparent where we can, we don't actually want to see it if we can help it... */
-	list-style:none;
-	position:absolute;
-	left:-9999px; /* Hide off-screen when not needed (this is more accessible than display:none;) */
-}
-#nav ul li{
-	padding-top:1px; /* Introducing a padding between the li and the a give the illusion spaced items */
-	float:none;
-}
-#nav ul a{
-	white-space:nowrap; /* Stop text wrapping and creating multi-line dropdown items */
-}
-#nav li:hover ul{ /* Display the dropdown on hover */
-	left:0; /* Bring back on-screen when needed */
-    z-index: 99999;
-
-}
-#nav li:hover a{ /* These create persistent hover states, meaning the top-most link stays 'hovered' even when your cursor has moved down the list. */
-	background:#CC494C;
-	text-decoration:underline;
-}
-#nav li:hover ul a{ /* The persistent hover state does however create a global style for links even before they're hovered. Here we undo these effects. */
-	text-decoration:none;
-}
-#nav li:hover ul li a:hover{ /* Here we define the most explicit hover states--what happens when you hover each individual link. */
-	background:#333;
-}

data/app/views/admin/layouts/_site_chooser.html.haml

@@ -1,2 +1,11 @@
 = stylesheet_link_tag 'admin/multi_site'
-= sites_chooser_thing.html_safe
+
+- if admin? && defined?(Site) && defined?(controller) && controller.sited_model? && controller.template_name == 'index' && Site.several?
+  %nav#site_chooser
+    %ul#nav
+      %li
+        = "Current Site: #{current_site.name}"
+        %ul.expansion
+          - Site.all.each do |site|
+            %li
+              = link_to( site.name, "#{request.path}?site_id=#{site.id}", :class => site == current_site ? 'fg site-link' : 'site-link')

data/app/views/admin/sites/_form.haml

@@ -3,27 +3,34 @@
   - render_region :form do |form|
 
     - form.edit_name do
-      %p.title
+      %fieldset.title
+        %h1
+          %i.fa.fa-sitemap
+          Site Information
         %label{:for => "site_name"} Site title
-        = f.text_field :name, :class => "textbox"
-
-      %p.subtitle
+        = f.text_field :name, :class => "textbox", :size => 50
+        %br
         %label{:for => "site_subtitle"} and subtitle
         = f.text_field :subtitle, :class => "textbox"
-        
 
     - form.edit_domain do
-      %p.domain
-        %label{:for => "site_domain"} 
+      %fieldset.domain
+        %h1
+          %i.fa.fa-lightbulb-o
+          Domain Information
+        %label{:for => "site_domain"}
           Domain pattern
-        = f.text_field :domain, :class => "textbox"
-      %p.domain
-        %label{:for => "site_base_domain"} 
+        = f.text_field :domain, :class => "textbox", :size => 50
+        %br
+        %label{:for => "site_base_domain"}
           Base domain name
-        = f.text_field :base_domain, :class => "textbox"
-        
+        = f.text_field :base_domain, :class => "textbox", :size => 50
+
     - form.edit_homepage do
-      %p.homepage
+      %fieldset.homepage
+        %h1
+          %i.fa.fa-home
+          Homepage ID
         %label{:for => "site_homepage_id"} Homepage ID
         = f.text_field :homepage_id, :class => "textbox"
 

data/multi_site_extension.rb

@@ -30,9 +30,9 @@ class MultiSiteExtension < TrustyCms::Extension
     Admin::PagesController.send :include, MultiSite::PagesControllerExtensions
     Admin::ResourceController.send :helper, MultiSite::SiteChooserHelper
     Admin::PagesController.send :helper, MultiSite::SiteChooserHelper
-    admin.layouts.index.add(:top, "site_chooser")
-    admin.pages.index.add(:top, "admin/layouts/site_chooser")
-    admin.snippets.index.add(:top, "admin/layouts/site_chooser")
+    admin.layouts.index.add(:before_nav, "admin/layouts/site_chooser")
+    admin.pages.index.add(:before_nav, "admin/layouts/site_chooser")
+    admin.snippets.index.add(:before_nav, "admin/layouts/site_chooser")
     Layout.send :is_site_scoped
     Snippet.send :is_site_scoped
     User.send :is_site_scoped, :shareable => true

data/trusty-multi-site-extension.gemspec

@@ -4,7 +4,7 @@ require "trusty-multi-site-extension"
 
 Gem::Specification.new do |s|
   s.name        = "trusty-multi-site-extension"
-  s.version = "2.0.0-beta"
+  s.version = "2.0.1-beta"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sean Cribbs", "Eric Sipple", "Danielle Greaves"]
   s.description = %q{Extends Trusty CMS Layouts to support multiple sites, defined by domain}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trusty-multi-site-extension
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.beta
+  version: 2.0.1.pre.beta
 platform: ruby
 authors:
 - Sean Cribbs
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-21 00:00:00.000000000 Z
+date: 2015-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
@@ -69,8 +69,9 @@ files:
 - app/assets/images/admin/move_to_bottom.png
 - app/assets/images/admin/move_to_top.png
 - app/assets/images/admin/remove.png
+- app/assets/stylesheets/admin/_multi_site_main.scss
+- app/assets/stylesheets/admin/_site_chooser.scss
 - app/assets/stylesheets/admin/multi_site.scss
-- app/assets/stylesheets/admin/site_chooser.scss
 - app/controllers/admin/sites_controller.rb
 - app/helpers/scoped_helper.rb
 - app/helpers/sites_helper.rb