fix bug with jammit-s3 and safari css hack + new version of aloha + bug with Heroku / Theme uploader without DJ + other minor things
This commit is contained in:
dinedine
parent
8d610dee49
commit
99b54d4d1b
@ -16,7 +16,7 @@ module Admin
|
||||
@js_and_css_assets = (@assets[:javascripts] || []) + (@assets[:stylesheets] || [])
|
||||
|
||||
if request.xhr?
|
||||
@images = @assets[:images]
|
||||
@images = @assets[:images] || []
|
||||
render :action => 'images', :layout => false and return
|
||||
else
|
||||
@snippets = current_site.snippets.order_by([[:name, :asc]]).all.to_a
|
||||
|
||||
@ -1,7 +1,11 @@
|
||||
class ThemeUploader < ::CarrierWave::Uploader::Base
|
||||
|
||||
def store_dir
|
||||
"sites/#{model.id}/tmp/themes"
|
||||
if Locomotive.config.delayed_job
|
||||
"sites/#{model.id}/tmp/themes"
|
||||
else
|
||||
"#{Rails.root}/tmp/themes"
|
||||
end
|
||||
end
|
||||
|
||||
def cache_dir
|
||||
|
||||
@ -1,7 +1,5 @@
|
||||
require File.expand_path('../boot', __FILE__)
|
||||
|
||||
# require 'rails/all'
|
||||
|
||||
require "action_controller/railtie"
|
||||
require "action_mailer/railtie"
|
||||
require "active_resource/railtie"
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
embed_assets: off
|
||||
|
||||
s3_bucket: <%= ENV['S3_BUCKET'] %>
|
||||
s3_access_key_id: <%= ENV['S3_ACCESS_KEY_ID'] %>
|
||||
s3_secret_access_key: <%= ENV['S3_SECRET_ACCESS_KEY'] %>
|
||||
s3_access_key_id: <%= ENV['S3_KEY_ID'] %>
|
||||
s3_secret_access_key: <%= ENV['S3_SECRET_KEY'] %>
|
||||
|
||||
javascripts:
|
||||
box:
|
||||
@ -71,6 +71,7 @@ stylesheets:
|
||||
box:
|
||||
- public/stylesheets/admin/blueprint/screen.css
|
||||
- public/stylesheets/admin/box.css
|
||||
- public/stylesheets/admin/safari.css
|
||||
common:
|
||||
- public/stylesheets/admin/blueprint/screen.css
|
||||
- public/stylesheets/admin/layout.css
|
||||
@ -82,6 +83,7 @@ stylesheets:
|
||||
- public/stylesheets/admin/formtastic.css
|
||||
- public/stylesheets/admin/formtastic_changes.css
|
||||
- public/stylesheets/admin/application.css
|
||||
- public/stylesheets/admin/safari.css
|
||||
fancybox:
|
||||
- public/stylesheets/admin/plugins/fancybox.css
|
||||
- public/stylesheets/admin/fancybox_changes.css
|
||||
|
||||
@ -4,6 +4,10 @@ Locomotive.configure do |config|
|
||||
# if not defined, locomotive will use example.com as main domain name. Remove prefix www from your domain name.
|
||||
# Ex:
|
||||
# config.default_domain = Rails.env.production? ? 'mydomain.com' : 'example.com'
|
||||
#
|
||||
# If you use locomotive for a single site in Heroku, use "heroku.com" as default domain name.
|
||||
# Your heroku app name (<app_name>.heroku.name) will be used as the sub domain name in Locomotive
|
||||
# during the installation wizzard.
|
||||
config.default_domain = 'example.com'
|
||||
|
||||
# configure how many items we display in sub menu in the "Contents" section.
|
||||
|
||||
2
doc/TODO
2
doc/TODO
@ -6,6 +6,8 @@ x import theme without delayed_job
|
||||
x rspec 2.3
|
||||
x ruby 1.9.2:
|
||||
x DelayedJob not working
|
||||
x new version of Aloha-Editor
|
||||
- locomotive gem: test with staging
|
||||
|
||||
BACKLOG:
|
||||
|
||||
|
||||
@ -2,6 +2,10 @@ Locomotive.configure do |config|
|
||||
# if not defined, locomotive will use example.com as main domain name. Remove prefix www from your domain name.
|
||||
# Ex:
|
||||
# config.default_domain = Rails.env.production? ? 'mydomain.com' : 'example.com'
|
||||
#
|
||||
# If you use locomotive for a single site in Heroku, use "heroku.com" as default domain name.
|
||||
# Your heroku app name (<app_name>.heroku.name) will be used as the sub domain name in Locomotive
|
||||
# during the installation wizzard.
|
||||
config.default_domain = 'mydomain.com'
|
||||
|
||||
# configure how many items we display in sub menu in the "Contents" section.
|
||||
@ -27,5 +31,8 @@ Locomotive.configure do |config|
|
||||
# Locomotive uses the DelayedJob gem for the theme import module.
|
||||
# In case you want to deploy to Heroku, you will have to pay for an extra dyno.
|
||||
# If you do not mind about importing theme without DelayedJob, disable it.
|
||||
config.delayed_job = true
|
||||
end
|
||||
config.delayed_job = false
|
||||
|
||||
# default locale (for now, only en and fr are supported)
|
||||
config.default_locale = :en
|
||||
end
|
||||
@ -18,7 +18,8 @@ require 'httparty'
|
||||
require 'redcloth'
|
||||
require 'delayed_job_mongoid'
|
||||
require 'zip/zipfilesystem'
|
||||
require 'jammit'
|
||||
# require 'jammit'
|
||||
require 'jammit-s3'
|
||||
|
||||
$:.unshift File.dirname(__FILE__)
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
module Locomotive
|
||||
module Regexps
|
||||
|
||||
SUBDOMAIN = /^[a-z][a-z0-9]*[a-z0-9]{1}$/
|
||||
SUBDOMAIN = /^[a-z][a-z0-9_-]*[a-z0-9]{1}$/
|
||||
|
||||
DOMAIN = /^[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?$/ix
|
||||
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
module Locomotive #:nodoc
|
||||
VERSION = "0.0.4.beta6"
|
||||
VERSION = "0.0.4.beta9"
|
||||
end
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
nightly
|
||||
2010-09-05 15:50:06
|
||||
2010-12-29 14:33:59
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -4,7 +4,9 @@
|
||||
* aloha-sales@gentics.com
|
||||
* Licensed unter the terms of http://www.aloha-editor.com/license.html
|
||||
*/
|
||||
.GENTICS_editable {}
|
||||
.GENTICS_editable {
|
||||
min-height: 1.2em;
|
||||
}
|
||||
|
||||
.GENTICS_editable_active .GENTICS_block {
|
||||
background-color: #B7D6FA !important;
|
||||
@ -20,22 +22,53 @@
|
||||
display: none;
|
||||
}
|
||||
|
||||
.GENTICS_block .GENTICS_block .GENTICS_editicon {
|
||||
margin-top: 15px;
|
||||
}
|
||||
|
||||
.GENTICS_block .GENTICS_block .GENTICS_block .GENTICS_editicon {
|
||||
margin-top: 30px;
|
||||
}
|
||||
|
||||
.GENTICS_block .GENTICS_block .GENTICS_block .GENTICS_block .GENTICS_editicon {
|
||||
margin-top: 45px;
|
||||
}
|
||||
|
||||
/*
|
||||
* Ext JS fixes
|
||||
*/
|
||||
.GENTICS_floatingmenu table, .GENTICS_floatingmenu tr, .GENTICS_floatingmenu td, .ext-root table, .ext-root tr, .ext-root td {
|
||||
.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;
|
||||
@ -86,6 +119,22 @@
|
||||
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;
|
||||
@ -95,6 +144,10 @@ 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;
|
||||
@ -239,7 +292,7 @@ button.GENTICS_button_deleteRows {
|
||||
button.GENTICS_button_deleteColumns {
|
||||
background-position: -192px 0 !important;
|
||||
}
|
||||
|
||||
/* iks test buttons */
|
||||
button.GENTICS_button_addPerson {
|
||||
background-position: -224px 0 !important;
|
||||
}
|
||||
@ -248,6 +301,13 @@ 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;
|
||||
@ -405,4 +465,5 @@ ul.GENTICS_multisplit-expanded {
|
||||
|
||||
ul.GENTICS_multisplit button.GENTICS_button_removeFormat {
|
||||
background-image: url(../images/removeformat.png) !important;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -168,14 +168,14 @@
|
||||
position: absolute;
|
||||
top: 0;
|
||||
width: 100%;
|
||||
z-index: 9500;
|
||||
z-index: 19500;
|
||||
}
|
||||
|
||||
div.pp_pic_holder {
|
||||
display: none;
|
||||
position: absolute;
|
||||
width: 100px;
|
||||
z-index: 10000;
|
||||
z-index: 20000;
|
||||
}
|
||||
|
||||
.pp_top {
|
||||
|
||||
@ -3,3 +3,5 @@ floatingmenu.tab.insert=Einfügen
|
||||
yes=Ja
|
||||
no=Nein
|
||||
cancel=Abbrechen
|
||||
repository.no_item_found=Keinen Eintrag gefunden.
|
||||
repository.loading=Es wird geladen
|
||||
@ -3,3 +3,5 @@ floatingmenu.tab.insert=Insert
|
||||
yes=Yes
|
||||
no=No
|
||||
cancel=Cancel
|
||||
repository.no_item_found=No item found.
|
||||
repository.loading=Loading
|
||||
5
public/javascripts/admin/aloha/i18n/pl.dict
Normal file
5
public/javascripts/admin/aloha/i18n/pl.dict
Normal file
@ -0,0 +1,5 @@
|
||||
floatingmenu.tab.format=Format
|
||||
floatingmenu.tab.insert=Wstaw
|
||||
yes=Tak
|
||||
no=Nie
|
||||
cancel=Anuluj
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 4.8 KiB After Width: | Height: | Size: 3.2 KiB |
BIN
public/javascripts/admin/aloha/images/base_big.png
Normal file
BIN
public/javascripts/admin/aloha/images/base_big.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 51 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 2.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 28 KiB After Width: | Height: | Size: 278 B |
Binary file not shown.
|
Before Width: | Height: | Size: 28 KiB After Width: | Height: | Size: 292 B |
Binary file not shown.
|
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.0 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 223 B After Width: | Height: | Size: 112 B |
Binary file not shown.
|
Before Width: | Height: | Size: 27 KiB After Width: | Height: | Size: 127 B |
Binary file not shown.
|
Before Width: | Height: | Size: 29 KiB After Width: | Height: | Size: 565 B |
Binary file not shown.
|
Before Width: | Height: | Size: 472 B After Width: | Height: | Size: 193 B |
@ -1,2 +0,0 @@
|
||||
button.person.tooltip=Person hinzufügen
|
||||
button.event.tooltip=Event hinzufügen
|
||||
@ -1,2 +0,0 @@
|
||||
button.person.tooltip=Add Person
|
||||
button.event.tooltip=Add Event
|
||||
@ -1,2 +0,0 @@
|
||||
button.person.tooltip=Aldoni personon
|
||||
button.event.tooltip=Aldoni eventon
|
||||
@ -1,2 +0,0 @@
|
||||
button.person.tooltip=Lisää henkilö
|
||||
button.event.tooltip=Lisää tapahtuma
|
||||
@ -1,2 +0,0 @@
|
||||
button.person.tooltip=Ajouter une personne
|
||||
button.event.tooltip=Ajouter un événement
|
||||
@ -1,2 +0,0 @@
|
||||
button.person.tooltip=Aggiungi persona
|
||||
button.event.tooltip=Aggiungi evento
|
||||
@ -1,7 +0,0 @@
|
||||
/*
|
||||
* 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
|
||||
*/
|
||||
if(typeof EXAMPLE=="undefined"||!EXAMPLE){var EXAMPLE={}}EXAMPLE.DummyDCPlugin=new GENTICS.Aloha.Plugin("com.example.aloha.DummyDC");EXAMPLE.DummyDCPlugin.languages=["en","de","eo","fi","fr","it"];EXAMPLE.DummyDCPlugin.init=function(){GENTICS.Aloha.FloatingMenu.addButton("GENTICS.Aloha.continuoustext",new GENTICS.Aloha.ui.Button({iconClass:"GENTICS_button GENTICS_button_addPerson",size:"small",tooltip:this.i18n("button.person.tooltip")}),GENTICS.Aloha.i18n(GENTICS.Aloha,"floatingmenu.tab.insert"),1);GENTICS.Aloha.FloatingMenu.addButton("GENTICS.Aloha.continuoustext",new GENTICS.Aloha.ui.Button({iconClass:"GENTICS_button GENTICS_button_addEvent",size:"small",tooltip:this.i18n("button.event.tooltip")}),GENTICS.Aloha.i18n(GENTICS.Aloha,"floatingmenu.tab.insert"),1)};
|
||||
@ -1,2 +0,0 @@
|
||||
save=DummySpeichern
|
||||
saveMessage=Folgende Inhalte können nun gespeichert werden :
|
||||
@ -1,3 +0,0 @@
|
||||
save=DummySave
|
||||
saveMessage=Following content can now be saved :
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
save=ValeTallenna
|
||||
saveMessage=Tämä sisältö voidaan nyt tallentaa:
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
save=DummyEnregistrer
|
||||
saveMessage=Le contenue suivant peut être sauvegardés :
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
save=DummySave
|
||||
saveMessage=Il contenuto seguente può essere salvato :
|
||||
|
||||
@ -1,7 +0,0 @@
|
||||
/*
|
||||
* 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
|
||||
*/
|
||||
if(typeof EXAMPLE=="undefined"||!EXAMPLE){var EXAMPLE={}}EXAMPLE.DummySavePlugin=new GENTICS.Aloha.Plugin("com.example.aloha.DummySave");EXAMPLE.DummySavePlugin.languages=["en","de","fi","fr","it"];EXAMPLE.DummySavePlugin.init=function(){var that=this;var saveButton=new GENTICS.Aloha.ui.Button({label:this.i18n("save"),onclick:function(){that.save()}});GENTICS.Aloha.Ribbon.addButton(saveButton)};EXAMPLE.DummySavePlugin.save=function(){var content="";jQuery.each(GENTICS.Aloha.editables,function(index,editable){content=content+"Editable ID: "+editable.getId()+"\nHTML code: "+editable.getContents()+"\n\n"});alert(this.i18n("saveMessage")+"\n\n"+content)};
|
||||
@ -0,0 +1 @@
|
||||
Subproject commit 97cacd37ee095d66b8018c89ac072c783df36840
|
||||
@ -0,0 +1 @@
|
||||
Subproject commit c574ed110c2cb3fb2927ad2ca529b18522be2f88
|
||||
@ -0,0 +1 @@
|
||||
Subproject commit a9b8cd6b908016f32dcfee138d4b9eea5ed03b5e
|
||||
@ -0,0 +1,30 @@
|
||||
button.b.tooltip=Pogrubienie
|
||||
button.i.tooltip=Kursywa
|
||||
button.u.tooltip=Podkreślenie
|
||||
button.cite.tooltip=Cytat
|
||||
button.q.tooltip=
|
||||
button.code.tooltip=Kod
|
||||
button.abbr.tooltip=Skrót
|
||||
button.del.tooltip=Przekreślenie
|
||||
button.sub.tooltip=Indeks dolny
|
||||
button.sup.tooltip=Indeks górny
|
||||
button.p.tooltip=Paragraf
|
||||
button.h1.tooltip=Nagłówek 1
|
||||
button.h2.tooltip=Nagłówek 2
|
||||
button.h3.tooltip=Nagłówek 3
|
||||
button.h4.tooltip=Nagłówek 4
|
||||
button.h5.tooltip=Nagłówek 5
|
||||
button.h6.tooltip=Nagłówek 6
|
||||
button.pre.tooltip=Tekst preformatowany
|
||||
button.title.tooltip=Tytuł
|
||||
button.removeFormat.tooltip=Usuń formatowanie
|
||||
button.removeFormat.text=Usuń formatowanie
|
||||
GENTICS_button_p=GENTICS_button_p
|
||||
GENTICS_button_h1=GENTICS_button_h1
|
||||
GENTICS_button_h2=GENTICS_button_h2
|
||||
GENTICS_button_h3=GENTICS_button_h3
|
||||
GENTICS_button_h4=GENTICS_button_h4
|
||||
GENTICS_button_h5=GENTICS_button_h5
|
||||
GENTICS_button_h6=GENTICS_button_h6
|
||||
GENTICS_button_pre=GENTICS_button_pre
|
||||
GENTICS_button_title=GENTICS_button_title
|
||||
File diff suppressed because one or more lines are too long
@ -1,20 +0,0 @@
|
||||
restcall.savepage = Seite speichern
|
||||
restcall.savepage.error = Beim Speichern der Seite ist ein Fehler aufgetreten!
|
||||
button.language = Sprache
|
||||
button.page=Seite
|
||||
button.preview=Vorschau
|
||||
button.edit=Bearbeiten
|
||||
button.livepreview=Live Vorschau
|
||||
button.properties=Eigenschaften
|
||||
button.objectproperties=Objekt Eigenschaften
|
||||
button.timemanagement=Zeitmanagement
|
||||
button.cancel=Abbrechen
|
||||
button.quit=Beenden
|
||||
button.save=Speichern
|
||||
button.publish=Veröffentlichen
|
||||
button.publishat=Veröffentlichen am...
|
||||
insert_tag=Tag einfügen
|
||||
restcall.createtag.error = Beim Erstellen eines neuen Tags ist ein Fehler aufgetreten!
|
||||
restcall.reloadtag.error = Beim Aktualisieren eines Tags ist ein Fehler aufgetreten!
|
||||
confirm.editable.modified = Die Seite wurde geändert! Möchten Sie die Änderungen jetzt speichern?
|
||||
save.progress = Bitte warten, Änderungen werden gespeichert!
|
||||
@ -1,20 +0,0 @@
|
||||
restcall.savepage = Save page
|
||||
restcall.savepage.error = An error occurred while saving the page!
|
||||
button.language = Language
|
||||
button.page=Page
|
||||
button.preview=Preview
|
||||
button.edit=Edit
|
||||
button.livepreview=Live Preview
|
||||
button.properties=Properties
|
||||
button.objectproperties=Object Properties
|
||||
button.timemanagement=Timemanagement
|
||||
button.cancel=Cancel
|
||||
button.quit=Quit
|
||||
button.save=Save
|
||||
button.publish=Publish
|
||||
button.publishat=Publish at...
|
||||
insert_tag=Insert tag
|
||||
restcall.createtag.error = An error occurred while creating a new tag!
|
||||
restcall.reloadtag.error = An error occurred while reloading a tag!
|
||||
confirm.editable.modified = The page has been modified! Do you want to save the changes now?
|
||||
save.progress = Please wait while changes are saved!
|
||||
@ -1,16 +0,0 @@
|
||||
restcall.savepage = Konservi la paøon
|
||||
restcall.savepage.error = Eraro okazis dum konservado de la paøo
|
||||
button.language = Lingvo
|
||||
button.page=Paøo
|
||||
button.preview=Antaývidi
|
||||
button.edit=Redakti
|
||||
button.livepreview=Antaývidi realtempe
|
||||
button.properties=Propra¼oj
|
||||
button.objectproperties=Propra¼oj de la objekto
|
||||
button.timemanagement=Tempa prizorgado
|
||||
button.cancel=Nuligi
|
||||
button.quit=Eliri
|
||||
button.save=Konservi
|
||||
button.publish=Publikigi
|
||||
button.publishat=Publikigi en...
|
||||
insert_tag=Enmeti etikedon
|
||||
@ -1,20 +0,0 @@
|
||||
restcall.savepage = Tallenna sivu
|
||||
restcall.savepage.error = Sivun tallennuksessa tapahtui virhe!
|
||||
button.language = Kieli
|
||||
button.page=Sivu
|
||||
button.preview=Esikatselu
|
||||
button.edit=Muokkaus
|
||||
button.livepreview=Päivittyvä esikatselu
|
||||
button.properties=Ominaisuudet
|
||||
button.objectproperties=Olion ominaisuudet
|
||||
button.timemanagement=Ajanhallinta
|
||||
button.cancel=Peruuta
|
||||
button.quit=Sulje
|
||||
button.save=Tallenna
|
||||
button.publish=Julkaise
|
||||
button.publishat=Julkaise aikaan...
|
||||
insert_tag=Lisää merkki
|
||||
restcall.createtag.error = Uuden merkin luonnissa tapahtui virhe!
|
||||
restcall.reloadtag.error = Merkin uudelleenlatauksessa tapahtui virhe!
|
||||
confirm.editable.modified = Sivua on muokattu! Haluatko tallentaa muutokset?
|
||||
save.progress = Odota, muutoksia tallennetaan!
|
||||
@ -1,16 +0,0 @@
|
||||
restcall.savepage = Sauvegarder la page
|
||||
restcall.savepage.error = Une erreur s'est produite lors de l'enregistrement de la page!
|
||||
button.language = Langue
|
||||
button.page=Page
|
||||
button.preview=Prévisualisé
|
||||
button.edit=Editer
|
||||
button.livepreview=Prévisualisation en direct
|
||||
button.properties=Propriétés
|
||||
button.objectproperties=Propriétés de l'objet
|
||||
button.timemanagement=La gestion du temps
|
||||
button.cancel=Annuler
|
||||
button.quit=Quitter
|
||||
button.save=Sauvegarder
|
||||
button.publish=Publier
|
||||
button.publishat=Publier sur ...
|
||||
insert_tag=Insert tag
|
||||
@ -1,20 +0,0 @@
|
||||
restcall.savepage = Salva pagina
|
||||
restcall.savepage.error = C'è stato un errore durante il salvataggio!
|
||||
button.language = Lingua
|
||||
button.page=Pagina
|
||||
button.preview=Anteprima
|
||||
button.edit=Modifica
|
||||
button.livepreview=Anteprima Live
|
||||
button.properties=Proprietà
|
||||
button.objectproperties=Properties dell'oggetto
|
||||
button.timemanagement=Pianificazione tempo
|
||||
button.cancel=Annulla
|
||||
button.quit=Esci
|
||||
button.save=Salva
|
||||
button.publish=Pubblica
|
||||
button.publishat=Pubblica alle..
|
||||
insert_tag=Inserisci tag
|
||||
restcall.createtag.error = C'è stato un errore durante la creazione del tag!
|
||||
restcall.reloadtag.error = C'è stato un errore durante il caricamento del tag!
|
||||
confirm.editable.modified = La pagina è stata modificata! Salvare le modifiche?
|
||||
save.progress = Attendere il termine del salvataggio!
|
||||
File diff suppressed because one or more lines are too long
@ -4,4 +4,4 @@
|
||||
* aloha-sales@gentics.com
|
||||
* Licensed unter the terms of http://www.aloha-editor.com/license.html
|
||||
*/
|
||||
GENTICS.Aloha.HighlightEditables=new GENTICS.Aloha.Plugin("com.gentics.aloha.plugins.highlighteditables");GENTICS.Aloha.HighlightEditables.init=function(){var that=this;GENTICS.Utils.Position.addMouseMoveCallback(function(){for(var i=0;i<GENTICS.Aloha.editables.length;i++){var editable=GENTICS.Aloha.editables[i].obj;if(!GENTICS.Aloha.activeEditable){editable.addClass("GENTICS_editable_highlight")}}});GENTICS.Utils.Position.addMouseStopCallback(function(){that.fade()});GENTICS.Aloha.EventRegistry.subscribe(GENTICS.Aloha,"editableActivated",function(jEvent,aEvent){aEvent.editable.obj.addClass("GENTICS_editable_active");that.fade()});GENTICS.Aloha.EventRegistry.subscribe(GENTICS.Aloha,"editableDeactivated",function(jEvent,aEvent){aEvent.editable.obj.removeClass("GENTICS_editable_active")})};GENTICS.Aloha.HighlightEditables.fade=function(){for(var i=0;i<GENTICS.Aloha.editables.length;i++){var editable=GENTICS.Aloha.editables[i].obj;if(editable.hasClass("GENTICS_editable_highlight")){editable.removeClass("GENTICS_editable_highlight").css("outline","5px solid #FFE767").animate({outlineWidth:"0px"},300,"swing",function(){jQuery(this).css("outline","")})}}};
|
||||
GENTICS.Aloha.HighlightEditables=new GENTICS.Aloha.Plugin("com.gentics.aloha.plugins.highlighteditables");GENTICS.Aloha.HighlightEditables.init=function(){var that=this;GENTICS.Utils.Position.addMouseMoveCallback(function(){for(var i=0;i<GENTICS.Aloha.editables.length;i++){var editable=GENTICS.Aloha.editables[i];if(!GENTICS.Aloha.activeEditable&&!editable.isDisabled()){editable.obj.addClass("GENTICS_editable_highlight")}}});GENTICS.Utils.Position.addMouseStopCallback(function(){that.fade()});GENTICS.Aloha.EventRegistry.subscribe(GENTICS.Aloha,"editableActivated",function(jEvent,aEvent){aEvent.editable.obj.addClass("GENTICS_editable_active");that.fade()});GENTICS.Aloha.EventRegistry.subscribe(GENTICS.Aloha,"editableDeactivated",function(jEvent,aEvent){aEvent.editable.obj.removeClass("GENTICS_editable_active")})};GENTICS.Aloha.HighlightEditables.fade=function(){for(var i=0;i<GENTICS.Aloha.editables.length;i++){var editable=GENTICS.Aloha.editables[i].obj;if(editable.hasClass("GENTICS_editable_highlight")){editable.removeClass("GENTICS_editable_highlight").css("outline","5px solid #FFE767").animate({outlineWidth:"0px"},300,"swing",function(){jQuery(this).css("outline","")})}}};
|
||||
@ -0,0 +1,7 @@
|
||||
/*
|
||||
* 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
|
||||
*/
|
||||
if(!GENTICS.Aloha.Repositories){GENTICS.Aloha.Repositories={}}GENTICS.Aloha.Repositories.LinkList=new GENTICS.Aloha.Repository("com.gentics.aloha.repositories.LinkList");GENTICS.Aloha.Repositories.LinkList.settings.data=[{name:"Aloha Editor - The HTML5 Editor",url:"http://aloha-editor.com",type:"website"},{name:"Aloha Logo",url:"http://www.aloha-editor.com/images/aloha-editor-logo.png",type:"image"}];GENTICS.Aloha.Repositories.LinkList.folder=[];GENTICS.Aloha.Repositories.LinkList.init=function(){for(var i=0;i<this.settings.data.length;i++){var e=this.settings.data[i];e.repositoryId=this.repositoryId;e.id=e.id?e.id:e.url;var u=e.uri=this.parseUri(e.url);var path=this.addFolder("",u.host);var pathparts=u.path.split("/");for(j=0;j<pathparts.length;j++){if(pathparts[j]&&pathparts[j].lastIndexOf(".")<0){path=this.addFolder(path,pathparts[j])}}e.parentId=path;this.settings.data[i]=new GENTICS.Aloha.Repository.Document(e)}this.repositoryName="Linklist"};GENTICS.Aloha.Repositories.LinkList.addFolder=function(path,name){var type=path?"folder":"hostname";var p=path?path+"/"+name:name;if(name&&!this.folder[p]){this.folder[p]=new GENTICS.Aloha.Repository.Folder({id:p,name:(name)?name:p,parentId:path,type:"host",repositoryId:this.repositoryId})}return p};GENTICS.Aloha.Repositories.LinkList.query=function(p,callback){var d=this.settings.data.filter(function(e,i,a){var r=new RegExp(p.queryString,"i");var ret=false;return((!p.queryString||e.name.match(r)||e.url.match(r))&&(!p.objectTypeFilter||jQuery.inArray(e.type,p.objectTypeFilter)>-1)&&(!p.inFolderId||p.inFolderId==e.parentId))});callback.call(this,d)};GENTICS.Aloha.Repositories.LinkList.getChildren=function(p,callback){var d=[];for(e in this.folder){var l=this.folder[e].parentId;if(typeof this.folder[e]!="function"&&(this.folder[e].parentId==p.inFolderId||(!this.folder[e].parentId&&p.inFolderId==this.repositoryId))){d.push(this.folder[e])}}callback.call(this,d)};GENTICS.Aloha.Repositories.LinkList.parseUri=function(str){var o={strictMode:false,key:["source","protocol","authority","userInfo","user","password","host","port","relative","path","directory","file","query","anchor"],q:{name:"queryKey",parser:/(?:^|&)([^&=]*)=?([^&]*)/g},parser:{strict:/^(?:([^:\/?#]+):)?(?:\/\/((?:(([^:@]*)(?::([^:@]*))?)?@)?([^:\/?#]*)(?::(\d*))?))?((((?:[^?#\/]*\/)*)([^?#]*))(?:\?([^#]*))?(?:#(.*))?)/,loose:/^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@]*)(?::([^:@]*))?)?@)?([^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/}},m=o.parser[o.strictMode?"strict":"loose"].exec(str),uri={},i=14;while(i--){uri[o.key[i]]=m[i]||""}uri[o.q.name]={};uri[o.key[12]].replace(o.q.parser,function($0,$1,$2){if($1){uri[o.q.name][$1]=$2}});return uri};
|
||||
@ -1,48 +0,0 @@
|
||||
.ac_results {
|
||||
padding: 0px;
|
||||
border: 1px solid gray;
|
||||
background-color: white;
|
||||
overflow: hidden;
|
||||
z-index: 99999;
|
||||
}
|
||||
|
||||
.ac_results ul {
|
||||
width: 100%;
|
||||
list-style-position: outside;
|
||||
list-style: none;
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.ac_results li {
|
||||
margin: 0px;
|
||||
padding: 2px 5px;
|
||||
cursor: default;
|
||||
display: block;
|
||||
/*
|
||||
if width will be 100% horizontal scrollbar will apear
|
||||
when scroll mode will be used
|
||||
*/
|
||||
/*width: 100%;*/
|
||||
font: menu;
|
||||
font-size: 12px;
|
||||
/*
|
||||
it is very important, if line-height not setted or setted
|
||||
in relative units scroll will be broken in firefox
|
||||
*/
|
||||
line-height: 16px;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.ac_loading {
|
||||
background: white url('indicator.gif') right center no-repeat;
|
||||
}
|
||||
|
||||
.ac_odd {
|
||||
background-color: #eee;
|
||||
}
|
||||
|
||||
.ac_over {
|
||||
background-color: #B7D6FA;
|
||||
color: white;
|
||||
}
|
||||
@ -0,0 +1,7 @@
|
||||
/*
|
||||
* 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
|
||||
*/
|
||||
if(!GENTICS.Aloha.Repositories){GENTICS.Aloha.Repositories={}}GENTICS.Aloha.Repositories.delicious=new GENTICS.Aloha.Repository("com.gentics.aloha.repositories.delicious");GENTICS.Aloha.Repositories.delicious.settings.username="draftkraft";GENTICS.Aloha.Repositories.delicious.settings.weight=0.35;GENTICS.Aloha.Repositories.delicious.init=function(){var that=this;if(this.settings.weight+0.15>1){this.settings.weight=1-0.15}this.deliciousURL="http://feeds.delicious.com/v2/json/";if(this.settings.username){this.deliciousURL+=this.settings.username+"/";this.repositoryName="deliciuos/"+this.settings.username;this.tags=[];jQuery.ajax({type:"GET",dataType:"jsonp",url:"http://feeds.delicious.com/v2/json/tags/"+that.settings.username,success:function(data){for(var tag in data){that.tags.push(tag)}}})}else{this.repositoryName="deliciuos/"+popular;this.deliciousURL+="tag/"}};GENTICS.Aloha.Repositories.delicious.query=function(p,callback){var that=this;if(p.objectTypeFilter&&jQuery.inArray("website",p.objectTypeFilter)==-1){callback.call(this,[])}else{var tags=[];if(this.settings.username){var queryTags=p.queryString?p.queryString.split(" "):[];for(var i=0;i<queryTags.length;i++){var queryTag=queryTags[i].trim();if(jQuery.inArray(queryTag,that.tags)==-1){var newtags=that.tags.filter(function(e,i,a){var r=new RegExp(queryTag,"i");return(e.match(r))});if(newtags.length>0){tags.push(newtags[0])}}else{tags.push(queryTag)}}}else{tags=p.queryString.split(" ")}var folderTags=p.inFolderId?p.inFolderId.split("+"):[];jQuery.extend(tags,folderTags);if(p.queryString&&tags.length==0){callback.call(that,[]);return}jQuery.ajax({type:"GET",dataType:"jsonp",url:that.deliciousURL+tags.join("+"),success:function(data){var items=[];for(var i=0;i<data.length;i++){if(typeof data[i]!="function"){items.push(new GENTICS.Aloha.Repository.Document({id:data[i].u,name:data[i].d,repositoryId:that.repositoryId,type:"website",url:data[i].u,weight:that.settings.weight+(15-1)/100}))}}callback.call(that,items)}})}};GENTICS.Aloha.Repositories.delicious.getChildren=function(p,callback){var that=this;if(this.settings.username){var items=[];if(p.inFolderId==this.repositoryId){for(var i=0;i<this.tags.length;i++){if(typeof this.tags[i]!="function"){items.push(new GENTICS.Aloha.Repository.Folder({id:this.tags[i],name:this.tags[i],repositoryId:this.repositoryId,type:"tag",url:"http://feeds.delicious.com/v2/rss/tags/"+that.settings.username+"/"+this.tags[i]}))}}callback.call(this,items)}else{jQuery.ajax({type:"GET",dataType:"jsonp",url:"http://feeds.delicious.com/v2/json/tags/"+that.settings.username+"/"+p.inFolderId,success:function(data){var items=[];for(var tag in data){var id=(p.inFolderId)?p.inFolderId+"+"+tag:tag;if(typeof data[tag]!="function"){items.push(new GENTICS.Aloha.Repository.Folder({id:id,name:tag,repositoryId:that.repositoryId,type:"tag",url:"http://feeds.delicious.com/v2/rss/tags/"+that.settings.username+"/"+id,hasMoreItems:true}))}}callback.call(that,items)}})}}else{callback.call(this,[])}};
|
||||
File diff suppressed because one or more lines are too long
@ -0,0 +1,4 @@
|
||||
button.addlink.tooltip=Dodaj link
|
||||
button.removelink.tooltip=Usuń link
|
||||
newlink.defaulttext=Nowy link
|
||||
floatingmenu.tab.link=Link
|
||||
File diff suppressed because one or more lines are too long
@ -1,7 +0,0 @@
|
||||
/*
|
||||
* 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.Aloha.Ressource=function(ressourcePrefix,basePath){this.prefix=ressourcePrefix;this.basePath=basePath?basePath:ressourcePrefix;GENTICS.Aloha.RessourceRegistry.register(this)};GENTICS.Aloha.Ressource.prototype.settings=null;GENTICS.Aloha.Ressource.prototype.init=function(){};GENTICS.Aloha.Ressource.prototype.query=function(attrs){return null};GENTICS.Aloha.Ressource.prototype.resolveRessource=function(obj){return null};
|
||||
@ -1,7 +0,0 @@
|
||||
/*
|
||||
* 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.Aloha.Ressources.Dummy=new GENTICS.Aloha.Ressource("com.gentics.aloha.resources.Dummy");GENTICS.Aloha.Ressources.Dummy.init=function(){var data=[{id:1,text:"Link A",url:"/page1"},{id:2,text:"Link B",url:"/page2"},{id:3,text:"Link C",url:"/page3"},{id:4,text:"Link D",url:"/page4"}]};GENTICS.Aloha.Ressources.Dummy.query=function(attrs){return this.data};GENTICS.Aloha.Ressources.Dummy.resolve=function(obj){return null};
|
||||
@ -1,7 +0,0 @@
|
||||
/*
|
||||
* 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.Aloha.RessourceRegistry=function(){this.ressources=new Array()};GENTICS.Aloha.RessourceRegistry.prototype.register=function(ressource){if(ressource instanceof GENTICS.Aloha.Ressource){this.ressources.push(ressource)}};GENTICS.Aloha.RessourceRegistry.prototype.init=function(){for(var i=0;i<this.ressources.length;i++){var ressource=this.ressources[i];if(GENTICS.Aloha.settings.ressources==undefined){GENTICS.Aloha.settings.ressources={}}ressource.settings=GENTICS.Aloha.settings.ressources[ressource.prefix];if(ressource.settings==undefined){ressource.settings={}}if(ressource.settings.enabled==undefined){ressource.settings.enabled=true}if(ressource.settings.enabled==true){this.ressources[i].init()}}};GENTICS.Aloha.RessourceRegistry.toString=function(){return"com.gentics.aloha.RessourceRegistry"};GENTICS.Aloha.RessourceRegistry=new GENTICS.Aloha.RessourceRegistry();GENTICS.Aloha.Ressources={};
|
||||
@ -0,0 +1 @@
|
||||
Subproject commit b8bac9b6b11ddd2dfa141053229c17ca209425a3
|
||||
File diff suppressed because one or more lines are too long
@ -0,0 +1 @@
|
||||
Subproject commit 56665c88d4195e303bac477a773e8fd76d5eb292
|
||||
@ -0,0 +1 @@
|
||||
button.addtoc.tooltip=Inhaltsverzeichnis
|
||||
@ -0,0 +1 @@
|
||||
button.addtoc.tooltip=Table of contents
|
||||
File diff suppressed because one or more lines are too long
@ -10,3 +10,5 @@ button.delcols.tooltip=Spalten löschen
|
||||
button.addrowbefore.tooltip=Zeile darüber einfügen
|
||||
button.addrowafter.tooltip=Zeile darunter einfügen
|
||||
button.delrows.tooltip=Zeilen löschen
|
||||
button.caption.tooltip=Tabellen Bezeichnung
|
||||
empty.caption=Tabellen Bezeichnung
|
||||
@ -10,3 +10,5 @@ button.delcols.tooltip=Delete Columns
|
||||
button.addrowbefore.tooltip=Add Row before
|
||||
button.addrowafter.tooltip=Add Row after
|
||||
button.delrows.tooltip=Delete Rows
|
||||
button.caption.tooltip=Table caption
|
||||
empty.caption=Table caption
|
||||
@ -0,0 +1,12 @@
|
||||
floatingmenu.tab.table=Tabela
|
||||
deleterows.confirm=Czy na pewno chcesz usunąć zaznaczone wiersze?
|
||||
deletecolumns.confirm=Czy na pewno chcesz usunąć zaznaczone kolumny?
|
||||
deletetable.confirm=Czy na pewno chcesz usunąć tabelę?
|
||||
Table=Tabela
|
||||
button.createtable.tooltip=Wstaw tabelę
|
||||
button.addcolleft.tooltip=Dodaj kolumnę na lewo
|
||||
button.addcolright.tooltip=Dodaj kolumnę na prawo
|
||||
button.delcols.tooltip=Usuń kolumny
|
||||
button.addrowbefore.tooltip=Dodaj wiersz przed
|
||||
button.addrowafter.tooltip=Dodaj wiersz po
|
||||
button.delrows.tooltip=Usuń wiersze
|
||||
File diff suppressed because one or more lines are too long
@ -1,23 +1,6 @@
|
||||
.GENTICS_Aloha_Table {
|
||||
border: 0px solid #AFAFAF;
|
||||
width: 100%;
|
||||
box-sizing : none !important;
|
||||
cursor: default;
|
||||
}
|
||||
.GENTICS_Aloha_Table td {
|
||||
border: 1px solid #AFAFAF;
|
||||
padding: 1px;
|
||||
margin: 0;
|
||||
vertical-align: top;
|
||||
cursor: text;
|
||||
}
|
||||
.GENTICS_Aloha_Table td .GENTICS_Table_Cell_editable {
|
||||
cursor: text !important;
|
||||
}
|
||||
|
||||
/**
|
||||
* Hide the border for contenteditables
|
||||
*/
|
||||
*/
|
||||
.GENTICS_Table_Cell_editable,
|
||||
.GENTICS_Aloha_Table_wrapper {
|
||||
outline: 0px solid transparent;
|
||||
@ -44,18 +27,36 @@ td.GENTICS_Aloha_Table_selectRow {
|
||||
height: 10px;
|
||||
}
|
||||
|
||||
.GENTICS_Aloha_Table td .GENTICS_Table_Cell_editable {
|
||||
cursor: text !important;
|
||||
}
|
||||
|
||||
.GENTICS_Aloha_Table tr.GENTICS_Aloha_Table_selectColumn td {
|
||||
cursor: url(down.cur),url(../plugins/table/resources/down.cur),default;
|
||||
cursor: url(down.cur),default;
|
||||
}
|
||||
|
||||
/* :TODO: make custom cursors visible in IE */
|
||||
.GENTICS_Aloha_Table td.GENTICS_Aloha_Table_selectRow {
|
||||
cursor: url(left.cur),url(../plugins/table/resources/left.cur),default;
|
||||
cursor: url(left.cur),default;
|
||||
}
|
||||
|
||||
.GENTICS_WAI_RED {
|
||||
background-image: url(wai_red.png);
|
||||
}
|
||||
|
||||
.GENTICS_WAI_GREEN {
|
||||
background-image: url(wai_green.png);
|
||||
}
|
||||
|
||||
.GENTICS_Aloha_Table td.GENTICS_Aloha_Table_leftUpperCorner div {
|
||||
cursor: pointer !important;
|
||||
}
|
||||
|
||||
.GENTICS_Aloha_Table td.GENTICS_Aloha_Table_selectRow,
|
||||
.GENTICS_Aloha_Table tr.GENTICS_Aloha_Table_selectColumn td {
|
||||
border: 0;
|
||||
margin:0;
|
||||
padding:0;
|
||||
background-color: #D0D0D0;
|
||||
font-size: 0.01em;
|
||||
}
|
||||
@ -73,9 +74,9 @@ td.GENTICS_Aloha_Table_selectRow {
|
||||
position: absolute;
|
||||
background-color: #F0F0F0;
|
||||
border: 1px solid #cccccc;
|
||||
-moz-border-radius: 3px;
|
||||
-webkit-border-radius: 3px;
|
||||
border-radius: 3px;
|
||||
-moz-border-radius: 2px;
|
||||
-webkit-border-radius: 2px;
|
||||
border-radius: 2px;
|
||||
}
|
||||
.GENTICS_Table_Createdialog table {
|
||||
padding: 0px;
|
||||
@ -84,111 +85,28 @@ td.GENTICS_Aloha_Table_selectRow {
|
||||
.GENTICS_Table_Createdialog table td {
|
||||
margin: 0px;
|
||||
padding: 0px;
|
||||
border: 2px solid #AFAFAF;
|
||||
border: 1px solid #AFAFAF;
|
||||
font-size: 8px;
|
||||
width: 15px;
|
||||
height: 15px;
|
||||
-moz-border-radius: 3px;
|
||||
-webkit-border-radius: 3px;
|
||||
border-radius: 3px;
|
||||
}
|
||||
.GENTICS_Table_Createdialog table td.hover {
|
||||
border-color: #1c94c4;
|
||||
background-color: #1c94c4;
|
||||
}
|
||||
.GENTICS_Table_Createdialog #table-size-info {
|
||||
text-align: center;
|
||||
font-size: 0.8em;
|
||||
}
|
||||
|
||||
.GENTICS_Aloha_Cell_selected {
|
||||
background-color: #3399FF !important;
|
||||
color: #FFF;
|
||||
}
|
||||
|
||||
table td {
|
||||
height: 100%;
|
||||
min-height: 100%;
|
||||
}
|
||||
div.GENTICS_Table_Cell_editable {
|
||||
height: 100%;
|
||||
min-height: 100%;
|
||||
width: 100%;
|
||||
z-index: 99999;
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
floating menu buttons
|
||||
|
||||
*/
|
||||
.GENTICS_floatingmenu a.GENTICS_Aloha_addColumnLeft {
|
||||
background-position: -540px 0;
|
||||
}
|
||||
|
||||
.GENTICS_floatingmenu a:hover.GENTICS_Aloha_addColumnLeft {
|
||||
background-position: -540px -20px;
|
||||
}
|
||||
|
||||
.GENTICS_floatingmenu .pressed a.GENTICS_Aloha_addColumnLeft {
|
||||
background-position: -540px -40px;
|
||||
}
|
||||
|
||||
.GENTICS_floatingmenu a.GENTICS_Aloha_addColumnRight {
|
||||
background-position: -560px 0;
|
||||
}
|
||||
|
||||
.GENTICS_floatingmenu a:hover.GENTICS_Aloha_addColumnRight {
|
||||
background-position: -560px -20px;
|
||||
}
|
||||
|
||||
.GENTICS_floatingmenu .pressed a.GENTICS_Aloha_addColumnRight {
|
||||
background-position: -560px -40px;
|
||||
}
|
||||
|
||||
.GENTICS_floatingmenu a.GENTICS_Aloha_addRowBefore {
|
||||
background-position: -580px 0;
|
||||
}
|
||||
|
||||
.GENTICS_floatingmenu a:hover.GENTICS_Aloha_addRowBefore {
|
||||
background-position: -580px -20px;
|
||||
}
|
||||
|
||||
.GENTICS_floatingmenu .pressed a.GENTICS_Aloha_addRowBefore {
|
||||
background-position: -580px -40px;
|
||||
}
|
||||
|
||||
.GENTICS_floatingmenu a.GENTICS_Aloha_addRowAfter {
|
||||
background-position: -600px 0;
|
||||
}
|
||||
|
||||
.GENTICS_floatingmenu a:hover.GENTICS_Aloha_addRowAfter {
|
||||
background-position: -600px -20px;
|
||||
}
|
||||
|
||||
.GENTICS_floatingmenu .pressed a.GENTICS_Aloha_addRowAfter {
|
||||
background-position: -600px -40px;
|
||||
}
|
||||
|
||||
.GENTICS_floatingmenu a.GENTICS_Aloha_deleteRows {
|
||||
background-position: -620px 0;
|
||||
}
|
||||
|
||||
.GENTICS_floatingmenu a:hover.GENTICS_Aloha_deleteRows {
|
||||
background-position: -620px -20px;
|
||||
}
|
||||
|
||||
.GENTICS_floatingmenu .pressed a.GENTICS_Aloha_deleteRows {
|
||||
background-position: -620px -40px;
|
||||
}
|
||||
|
||||
.GENTICS_floatingmenu a.GENTICS_Aloha_deleteColumns {
|
||||
background-position: -640px 0;
|
||||
}
|
||||
|
||||
.GENTICS_floatingmenu a:hover.GENTICS_Aloha_deleteColumns {
|
||||
background-position: -640px -20px;
|
||||
}
|
||||
|
||||
.GENTICS_floatingmenu .pressed a.GENTICS_Aloha_deleteColumns {
|
||||
background-position: -640px -40px;
|
||||
button.GENTICS_button_table_caption {
|
||||
background-position: -320px 0px !important;
|
||||
}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 50 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 48 KiB |
@ -1 +0,0 @@
|
||||
if(typeof eu=="undefined"){var eu={};if(typeof eu.iksproject=="undefined"){eu.iksproject={}}}eu.iksproject.LoaderPlugin=new GENTICS.Aloha.Plugin("eu.iksproject.plugins.Loader");eu.iksproject.LoaderPlugin.loadedAssets={};eu.iksproject.LoaderPlugin.init=function(){var that=this};eu.iksproject.LoaderPlugin.load=function(pluginNamespace){var pluginPath=""+GENTICS_Aloha_base+"/plugins/"+pluginNamespace+"/plugin.js";jQuery('<script type="text/javascript" />').attr("src",pluginPath).appendTo("head")};eu.iksproject.LoaderPlugin.loadAsset=function(pluginNamespace,assetName,assetType){if(typeof assetType=="undefined"){assetType="js"}var assetPath=""+GENTICS_Aloha_base+"/plugins/"+pluginNamespace+"/"+assetName+"."+assetType;if(this.loadedAssets[assetPath]){return}this.loadedAssets[assetPath]=true;if(assetType=="js"){jQuery('<script type="text/javascript" />').attr("src",assetPath).appendTo("head")}else{if(assetType=="css"){jQuery('<link rel="stylesheet" />').attr("href",assetPath).appendTo("head")}}};
|
||||
@ -1,2 +0,0 @@
|
||||
tab.annotations=Annotations
|
||||
button.person.tooltip=Person
|
||||
@ -1,2 +0,0 @@
|
||||
tab.annotations=Merkinnät
|
||||
button.person.tooltip=Henkilö
|
||||
@ -1,2 +0,0 @@
|
||||
tab.annotations=Annotations
|
||||
button.person.tooltip=Personne
|
||||
@ -1,3 +0,0 @@
|
||||
span[typeof="v:Person"] {
|
||||
background-color: yellow;
|
||||
}
|
||||
@ -1 +0,0 @@
|
||||
if(typeof eu=="undefined"){var eu={};if(typeof eu.iksproject=="undefined"){eu.iksproject={}}}eu.iksproject.PersonPlugin=new GENTICS.Aloha.Plugin("eu.iksproject.plugins.Person");eu.iksproject.LoaderPlugin.loadAsset("eu.iksproject.plugins.Person","person","css");eu.iksproject.PersonPlugin.languages=["en","fi","fr"];eu.iksproject.PersonPlugin.init=function(){var that=this;this.initButtons()};eu.iksproject.PersonPlugin.initButtons=function(){this.createPersonButton=new GENTICS.Aloha.ui.Button({iconClass:"GENTICS_button GENTICS_button_addPerson",size:"small",tooltip:this.i18n("button.person.tooltip"),onclick:function(element,event){if(GENTICS.Aloha.activeEditable){GENTICS.Aloha.activeEditable.obj[0].focus()}var markup=jQuery("<span />").attr({"xmlns:v":"http://rdf.data-vocabulary.org/#","typeof":"v:Person",property:"v:name"});var rangeObject=GENTICS.Aloha.Selection.rangeObject;GENTICS.Utils.Dom.addMarkup(rangeObject,markup);rangeObject.select();return false}});GENTICS.Aloha.FloatingMenu.addButton("GENTICS.Aloha.continuoustext",this.createPersonButton,this.i18n("tab.annotations"),1)};
|
||||
File diff suppressed because it is too large
Load Diff
@ -9,6 +9,8 @@ function makeSlug(val, sep) { // code largely inspired by http://www.thewebsitet
|
||||
return val.toLowerCase();
|
||||
}
|
||||
|
||||
String.prototype.trim = function() {
|
||||
return this.replace(/^\s+/g, '').replace(/\s+$/g, '');
|
||||
}
|
||||
(function() {
|
||||
String.prototype.trim = function() {
|
||||
return this.replace(/^\s+/g, '').replace(/\s+$/g, '');
|
||||
}
|
||||
})();
|
||||
@ -27,7 +27,7 @@ div.notice p {
|
||||
|
||||
p.no-items {
|
||||
padding: 15px 0px;
|
||||
background: transparent url(/images/admin/list/none.png) no-repeat 0 0;
|
||||
background: transparent url(/images/admin/list/none.png) no-repeat center 0;
|
||||
text-align: center;
|
||||
color: #9d8963 !important;
|
||||
font-size: 1.1em !important;
|
||||
|
||||
@ -130,11 +130,6 @@ body { background: #000 url(/images/admin/background/body.png) repeat 0 0; }
|
||||
line-height: 21px;
|
||||
}
|
||||
|
||||
@media screen and (-webkit-min-device-pixel-ratio:0) {
|
||||
#panel div.footer .button { padding-left: 5px; }
|
||||
#panel div.footer .button span { top: 0px; padding-right: 10px; }
|
||||
}
|
||||
|
||||
/* ___ Messages ___ */
|
||||
|
||||
div.application-message {
|
||||
|
||||
@ -21,11 +21,6 @@
|
||||
outline: none;
|
||||
}
|
||||
|
||||
@media screen and (-webkit-min-device-pixel-ratio:0) {
|
||||
.button { padding-left: 5px; }
|
||||
.button span { top: 0px; }
|
||||
}
|
||||
|
||||
.button.light {
|
||||
background-image: url(/images/admin/buttons/light-gray-left.png);
|
||||
color: #787a89;
|
||||
|
||||
@ -65,11 +65,6 @@ form.formtastic fieldset.foldable ol {
|
||||
|
||||
form.formtastic fieldset.foldable.folded ol { display: none; }
|
||||
|
||||
@media screen and (-webkit-min-device-pixel-ratio:0) {
|
||||
form.formtastic fieldset.foldable legend span em { top: 0px; }
|
||||
form.formtastic fieldset.foldable.folded legend span em { top: 0px; }
|
||||
}
|
||||
|
||||
/* ___ inputs ___ */
|
||||
|
||||
form.formtastic fieldset.inputs { min-height: 30px; width: 100%; margin-bottom: 20px; }
|
||||
@ -83,12 +78,6 @@ form.formtastic fieldset.inputs ol {
|
||||
border-top: 1px solid #ccced7;
|
||||
}
|
||||
|
||||
@media screen and (-webkit-min-device-pixel-ratio:0) {
|
||||
form.formtastic fieldset.inputs ol {
|
||||
margin-top: 30px;
|
||||
}
|
||||
}
|
||||
|
||||
form.formtastic fieldset ol li { width: 100%; position: relative; margin-bottom: 1.3em; }
|
||||
|
||||
form.formtastic fieldset ol li label { text-align: left; padding: 0.3em 2em 0 20px; font-size: 0.8em; color: #17171b; width: 15%; }
|
||||
|
||||
@ -143,10 +143,6 @@ body {
|
||||
background: transparent url(/images/admin/icons/actions.png) no-repeat 0 0;
|
||||
}
|
||||
|
||||
@media screen and (-webkit-min-device-pixel-ratio:0) {
|
||||
#content #local-actions-bar a em { top: 4px; }
|
||||
}
|
||||
|
||||
#content #local-actions-bar a.show em { background-position: 0 0; }
|
||||
#content #local-actions-bar a.edit em { background-position: 0 -16px; top: 2px; left: 12px; }
|
||||
#content #local-actions-bar a.download em { background-position: 0 -32px; }
|
||||
|
||||
15
public/stylesheets/admin/safari.css
Normal file
15
public/stylesheets/admin/safari.css
Normal file
@ -0,0 +1,15 @@
|
||||
@media screen and/*!YUI-Compresser */(-webkit-min-device-pixel-ratio:0) {
|
||||
|
||||
#panel div.footer .button { padding-left: 5px; }
|
||||
#panel div.footer .button span { top: 0px; padding-right: 10px; }
|
||||
|
||||
.button { padding-left: 5px; }
|
||||
.button span { top: 0px; }
|
||||
|
||||
form.formtastic fieldset.foldable legend span em { top: 0px; }
|
||||
form.formtastic fieldset.foldable.folded legend span em { top: 0px; }
|
||||
|
||||
form.formtastic fieldset.inputs ol { margin-top: 30px; }
|
||||
|
||||
#content #local-actions-bar a em { top: 4px; }
|
||||
}
|
||||
@ -9,87 +9,87 @@ describe Site do
|
||||
it 'should have a valid factory' do
|
||||
Factory.build(:site).should be_valid
|
||||
end
|
||||
|
||||
|
||||
## Validations ##
|
||||
|
||||
|
||||
it 'should validate presence of name' do
|
||||
site = Factory.build(:site, :name => nil)
|
||||
site.should_not be_valid
|
||||
site.errors[:name].should == ["can't be blank"]
|
||||
end
|
||||
|
||||
|
||||
it 'should validate presence of subdomain' do
|
||||
site = Factory.build(:site, :subdomain => nil)
|
||||
site.should_not be_valid
|
||||
site.errors[:subdomain].should == ["can't be blank"]
|
||||
end
|
||||
|
||||
%w{test test42}.each do |subdomain|
|
||||
|
||||
%w{test test42 foo_bar}.each do |subdomain|
|
||||
it "should accept subdomain like '#{subdomain}'" do
|
||||
Factory.build(:site, :subdomain => subdomain).should be_valid
|
||||
end
|
||||
end
|
||||
|
||||
['-', '_test', 'test_', 't est', '42', '42test', 'foo_bar'].each do |subdomain|
|
||||
|
||||
['-', '_test', 'test_', 't est', '42', '42test'].each do |subdomain|
|
||||
it "should not accept subdomain like '#{subdomain}'" do
|
||||
(site = Factory.build(:site, :subdomain => subdomain)).should_not be_valid
|
||||
site.errors[:subdomain].should == ['is invalid']
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
it "should not use reserved keywords as subdomain" do
|
||||
%w{www admin email blog webmail mail support help site sites}.each do |subdomain|
|
||||
(site = Factory.build(:site, :subdomain => subdomain)).should_not be_valid
|
||||
site.errors[:subdomain].should == ['is reserved']
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
it 'should validate uniqueness of subdomain' do
|
||||
Factory(:site)
|
||||
(site = Factory.build(:site)).should_not be_valid
|
||||
site.errors[:subdomain].should == ["is already taken"]
|
||||
end
|
||||
|
||||
|
||||
it 'should validate uniqueness of domains' do
|
||||
Factory(:site, :domains => %w{www.acme.net www.acme.com})
|
||||
|
||||
|
||||
(site = Factory.build(:site, :domains => %w{www.acme.com})).should_not be_valid
|
||||
site.errors[:domains].should == ["www.acme.com is already taken"]
|
||||
|
||||
|
||||
(site = Factory.build(:site, :subdomain => 'foo', :domains => %w{acme.example.com})).should_not be_valid
|
||||
site.errors[:domains].should == ["acme.example.com is already taken"]
|
||||
end
|
||||
|
||||
|
||||
it 'should validate format of domains' do
|
||||
site = Factory.build(:site, :domains => ['barformat.superlongextension', '-foo.net'])
|
||||
site.should_not be_valid
|
||||
site.errors[:domains].should == ['barformat.superlongextension is invalid', '-foo.net is invalid']
|
||||
end
|
||||
|
||||
|
||||
## Named scopes ##
|
||||
|
||||
|
||||
it 'should retrieve sites by domain' do
|
||||
site_1 = Factory(:site, :domains => %w{www.acme.net})
|
||||
site_2 = Factory(:site, :subdomain => 'test', :domains => %w{www.example.com})
|
||||
|
||||
|
||||
sites = Site.match_domain('www.acme.net')
|
||||
sites.size.should == 1
|
||||
sites.first.should == site_1
|
||||
|
||||
|
||||
sites = Site.match_domain('www.example.com')
|
||||
sites.size.should == 1
|
||||
sites.first.should == site_2
|
||||
|
||||
|
||||
sites = Site.match_domain('test.example.com')
|
||||
sites.size.should == 1
|
||||
sites.first.should == site_2
|
||||
|
||||
|
||||
sites = Site.match_domain('www.unknown.com')
|
||||
sites.should be_empty
|
||||
end
|
||||
|
||||
|
||||
## Associations ##
|
||||
|
||||
|
||||
it 'should have many accounts' do
|
||||
site = Factory.build(:site)
|
||||
account_1, account_2 = Factory(:account), Factory(:account, :name => 'homer', :email => 'homer@simpson.net')
|
||||
@ -98,40 +98,40 @@ describe Site do
|
||||
site.memberships.size.should == 2
|
||||
site.accounts.should == [account_1, account_2]
|
||||
end
|
||||
|
||||
|
||||
## Methods ##
|
||||
|
||||
|
||||
it 'should return domains without subdomain' do
|
||||
site = Factory(:site, :domains => %w{www.acme.net www.acme.com})
|
||||
site.domains.should == %w{www.acme.net www.acme.com acme.example.com}
|
||||
site.domains_without_subdomain.should == %w{www.acme.net www.acme.com}
|
||||
end
|
||||
|
||||
|
||||
describe 'once created' do
|
||||
|
||||
|
||||
before(:each) do
|
||||
@site = Factory(:site)
|
||||
end
|
||||
|
||||
|
||||
it 'should create index and 404 pages' do
|
||||
@site.pages.size.should == 2
|
||||
@site.pages.map(&:fullpath).sort.should == %w{404 index}
|
||||
end
|
||||
|
||||
|
||||
end
|
||||
|
||||
describe 'deleting in cascade' do
|
||||
|
||||
|
||||
before(:each) do
|
||||
@site = Factory(:site)
|
||||
end
|
||||
|
||||
|
||||
it 'should also destroy pages' do
|
||||
lambda {
|
||||
@site.destroy
|
||||
}.should change(Page, :count).by(-2)
|
||||
end
|
||||
|
||||
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
Loading…
Reference in New Issue
Block a user