modifications principalement design

app/assets/stylesheets/admin/admin.scss

@@ -2575,5 +2575,3 @@ h1, h2, h3, h4, h5, h6 {
 
 
 
-
-

app/assets/stylesheets/public/public.scss

@@ -8,47 +8,50 @@
  *= require_tree . 
 
 */
+
 body {
   padding: 0px;
   margin: 0px;
   font-size: 14px;
   font-family: "trebuchet MS";
-  color:#604435; }
+  color: #604435;
-  body a img {
+  a {
+    img {
       border: 0px; }
-  body a {
     color: RGB(129, 178, 11);
-    text-decoration: none; }
+    text-decoration: none;
-    body a:hover {
+    &:hover {
-      text-decoration: underline; }
+      text-decoration: underline; } }
-  body #public #menu_left h3 a {
+  #public {
+    #menu_left {
+      h3 a {
         color: inherit; }
-  body #public #menu_left ul {
+      ul {
         list-style: none;
-    padding-left: 0px; }
+        padding-left: 0px;
-    body #public #menu_left ul ul {
+        ul {
-      padding-left: 20px; }
+          padding-left: 20px; } } }
-  body #public h1, body #public h2, body #public h3, body #public h4, body #public h5, body #public h6 {
+    h1, h2, h3, h4, h5, h6 {
       font-family: Georgia;
       font-weight: normal;
       margin-top: 0px; }
-  body #public .menu a {
+    .menu a {
       color: RGB(100, 74, 60);
       text-decoration: none;
-    padding: 5px; }
+      padding: 5px;
-    body #public .menu a:hover {
+      &:hover {
         text-decoration: underline; }
-  body #public .menu a.selected {
+      &.selected {
-    font-weight: bold; }
+        font-weight: bold; } }
-  body #public #header {
+    #header {
       width: 960px;
-    margin: auto; }
+      margin: auto;
-    body #public #header #logo {
+      #logo {
         padding: 10px 10px 10px 0px; }
-    body #public #header #menu_top {
+      #menu_top {
         float: right;
-      margin-top: 40px; }
+        margin-top: 40px; } }
-  body #public #bandeau {
+    #bandeau {
       background: RGB(91, 67, 46);
       padding: 10px;
       width: 940px;
@@ -57,272 +60,288 @@ body {
       color: RGB(238, 238, 238);
       font-family: Georgia;
       font-size: 25px; }
-  body #public #slider {
+    #slider {
       position: relative;
-    width: 979px;
+      width: 960px;
       height: 309px;
       padding: 0px;
       margin: auto;
       margin-bottom: 10px;
-  }
+      .slide {
-    body #public #slider .slide {
+        background: #6d563e;
-     	background-image: url("/images/front/fond-marron.png");
+        width: 960px;
-	    background-repeat: no-repeat;
-	    background-position: center center;
-
-
- width: 969px;
         height: 309px;
         position: relative;
-      margin: 0px 5px 0px 5px; }
+        margin: 0px 5px 0px 5px;
-      body #public #slider .slide a {
+		border-radius:10px;
+		-moz-border-radius:10px;
+        a {
           color: inherit;
-        text-decoration: inherit; }
+          text-decoration: inherit;
-      
-	body #public #slider .slide a{
           color: #eeeeee;
-	}
+          &:hover {
-	body #public #slider .slide a:hover{
+            text-decoration: none; } }
-		text-decoration:none;
+        .title {
-	}
+          width: 448px;
-	body #public #slider .slide .title {
-        width: 486px;
           height: 46px;
-        background-image: url("/images/front/en-tete-gris.png");
+          background:#f2f2f2;
-        background-repeat: no-repeat;
+border:1px solid #42210b;
           position: absolute;
           top: 35px;
-        left: -5px;
+          left: 0px;
           z-index: 100;
           color: #32180A;
           font-family: Georgia;
           padding: 10px 10px 10px 45px;
           font-size: 19px; }
-      body #public #slider .slide .cible {
+        .cible {
           position: absolute;
           bottom: 30px;
           left: 410px; }
-      body #public #slider .slide .description {
+        .description {
           position: absolute;
           top: 120px;
           left: 40px;
           width: 470px;
           height: 125px;
           color: #eeeeee; }
-      body #public #slider .slide .image_file {
+        .image_file {
           position: absolute;
           top: 20px;
           right: 40px;
           width: 415px;
           height: 275px;
-        overflow: hidden; }
+          overflow: hidden;
-        body #public #slider .slide .image_file img {
+          img {
-          width: 415px; }
+            width: 415px; } }
-
+        .title a {
-		body #public #slider .slide .title a{
+          color: #32180A; } }
-			color: #32180A;
+      .left-arrow {
-		}
-
-    body #public #slider .left-arrow {
         position: absolute;
         z-index: 150;
         top: 140px;
         left: 15px;
         cursor: pointer; }
-    body #public #slider .right-arrow {
+      .right-arrow {
         position: absolute;
         z-index: 150;
         top: 140px;
         right: 15px;
-      cursor: pointer; }
+        cursor: pointer; } }
-  body #public #main {
+    #main {
       width: 960px;
       margin: auto;
-    margin-bottom: 10px; }
+      margin-bottom: 10px;
-    body #public #main a {
+      a {
         color: #604435;
         text-decoration: none; }
-    body #public #main .title {
+      .title {
         font-family: georgia;
         font-size: 18px;
         text-align: center; }
-    body #public #main .description {
+      .description {
         text-align: justify; }
-    body #public #main .column {
+      .column {
         float: left;
         min-height: 340px;
         width: 319px;
         border-left: 1px solid RGB(222, 236, 189);
-      position: relative; }
+        position: relative;
-      body #public #main .column .title {
+        .title {
-        min-height: 55px; }
+          min-height: 55px; } }
-    body #public #main .column_1 {
+      .column_1 {
         border-left: 1px solid white; }
-    body #public #main .column_2 {
+      .column_2 {
         padding: 10px;
         width: 299px;
         border-left: 1px solid white; }
-    body #public #main .column_3 {
+      .column_3 {
         padding: 10px;
         width: 299px; }
-    body #public #main .column_2 .cible, body #public #main .column_3 .cible {
+      .column_2 .cible, .column_3 .cible {
         position: absolute;
         bottom: 10px;
-      right: 20px; }
+        right: 20px; } }
-  body #public #contact_block {
+    #contact_block {
-    height: 360px;
+
-    width: 319px;
+      border: 1px solid #93c01f;
-    background-image: url("/images/front/fond-vert.png");
+	border-radius:10px;
-    background-repeat: no-repeat;
+	-moz-border-radius:10px;
-    position: relative;
+      .content {
-    left: -2px; }
+        padding: 5px; 
-    body #public #contact_block .content {
+		a{
-      color: RGB(76, 42, 15);
+			
-      width: 297px; }
+			text-decoration:underline;
-    body #public #contact_block #horaires {
+			&:hover{
-      position: absolute;
+				color: #93c01f !important;
-      top: 20px;
+			}
-      left: 20px; }
+			}
-    body #public #contact_block #garde {
+}
-      position: absolute;
+      .header {
-      top: 130px;
+        padding: 5px;
-      left: 20px; }
+        font-family: georgia;
-    body #public #contact_block #contact {
+        font-size: 18px;
-      position: absolute;
+        color: white;
-      top: 210px;
+        background: #93c01f; 
-      left: 20px; }
+		&:first-child{
-  body .clear {
+			border-radius:9px 9px 0px 0px;
+			-moz-border-radius:9px 9px 0px 0px;
+		}
+		
+
+	
+	}
+       } }
+  .clear {
     clear: both; }
-  body .promotion {
+  .promotion {
     position: relative;
     border: 1px dotted black;
     margin-bottom: 10px;
-    margin-left: 10px; }
+    margin-left: 10px;
-    body .promotion .img {
+	
+    .img {
       margin: 10px;
-      float: left; }
+      float: left;
-      body .promotion .img img {
+      img {
-        width: 120px; }
+        width: 120px; } }
-    body .promotion .label {
+    .label {
       position: absolute;
       top: -10px;
       left: -5px; }
-    body .promotion .title, body .promotion .description {
+    .title, .description {
       margin-left: 120px; }
-    body .promotion .title {
+    .title {
       margin-top: 10px;
       font-family: georgia;
       font-size: 18px; }
-    body .promotion .description {
+    .description {
       margin-top: 5px;
       text-align: justify;
-      padding: 0px 20px 0px 20px; }
+      padding: 0px 20px 0px 20px;
-      body .promotion .description p {
+      p {
-        margin: 0px; }
+        margin: 0px; } } }
-  body #home_promotions {
+  #home_promotions {
     width: 960px;
-    margin: auto; }
+    margin: auto;
-    body #home_promotions .column {
+	#promotions_header{
+		background: #6d563e;
+		font-family: georgia;
+	    font-size: 18px;
+	    color: white;
+		padding:10px;
+		margin-bottom:20px;
+		border-radius:10px;
+		-moz-border-radius:10px;
+		
+	}
+    .column {
+      	border-radius:10px;
+		-moz-border-radius:10px;
+
 		float: left;
       min-height: 300px;
-      width: 319px;
+      width: 310px;
       border-left: 1px solid RGB(222, 236, 189);
       position: relative;
-      background-image: url("/images/front/cadre-gris.png");
+      margin-right:10px;
-      background-repeat: no-repeat;
+      text-align: center;
-      background-position: center top;
+      .img {
-      text-align: center; }
+        margin-top: 20px;
-      body #home_promotions .column .img {
+        img {
-        margin-top: 20px; }
+          height: 160px; } }
-        body #home_promotions .column .img img {
+      .label {
-          height: 160px; }
-      body #home_promotions .column .label {
         position: absolute;
         top: -10px;
         left: -5px; }
-      body #home_promotions .column .title {
+      .title {
+		background: #6d563e;
+		color:white;
+		padding:5px;
         margin-top: 10px;
         font-family: georgia;
-        font-size: 18px; }
+        font-size: 18px;
-      body #home_promotions .column .description {
+		a{
+			color:white !important;
+		}
+ }
+
+      .description {
         margin-top: 5px;
         text-align: justify;
-        padding: 0px 20px 0px 20px; }
+        padding: 0px 20px 0px 20px;
-        body #home_promotions .column .description p {
+        p {
-          margin: 0px; }
+          margin: 0px; } } }
-    body #home_promotions .column_1 {
+    .column_1, .column_2, .column_3 {
-      border-left: 1px solid white; }
+      border: 1px solid #6d563e; } 
-    body #home_promotions .column_2 {
+	.column_3 {
-      border-left: 1px solid white; }
+      margin-right:0px ;} 
-    body #home_promotions .column_3 {
+}
-      border-left: 1px solid white; }
+  #page_main {
-  body #page_main {
     width: 960px;
-    margin: auto; }
+    margin: auto;
-    body #page_main #sidebar {
+    #sidebar {
       float: left;
       width: 240px;
       position: relative;
       min-height: 400px; }
-    body #page_main #content {
+    #content {
       float: left;
-      width: 720px; }
+      width: 720px; } }
-  body #menu_bottom {
+  #menu_bottom {
     margin: auto;
     width: 960px;
     margin-top: 20px;
-    margin-bottom: 20px; }
+    margin-bottom: 20px;
-    body #menu_bottom #left_bottom {
+    #left_bottom {
       float: left; }
-    body #menu_bottom #right_bottom {
+    #right_bottom {
-      float: right; }
+      float: right; } }
-  body .article {
+  .article {
     border: 1px solid RGB(129, 178, 11);
     padding: 10px;
-    margin-bottom: 10px; }
+    margin-bottom: 10px;
-    body .article h3 {
+    h3 {
       color: RGB(129, 178, 11); }
-    body .article .image_file {
+    .image_file {
       float: left;
       margin-right: 10px; }
-    body .article .title, body .article .description {
+    .title, .description {
       margin-left: 130px; }
-      body .article .title a, body .article .description a {
+    .title a, .description a {
       color: #604435;
-        text-decoration: none; }
+      text-decoration: none; } }
-  body .folder {
+  .folder {
     border: 1px solid RGB(91, 67, 46);
     padding: 10px;
-    margin-bottom: 10px; }
+    margin-bottom: 10px;
-    body .folder h3 {
+    h3 {
       color: RGB(91, 67, 46); }
-    body .folder .image_file {
+    .image_file {
       float: left;
       margin-right: 10px; }
-    body .folder .title, body .folder .description {
+    .title, .description {
       margin-left: 130px; }
-      body .folder .title a, body .folder .description a {
+    .title a, .description a {
       color: #604435;
-        text-decoration: none; }
+      text-decoration: none; } } }
-#flash_notice{
-	border:3px solid #6bb800;
-	padding:10px;
-	
-}
 
+#flash_notice {
+  border: 3px solid #6bb800;
+  padding: 10px; }
 
 #home_promotions a {
   color: #604435;
   text-decoration: #604435; }
-.portlet.table_content table {
-width: 100%;
-border-collapse: collapse; }
-.portlet.table_content table td {
-border: 1px solid black; }
-
-.portlet.block_content .two_column .column {
-float: left;
-width: 50%; }
-.portlet.block_content .two_column .column .block {
-padding: 10px; }
 
+.portlet {
+  &.table_content table {
+    width: 100%;
+    border-collapse: collapse;
+    td {
+      border: 1px solid black; } }
+  &.block_content .two_column .column {
+    float: left;
+    width: 50%;
+    .block {
+      padding: 10px; } } }

app/controllers/public/prescriptions_controller.rb

@@ -13,6 +13,7 @@ class Public::PrescriptionsController < ApplicationController
 	@title = @menu_item.name
 	if @prescription.save
 		
+		Notification.prescription_received.deliver
 		
 		redirect_to "/pages/ordonnances.html", :notice => "Nous avons bien enregistré votre demande, celle-ci sera traitée dans les meilleurs délais. Nous vous informerons par téléphone de la date à laquelle vous pourrez venir chercher votre commande à la pharmacie."
 	else

app/mailers/notification.rb

@@ -0,0 +1,15 @@
+class Notification < ActionMailer::Base
+  default :from => "admin@pharmacieboissier.com"
+
+  # Subject can be set in your I18n file at config/locales/en.yml
+  # with the following lookup:
+  #
+  #   en.notification.prescription_received.subject
+  #
+  def prescription_received
+    	mail(:to => "info@pharmacieboissier.com ",  :subject => "Nouvelle ordonnance reçu.") do |format|
+
+		    format.html { render :inline => "Une nouvelle ordonnance à été reçu sur le site de la pharmacie." }
+		end
+  end
+end

app/views/layouts/admin.html.haml

@@ -6,16 +6,23 @@
 		%title
 			Administration
 
+		:javascript
+			GENTICS_Aloha_base = "/aloha/"
 		
 		= csrf_meta_tag 
 		
 
-		
 		=javascript_include_tag "/assets/javascripts/core/jquery-1.6.1.min.js"
-		=javascript_include_tag "/assets/javascripts/core/jquery-ui.min.js"
+		
 		=javascript_include_tag "/assets/javascripts/core/jquery.reject.min.js"
 		=javascript_include_tag "/assets/javascripts/core/rails.js"
 		
+
+		
+	
+		
+		=javascript_include_tag "/assets/javascripts/core/jquery-ui.min.js"
+		
 		=javascript_include_tag "/assets/javascripts/core/jcarousellite_1.0.1.min.js"
 		=javascript_include_tag "/assets/javascripts/core/jquery.easing.compatibility.js"
 		=javascript_include_tag "/assets/javascripts/core/jquery.prettyPhoto.js"
@@ -24,6 +31,8 @@
 		=javascript_include_tag "/assets/javascripts/core/jquery.fileupload-ui.js"
 		=javascript_include_tag "/assets/javascripts/core/tiny_mce/jquery.tinymce.js"
 		
+		
+		
 		=javascript_include_tag '/assets/javascripts/admin/admin'
 		=javascript_include_tag '/assets/javascripts/admin/pane_hover'
 		=javascript_include_tag '/assets/javascripts/admin/menu_items'
@@ -55,8 +64,6 @@
 
 	
 
-	
-
 	%body
 		#manager_box_place
 			#manager_box

app/views/portlets/dynamic_contents/_formulaire_ordonnances.html.haml

@@ -5,15 +5,18 @@
 	%h2 Etape 1 : Vos coordonnées
 	%table
 		%tr
-			%td
+			%td{:style => "width:100px"}
 				Nom * :
 			%td
 				=form.text_field :name
+			%td
+				Merci de spécifier votre nom exact.
 		%tr
 			%td
 				Téléphone * :
 			%td
 				=form.text_field :tel
+			%td Merci de spécifier un numéro de téléphone exact où nous pourrons vous joindre dans la journée afin de vous prévenir de la disponibilité de votre commande.
 	%h2 Etape 2 : Votre demande
 	%p.infos Si vous disposez d'un scanner vous pouvez nous envoyer directement un scan de votre ordonnance au format image (jpg ou png) en utilisant le champ suivant :
 	%table
@@ -26,10 +29,10 @@
 	%p Notes :
 	%p=form.text_area :notes, :style => "width:100%;"
 	
-	%h2 Valider votre demande
+	%h2 Validez votre demande
 	%p.infos 
-		Une fois que vous avez remplit les champs précédent vous pouvez nous envoyer votre ordonnance en cliquant sur le bouton ci-dessous.
+		Une fois que vous avez rempli les champs précédents vous pouvez nous envoyer votre ordonnance en cliquant sur le bouton ci-dessous.
 		%br
 		%br 
-		Nous vous appelerons dès que votre commande sera prête ou vous indiquer la date de livraison prévue.
+		Nous vous appellerons dès que votre commande sera prête ou pour vous indiquer la date de livraison prévue.
 	=form.submit "Envoyer mon ordonnance"

app/views/portlets/dynamic_contents/_promotions-list.html.haml

@@ -1,6 +1,8 @@
-%h2 Hygiène
-=render(:partial => "public/promotions/promotion", :collection => Promotion.where(:promotion_type_id => 1).order("month ASC, title ASC"))
 %h2 Cosmétiques
 =render(:partial => "public/promotions/promotion", :collection => Promotion.where(:promotion_type_id => 2).order("month ASC, title ASC"))
+
 %h2 Bébés
 =render(:partial => "public/promotions/promotion", :collection => Promotion.where(:promotion_type_id => 3).order("month ASC, title ASC"))	
+
+%h2 Hygiène
+=render(:partial => "public/promotions/promotion", :collection => Promotion.where(:promotion_type_id => 1).order("month ASC, title ASC"))

app/views/public/folders/show.html.haml

@@ -17,7 +17,7 @@
 			=@folder.title
 		=render @folder.block
 		
-		%h2 Tout les articles du dossier
+		%h2 Tous les articles du dossier
 		-@folder.articles.each do |article|
 			.article
 				.image_file

app/views/public/home/_slide.html.haml

@@ -1,4 +1,4 @@
-%li#slide.slide{:id => slide.id, :style => "width:969px;height:309px;"}
+%li#slide.slide{:id => slide.id, :style => "width:960px;height:309px;"}
 
 	.title
 		=link_to slide.title, (slide.cible ? slide.cible.url : "") if slide.image_file

app/views/public/home/show.html.haml

@@ -47,6 +47,8 @@
 	
 	.clear
 #home_promotions
+	#promotions_header
+		Promotions
 	.column_1.column
 		
 		-if @home.promotion_1

app/views/public/shared/_contact_block.html.haml

@@ -1,6 +1,8 @@
 #contact_block
+	.header
+		Horaires d'ouverture 
 	#horaires.content
-		Horaire d'ouverture pour cette semaine :
+		Horaires d'ouverture pour cette semaine :
 		%br
 		-if (Date.today.cweek).to_i%2 == 0
 			=render :partial => "/public/shared/odd"
@@ -35,12 +37,17 @@
 		=link_to "- consultez la liste des pharmacie de garde", "/pages/infos-utiles/pharmacies-gardes.html"
 		%br
 		="- appelez le 3915"
+	.header
+		Coordonnées
 	#contact.content
-		63 route du Plan 
+		63 rue du Plan 
 		%br
 		38140 RIVES 
 		%br
 		%br
+		=link_to "Plan d'accès", "/pages/infos-utiles.html"
+		%br
+		%br
 		info@pharmacieboissier.com
 		%br
 		%br

public/aloha/VERSION.txt

@@ -0,0 +1,2 @@
+0.9.3
+2010-11-26 12:56:25

public/aloha/css/aloha.css

@@ -0,0 +1,455 @@
+/*!
+* Aloha Editor
+* Author & Copyright (c) 2010 Gentics Software GmbH
+* aloha-sales@gentics.com
+* Licensed unter the terms of http://www.aloha-editor.com/license.html
+*/
+.GENTICS_editable {}
+
+.GENTICS_editable_active .GENTICS_block {
+	background-color: #B7D6FA !important;
+}
+
+.GENTICS_editable_zerowidthfix {
+	padding: 0px 5px 0px 5px !important;
+}
+
+.GENTICS_editicon {
+	position: absolute;
+	margin-left: -34px;
+	display: none;
+}
+
+/*
+ * Ext JS fixes
+ */
+.GENTICS_floatingmenu table, .GENTICS_floatingmenu tr, .GENTICS_floatingmenu td, 
+.ext-root tr:nth-child(2n), .ext-root tr:nth-child(3n), .ext-root tr:nth-child(4n), .ext-root tr:nth-child(5n),
+.ext-root table, .ext-root tr, .ext-root td, 
+.x-layer table, .x-layer tr, .x-layer td,
+.x-window table, .x-window tr, .x-window td {
+	border: 0;
+	padding: 0;
+	margin: 0;
+background-color: transparent;
+}
+.GENTICS_floatingmenu table, .GENTICS_floatingmenu tr, .GENTICS_floatingmenu td {
+	width: 0;
+	height: 0;
+}
+
+/* fixes modal dialog border issues in GCN backend */
+table.x-toolbar-ct {
+        border: 0px;
+}
+
+table.x-toolbar-ct td {
+        border: 0px;
+}
+
+table.x-toolbar-ct table {
+        border: 0px;
+}
+
+/* 
+ * Floating Menu 
+ */
+
+.GENTICS_floatingmenu .x-tab-panel-header {
+	border-width: 0px 0px 1px 0px;
+	background: none;
+}
+
+.GENTICS_floatingmenu .x-tab-panel-header .x-tab-strip-wrap, .GENTICS_floatingmenu ul.x-tab-strip-top {
+	background: none;
+}
+
+.GENTICS_floatingmenu .x-tab-panel-header {
+	padding-bottom: 0px;
+}
+
+.GENTICS_floatingmenu:hover {
+	background-color: #E0E0E0;
+	-moz-border-radius-topleft: 3px;
+	-moz-border-radius-topright: 3px;
+	-webkit-border-top-left-radius: 3px;
+	-webkit-border-top-right-radius: 3px;
+	border-top-left-radius: 3px;
+	border-top-right-radius: 3px;
+	background: url(../images/grabhandle.png) no-repeat scroll center 5px rgba(0, 0, 0, 0.4);
+}
+
+.GENTICS_floatingmenu:hover .GENTICS_floatingmenu_pin {
+	display: block;
+}
+
+.GENTICS_floatingmenu_pin {
+	background: url("../images/pin.png") no-repeat scroll 0 6px transparent;
+	cursor: pointer;
+	margin-left: 5px !important;
+	width: 16px;
+	position: absolute !important;
+	right: 10px;
+	display: none;
+}
+
+.GENTICS_floatingmenu_pinned {
+	background-position: -16px 6px;
+}
+
+#GENTICS_floatingmenu_shadow {
+	position: absolute;
+	top: -1000;
+	left: -1000;
+	display: none;
+	z-index: 8800;
+}
+
+.x-combo-selected {
+	background-color: Highlight !important;
+}
+
+.x-tree-root-ct {
+	padding: 0px;
+}
+
+.x-tree-node {
+	list-style: none;
+}
+
+.x-tree-node-ct {
+	padding: 0px;
+}
+
+/*hide dotted browser border on focus*/
+.GENTICS_button a:focus {
+	outline: none;
+}
+
+button.GENTICS_button {
+	background: url(../images/base.png) no-repeat !important;
+}
+
+button.GENTICS_button_big {
+	background: url(../images/base_big.png) no-repeat !important;
+}
+
+/*buttons for format plugin*/
+button.GENTICS_button_b {
+	background-position: 0px 0px;
+}
+
+button.GENTICS_button_i {
+	background-position: -16px 0px !important;
+}
+
+button.GENTICS_button_u {
+	background-position: -32px 0px !important;
+}
+
+button.GENTICS_button_del {
+	background-position: -48px 0px !important;
+}
+
+button.GENTICS_button_sub {
+	background-position: -64px 0px !important;
+}
+
+button.GENTICS_button_sup {
+	background-position: -80px 0px !important;
+}
+
+button.GENTICS_button_ul {
+	background-position: -256px 0px !important;
+}
+
+button.GENTICS_button_ol {
+	background-position: -272px 0px !important;
+}
+
+button.GENTICS_button_a {
+	background-position: -288px 0px !important;
+}
+
+button.GENTICS_button_a_remove {
+	background-position: -304px 0px !important;
+}
+
+/**
+ * multisplit buttons
+ */
+button.GENTICS_button_p {
+	background-position: 0px 0 !important;
+}
+
+button.GENTICS_button_p_de {
+	background-position: 0px -42px !important;
+}
+
+button.GENTICS_button_h1 {
+	background-position: -52px 0 !important;
+}
+
+button.GENTICS_button_h1_de {
+	background-position: -52px -42px !important;
+}
+
+button.GENTICS_button_h2 {
+	background-position: -104px 0 !important;
+}
+
+button.GENTICS_button_h2_de {
+	background-position: -104px -42px !important;
+}
+
+button.GENTICS_button_h3 {
+	background-position: -156px 0 !important;
+}
+
+button.GENTICS_button_h3_de {
+	background-position: -156px -42px !important;
+}
+
+button.GENTICS_button_h4 {
+	background-position: -208px 0 !important;
+}
+
+button.GENTICS_button_h4_de {
+	background-position: -208px -42px !important;
+}
+
+button.GENTICS_button_h5 {
+	background-position: -260px 0 !important;
+}
+
+button.GENTICS_button_h5_de {
+	background-position: -260px -42px !important;
+}
+
+button.GENTICS_button_h6 {
+	background-position: -312px 0 !important;
+}
+
+button.GENTICS_button_h6_de {
+	background-position: -312px -42px !important;
+}
+
+button.GENTICS_button_pre {
+	background-position: -364px 0 !important;
+}
+
+button.GENTICS_button_pre_de {
+	background-position: -364px -42px !important;
+}
+
+button.GENTICS_button_title {
+	background-position: -416px 0 !important;
+}
+
+button.GENTICS_button_title_de {
+	background-position: -416px -42px !important;
+}
+
+/*buttons of the table plugin*/
+button.GENTICS_button_table {
+	background-position: -96px 0 !important;
+}
+
+button.GENTICS_button_addColumnLeft {
+	background-position: -112px 0 !important;
+}
+
+button.GENTICS_button_addColumnRight {
+	background-position: -128px 0 !important;
+}
+
+button.GENTICS_button_addRowBefore {
+	background-position: -144px 0 !important;
+}
+
+button.GENTICS_button_addRowAfter {
+	background-position: -160px 0 !important;
+}
+
+button.GENTICS_button_deleteRows {
+	background-position: -176px 0 !important;
+}
+
+button.GENTICS_button_deleteColumns {
+	background-position: -192px 0 !important;
+}
+/* iks test buttons */
+button.GENTICS_button_addPerson {
+	background-position: -224px 0 !important;
+}
+
+button.GENTICS_button_addEvent {
+	background-position: -208px 0 !important;
+}
+
+button.GENTICS_button_abbr {
+	background-position: -336px 0px !important;
+}
+button.GENTICS_button_tree {
+	background-position: -0 0 !important;
+}
+
+/*button status hover of format plugin*/
+div.GENTICS_button a:hover {
+	border: 1px solid #b2cbff;
+}
+
+.GENTICS_floatingmenu {
+	display: none;	
+}
+
+/*button status active of format plugin*/
+.GENTICS_floatingmenu .pressed a {
+	border:1px solid #ccc;
+}
+
+.GENTICS_logo {
+	width:37px !important;
+	height:25px !important;
+	background-image: url('../images/gentics_logo.png') !important;
+}
+
+.GENTICS_maximize {
+	background-image: url('../images/gentics_logo.png') !important;
+}
+
+.GENTICS_fade_out {
+	background-image: url('../images/fade_out.png') !important;
+	width:20px !important;
+	height:20px !important;
+}
+
+.GENTICS_fade_in {
+	background-image: url('../images/fade_in.png') !important;
+	width:20px !important;
+	height:20px !important;
+}
+
+.GENTICS_maximize {
+	width:20px !important;
+	height:20px !important;
+	background-image: url('../images/maximize.png') !important;
+}
+
+html body .GENTICS_ribbon {
+	z-index:90000;
+	position:fixed;
+	top:0;
+	left:0;
+	width:100%;
+	padding-left:0;
+	padding-right:0;
+	display: none;
+}
+
+.x-menu-list-item {
+	text-align:left;
+}
+
+.GENTICS_shadow {
+	-moz-box-shadow: 3px 3px 5px rgba(0, 0, 0, 0.3);
+	-webkit-box-shadow: 3px 3px 5px rgba(0, 0, 0, 0.3);
+    box-shadow: 3px 3px 5px rgba(0, 0, 0, 0.3);
+}
+
+/*
+ * extJs GENTICS Multisplit Button
+ */
+ul.GENTICS_multisplit button.GENTICS_button {
+	background-image: url(../images/base_multi.png) !important;
+	background-repeat: no-repeat;
+	background-position: 0 0;
+	/*
+	 * WARNING do not change the button size for multisplit buttons
+	 */
+	width: 54px !important;
+	height: 44px !important;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+}
+.GENTICS_multisplit {
+	float: left;
+	list-style: none;
+}
+ul.GENTICS_multisplit, div.GENTICS_multisplit-wrapper {
+	width: 232px;
+	height: 46px;
+	overflow: hidden;
+	margin: 0px;
+	padding: 0px;
+}
+div.GENTICS_multisplit-wrapper {
+	width: 248px;
+}
+ul.GENTICS_multisplit li {
+	float: left;
+	padding: 0px 1px;
+	margin: 0px;
+}
+ul.GENTICS_multisplit button.GENTICS_multisplit-wide {
+	font: 11px tahoma,arial,helvetica;
+	height: 18px !important;
+	width: 234px !important;
+	border: 0;
+	border-top: 1px solid #cccccc;
+	cursor: pointer;
+	background-color: white;
+	background-repeat: no-repeat;
+	background-position: 6px 1px !important;
+	text-align: left;
+	margin-left: -2px;
+	padding-left: 26px;
+}
+button.GENTICS_multisplit_toggle {
+	float: right;
+	margin: 0;
+	padding: 0;
+	width: 15px;
+	height: 12px;
+	margin-top: 32px;
+	cursor: pointer;
+	border: 0;
+}
+button.GENTICS_multisplit_toggle_open {
+	background-image: url(../images/multisplit-open.gif);
+}
+button.GENTICS_multisplit_toggle_close {
+	background-image: url(../images/multisplit-close.gif);
+}
+ul.GENTICS_multisplit button {
+	border: 1px solid #cccccc;
+	margin: 1px;
+	cursor: pointer;
+}
+ul.GENTICS_multisplit button:hover {
+	border: 1px solid #666666;
+}
+ul.GENTICS_multisplit button.GENTICS_multisplit-wide:hover {
+	border: 0;
+	border-top: 1px solid #cccccc;
+}
+ul.GENTICS_multisplit button.GENTICS_multisplit-activeitem {
+	border: 2px solid #3B73D7;
+}
+ul.GENTICS_multisplit-expanded {
+	position: absolute;
+	top: 0px;
+	left: 0px;
+	z-index: 20000;
+	background-color: white;
+	border: 1px solid #afafaf;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+}
+
+ul.GENTICS_multisplit button.GENTICS_button_removeFormat {
+	background-image: url(../images/removeformat.png) !important;
+}
+

public/aloha/deps/MIT-LICENSE.txt

@@ -0,0 +1,20 @@
+Copyright (c) 2010 John Resig, http://jquery.com/
+ 
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+ 
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+ 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.