refinerycms-core 0.9.9.4 → 0.9.9.5

Sign up to get free protection for your applications and to get access to all the features.
@@ -1,8 +1,6 @@
1
1
  # Filters added to this controller apply to all controllers in the refinery backend.
2
2
  # Likewise, all the methods added will be available for all controllers in the refinery backend.
3
3
 
4
- # You can extend refinery backend with your own functions here and they will likely not get overriden in an update.
5
-
6
4
  module Admin
7
5
  class BaseController < ActionController::Base
8
6
 
@@ -50,7 +50,7 @@
50
50
  if section[:title]
51
51
  section[:html] = "<h1 id='#{dom_id}'>#{section[:html]}</h1>"
52
52
  else
53
- section[:html] = "<section id='#{dom_id}'>#{section[:html]}</section>"
53
+ section[:html] = "<section id='#{dom_id}'><div class='inner'>#{section[:html]}</div></section>"
54
54
  end
55
55
  else
56
56
  css << "no_#{dom_id}"
@@ -1,12 +1,12 @@
1
1
  <%
2
2
  dom_id ||= 'menu'
3
3
  css ||= 'menu'
4
- hide_children = RefinerySetting.find_or_set(:menu_hide_children, false) unless defined?(hide_children)
4
+ hide_children = RefinerySetting.find_or_set(:menu_hide_children, false) if hide_children.nil?
5
5
  # Select top menu items unless 'roots' is supplied.
6
- collection ||= @menu_pages.includes(:parts, :slugs)
6
+ collection ||= @menu_pages.includes(:slugs)
7
7
  if (roots ||= collection.select{|p| p.parent_id.nil?}).present?
8
8
  # In order to match items that aren't shown in menu and highlight their associations.
9
- # This can be supplied if the logic different in your case.
9
+ # This can be supplied if the logic is different in your case.
10
10
  unless defined?(selected_item)
11
11
  selected_item = collection.detect{|page| selected_page?(page)}
12
12
  selected_item = @page if selected_item.nil?
@@ -5,7 +5,7 @@
5
5
  dom_id = ("id='item_#{menu_branch_counter}'" if menu_branch.parent_id.nil? and menu_branch.title.present?)
6
6
 
7
7
  hide_children = (defined?(hide_children) && hide_children)
8
- children = hide_children ? [] : collection.select { |p| p.parent_id == menu_branch.id && p.in_menu? }
8
+ children = (hide_children || !menu_branch.has_descendants?) ? [] : collection.select { |p| p.parent_id == menu_branch.id }
9
9
  -%>
10
10
  <li<%= ['', css, dom_id].compact.join(' ').gsub(/\ *$/, '') %>>
11
11
  <%= link_to menu_branch.title, menu_branch.url -%>
@@ -7,7 +7,7 @@ en:
7
7
  title: Dialogs
8
8
  description: Refinery dialogs plugin
9
9
  welcome:
10
- there_are_no_users: There are no users yet, so we'll set you up first.
10
+ there_are_no_users: "There are no users yet, so we'll set you up first."
11
11
  remember_admin_location: "Remember your Refinery admin area is at:"
12
12
  lets_start: Alright let's get you setup so you can login...
13
13
  continue: Continue...
@@ -31,7 +31,7 @@ en:
31
31
  switch_to_your_website_editor: Switch to your website editor
32
32
  admin:
33
33
  continue_editing:
34
- save_and_continue_editing: Save & continue editing
34
+ save_and_continue_editing: 'Save & continue editing'
35
35
  form_actions:
36
36
  save: Save
37
37
  cancel: Cancel
@@ -39,23 +39,23 @@ en:
39
39
  delete: Remove
40
40
  close: Close
41
41
  image_picker:
42
- none_selected: There is currently no %{what} selected, please click here to add one.
43
- remove_current: Remove current %{what}
42
+ none_selected: 'There is currently no %{what} selected, please click here to add one.'
43
+ remove_current: 'Remove current %{what}'
44
44
  change: Click here to pick a image
45
45
  show: Show
46
46
  resource_picker:
47
47
  download_current: Download current file
48
48
  opens_in_new_window: Opens in a new window
49
49
  remove_current: "Remove current file"
50
- no_resource_selected: There is currently no file selected, click here to add one.
50
+ no_resource_selected: 'There is currently no file selected, click here to add one.'
51
51
  name: Add File
52
52
  current: Current File
53
53
  search:
54
54
  button_text: Search
55
- results_for: Search results for '%{query}'
56
- no_results: Sorry, no results found
55
+ results_for: "Search results for '%{query}'"
56
+ no_results: 'Sorry, no results found'
57
57
  delete:
58
- message: Are you sure you want to remove '%{title}'?
58
+ message: "Are you sure you want to remove '%{title}'?"
59
59
  error_messages:
60
60
  problems_in_following_fields: There were problems with the following fields
61
61
  help: help
@@ -65,7 +65,7 @@ en:
65
65
  draft_page_message:
66
66
  not_live: This page is NOT live for public viewing.
67
67
  footer:
68
- copyright: Copyright © %{year} %{site_name}
68
+ copyright: "Copyright © %{year} %{site_name}"
69
69
  no_script:
70
70
  enable_javascript: For full functionality of this page it is necessary to enable JavaScript.
71
71
  here_are: Here are the
@@ -37,12 +37,12 @@ es:
37
37
  change: Haz click aquí para escoger una imagen
38
38
  show: Mostrar
39
39
  resource_picker:
40
- download_current: Descargar %{what} actual
40
+ download_current: Descargar archivo actual
41
41
  opens_in_new_window: Abre en una nueva ventana
42
- remove_current: "Eliminar %{what} actual"
43
- no_resource_selected: En este momento no existe un carpeta seleccionada, click aqui para agregar una
44
- name: Agregar carpeta
45
- current: Carpeta actual
42
+ remove_current: "Eliminar archivo actual"
43
+ no_resource_selected: No hay ningún archivo seleccionado, click aqui para agregar uno.
44
+ name: Agregar archivo
45
+ current: Archivo actual
46
46
  search:
47
47
  button_text: Buscar
48
48
  results_for: Resultados de la búsqueda '%{query}'
@@ -65,4 +65,4 @@ es:
65
65
  instructions_enable_javascript: instrucciones de cómo habilitar JavaScript en su navegador web
66
66
  time:
67
67
  formats:
68
- short: "%A, %d %B %Y"
68
+ short: "%A, %d %B %Y"
@@ -1,96 +1,96 @@
1
1
  it:
2
2
  plugins:
3
3
  refinery_core:
4
- title: Refinery
4
+ title: Refinery CMS
5
5
  description: Core refinery plugin
6
6
  refinery_dialogs:
7
7
  title: Dialogs
8
8
  description: Refinery dialogs plugin
9
9
  welcome:
10
- there_are_no_users: "Non ci sono ancora utenti registrati, impostarne prima uno."
11
- remember_admin_location: "Ricordati che la tua area di amministrazione di Refinery è:"
10
+ there_are_no_users: "Non ci sono ancora utenti registrati, occorre crearne uno."
11
+ remember_admin_location: "Ricorda che l'area di amministrazione di Refinery è:"
12
12
  lets_start: "Va bene! Impostiamo un utente in modo da poter accedere..."
13
- continue: "Proseguire..."
13
+ continue: "Continuare..."
14
14
  admin:
15
15
  menu:
16
- reorder_menu: Riordina menu
17
- reorder_menu_done: "Ho finito il riordino del menu"
16
+ reorder_menu: "Modifica l'ordinamento"
17
+ reorder_menu_done: "Termina la modifica dell'ordinamento"
18
18
  dialogs:
19
19
  show:
20
20
  save: Salva
21
- cancel: Cancella
21
+ cancel: Annulla
22
22
  refinery:
23
23
  other: "Altro %{what}"
24
24
  reorder: "Riordina %{what}"
25
- reorder_done: "Fatto Riordinare %{what}"
25
+ reorder_done: "Ordinamento di %{what} terminato"
26
26
  crudify:
27
27
  created: "%{what} creato con successo"
28
- updated: "%{what} creato con successo"
29
- destroyed: "%{what} rimosso con successo"
28
+ updated: "%{what} modificato con successo"
29
+ destroyed: "%{what} eliminato con successo"
30
30
  layouts:
31
31
  admin:
32
- view_public_site: Vedi il sito pubblico
33
- welcome_to_refinery: Benvenuti su Refinery
32
+ view_public_site: Vai alla zona pubblica
33
+ welcome_to_refinery: Benvenuto in Refinery CMS
34
34
  shared:
35
35
  site_bar:
36
36
  log_out: Esci
37
- switch_to_your_website: Passa al tuo sito web
38
- switch_to_your_website_editor: Passa all'editor del tuo sito web
37
+ switch_to_your_website: Vai al sito web
38
+ switch_to_your_website_editor: Vai alla gestione del sito web
39
39
  admin:
40
40
  message:
41
41
  close: Fine
42
42
  continue_editing:
43
- save_and_continue_editing: "Salvare e continuare ad apportare modifiche"
43
+ save_and_continue_editing: "Salva e ritorna a questa pagina"
44
44
  form_actions:
45
45
  or: o
46
- save: Salvare
46
+ save: Salva
47
47
  or_cancel: o
48
- cancel: Annullare
48
+ cancel: Annulla
49
49
  or_continue: o
50
- cancel_lose_changes: "L'annullamento perderà tutte le modifiche apportate a questa %{object_name}"
50
+ cancel_lose_changes: "L'annullamento comporterà la perdita delle modifiche apportate finora" # It is possible to use %{object_name}
51
51
  delete: Rimuovere
52
52
  close: Chiudere
53
53
  image_picker:
54
- none_selected: "Non ci sono attualmente %{what} selezionate, clicca qui per aggiungerne uno."
54
+ none_selected: "Non ci sono %{what} selezionate, clicca qui per aggiungerne una."
55
55
  remove_current: "Rimuovere %{what} corrente"
56
- change: Clicca qui per scegliere una immagine
56
+ change: "Clicca qui per scegliere un'immagine"
57
57
  image: immagine
58
58
  show: Visualizza
59
59
  resource_picker:
60
- none_selected: "Non ci sono attualmente %{what} selezionate, clicca qui per aggiungere una."
61
- current: "%{what} Corrente"
60
+ none_selected: "Non ci sono %{what} selezionate, clicca qui per aggiungerne una."
61
+ current: "%{what} corrente"
62
62
  download_current: "Scarica il %{what} corrente"
63
- opens_in_new_window: Apre una nuova finestra
63
+ opens_in_new_window: Apri in una nuova finestra/scheda
64
64
  remove_current: "Rimuovere %{what} corrente"
65
65
  resource: risorsa
66
- no_resource_selected: "Non ci sono attualmente %{what} selezionate, clicca qui per aggiungere una."
66
+ no_resource_selected: "Non ci sono %{what} selezionate, clicca qui per aggiungerne una."
67
67
  name: Aggiungi File
68
68
  search:
69
69
  button_text: Cerca
70
70
  results_for: "Risultati della ricerca per '%{query}'"
71
71
  no_results: "Spiacenti, nessun risultato trovato"
72
72
  delete:
73
- message: "Sei sicuro di voler rimuovere '%{title}'?"
73
+ message: "Sei sicuro di voler eliminare '%{title}'?"
74
74
  error_messages:
75
- problems_in_following_fields: Ci sono stati problemi con i seguenti campi
75
+ problems_in_following_fields: necessario risolvere i seguenti errori"
76
76
  help: aiuto
77
77
  message:
78
78
  close: Fine
79
- close_this_message: Chiudere questo messaggio
79
+ close_this_message: Chiudi questo messaggio
80
80
  draft_page_message:
81
81
  not_live: Questa pagina NON è valida per la visione pubblica.
82
82
  footer:
83
83
  copyright: "Tutti i diritti sono riservati © %{year} %{site_name}"
84
84
  no_script:
85
- enable_javascript: Per la piena funzionalità di questa pagina è necessario abilitare JavaScript.
86
- here_are: Qui ci sono le
87
- instructions_enable_javascript: istruzioni su come attivare JavaScript nel tuo browser web
85
+ enable_javascript: È necessario che JavaScript sia abilitato per poter visualizzare correttamente questa pagina.
86
+ here_are: ""
87
+ instructions_enable_javascript: Istruzioni su come attivare JavaScript nel tuo browser
88
88
  activerecord:
89
89
  models:
90
90
  page: pagina
91
91
  user: utente
92
92
  image: immagine
93
- inquiry: inchiesta
93
+ inquiry: richiesta
94
94
  resource: risorsa
95
- refinery_setting: impostazione refinery
96
- inquiry_setting: impostazione domanda
95
+ refinery_setting: impostazione di Refinery
96
+ inquiry_setting: impostazione della richiesta
@@ -0,0 +1,75 @@
1
+ sk:
2
+ plugins:
3
+ refinery_core:
4
+ title: Refinery
5
+ description: Jadro systému
6
+ refinery_dialogs:
7
+ title: Dialógy
8
+ description: Refinery dialóg modul
9
+ welcome:
10
+ there_are_no_users: Nemáme žiadneho užívateľa, preto teraz jedného vytvoríme.
11
+ remember_admin_location: "Zapamätajte si adresu k Refinery administrácii:"
12
+ lets_start: Najskôr vytvoríme užívateľský účet, nech sa máme ako prihlásiť...
13
+ continue: Pokračovať...
14
+ admin:
15
+ menu:
16
+ reorder_menu: Preusporiadať menu
17
+ reorder_menu_done: Uložiť toto poradie
18
+ dialogs:
19
+ show:
20
+ save: Uložiť
21
+ cancel: Storno
22
+ refinery:
23
+ crudify:
24
+ created: '%{what} bol úspešne vytvorený.'
25
+ updated: '%{what} bol úspešne aktualizovaný.'
26
+ destroyed: '%{what} bol úspešne zmazaný.'
27
+ shared:
28
+ site_bar:
29
+ log_out: Odhlásiť
30
+ switch_to_your_website: Prepnúť na verejnú časť
31
+ switch_to_your_website_editor: Prepnúť do editačnej časti
32
+ admin:
33
+ continue_editing:
34
+ save_and_continue_editing: Uložiť a pokračovať v editácii
35
+ form_actions:
36
+ save: Uložiť
37
+ cancel: Storno
38
+ cancel_lose_changes: Ak akciu zrušíte všetky vykonané zmeny budú stratené
39
+ delete: Zmazať
40
+ close: Zavrieť
41
+ image_picker:
42
+ none_selected: Zatiaľ nie je vybraný žiadny %{what}, kliknutím jeden pridajte.
43
+ remove_current: Zmazať vybraný %{what}
44
+ change: Kliknite tu pre vybranie obrázku
45
+ show: Zobraziť
46
+ resource_picker:
47
+ download_current: Stiahnuť vybraný súbor
48
+ opens_in_new_window: Otvoriť v novom okne
49
+ remove_current: "Zmazať vybrané"
50
+ no_resource_selected: Zatiaľ nie je vybraný žiaden súbor, kliknite tu pre pridanie.
51
+ name: Pridať súbor
52
+ current: Vybraný súbor
53
+ search:
54
+ button_text: Hľadať
55
+ results_for: Výsledky hľadania pre '%{query}'
56
+ no_results: Žiadne záznamy sa nenašli
57
+ delete:
58
+ message: Naozaj chcete zmazať '%{title}'?
59
+ error_messages:
60
+ problems_in_following_fields: Vyskytol sa problém s týmito údajmi
61
+ help: Nápoveda
62
+ message:
63
+ close: Zavrieť
64
+ close_this_message: Zavrieť správu
65
+ draft_page_message:
66
+ not_live: Táto stránka NIE JE viditeľná pre bežných návštevníkov webu.
67
+ footer:
68
+ copyright: Copyright © %{year} %{site_name}
69
+ no_script:
70
+ enable_javascript: Pre plnú funkčnosť tohto webu je nutné povoliť JavaScript.
71
+ here_are: Tu sú
72
+ instructions_enable_javascript: inštrukcie ako povoliť JavaScript vo vašom prehliadači
73
+ time:
74
+ formats:
75
+ short: "%A, %d %B %Y"
data/lib/gemspec.rb CHANGED
@@ -23,10 +23,10 @@ Gem::Specification.new do |s|
23
23
  s.add_dependency 'refinerycms-settings', '~> #{::Refinery::Version}'
24
24
  s.add_dependency 'refinerycms-generators', '~> 0.9.9.3'
25
25
  s.add_dependency 'acts_as_indexed', '~> 0.7'
26
- s.add_dependency 'friendly_id_globalize3', '~> 3.2.0'
26
+ s.add_dependency 'friendly_id_globalize3', '~> 3.2.1'
27
27
  s.add_dependency 'globalize3', '>= 0.1.0.beta'
28
28
  s.add_dependency 'moretea-awesome_nested_set', '= 1.4.3.1'
29
- s.add_dependency 'rails', '~> 3.0.3'
29
+ s.add_dependency 'rails', '~> 3.0.5'
30
30
  s.add_dependency 'rdoc', '>= 2.5.11' # helps fix ubuntu
31
31
  s.add_dependency 'truncate_html', '~> 0.5'
32
32
  s.add_dependency 'will_paginate', '~> 3.0.pre'
@@ -22,7 +22,7 @@ class RefinerycmsGenerator < ::Refinery::Generators::EngineInstaller
22
22
  end
23
23
 
24
24
  # First, effectively move / rename files that get in the way of Refinery CMS
25
- %w(public/index.html config/cucumber.yml app/views/layouts/application.html.erb).each do |roadblock|
25
+ %w(public/index.html config/cucumber.yml app/views/layouts/application.html.erb public/javascripts/rails.js).each do |roadblock|
26
26
  if (roadblock_path = Rails.root.join(roadblock)).file?
27
27
  create_file "#{roadblock}.backup",
28
28
  :verbose => true do roadblock_path.read end
@@ -1,3 +1,5 @@
1
+ require 'tmpdir'
2
+
1
3
  module Refinery
2
4
  module Application
3
5
  class << self
@@ -29,7 +31,7 @@ module Refinery
29
31
  base.config.filter_parameters += [:password, :password_confirmation]
30
32
 
31
33
  # Specify a cache store to use
32
- base.config.cache_store = :memory_store
34
+ base.config.cache_store = :file_store, File.join(Dir.tmpdir, base.name.to_s.gsub(':', File::SEPARATOR))
33
35
 
34
36
  # Include the refinery controllers and helpers dynamically
35
37
  base.config.to_prepare do
@@ -51,12 +51,15 @@ module Refinery
51
51
  # Determine whether the supplied page is the currently open page according to Refinery.
52
52
  # Also checks whether Rails thinks it is selected after that using current_page?
53
53
  def selected_page?(page)
54
- # ensure we match the path without the locale.
55
54
  path = request.path
56
- if defined?(::Refinery::I18n) and ::Refinery::I18n.enabled?
57
- path = path.split("/#{::I18n.locale}").last
55
+
56
+ # Ensure we match the path without the locale, if present.
57
+ if defined?(::Refinery::I18n) and ::Refinery::I18n.enabled? and path =~ %r{^/#{::I18n.locale}}
58
+ path = path.split(%r{^/#{::I18n.locale}}).last
59
+ path = "/" if path.blank?
58
60
  end
59
61
 
62
+ # Match path based on cascading rules.
60
63
  (path =~ Regexp.new(page.menu_match) if page.menu_match.present?) or
61
64
  (path == page.link_url) or
62
65
  (path == page.nested_path) or
@@ -8,7 +8,7 @@ module Refinery
8
8
  (if session.keys.include?(:website_return_to) and session[:website_return_to].present?
9
9
  session[:website_return_to]
10
10
  else
11
- root_path
11
+ root_path(:locale => (::Refinery::I18n.default_frontend_locale if defined?(::Refinery::I18n) && ::Refinery::I18n.enabled?))
12
12
  end)) do
13
13
  link_to t('.switch_to_your_website_editor'),
14
14
  (if session.keys.include?(:refinery_return_to) and session[:refinery_return_to].present?
@@ -69,7 +69,9 @@ var wymeditor_boot_options = $.extend({
69
69
  ,{'name': 'ToggleHtml', 'title': 'HTML', 'css': 'wym_tools_html'}
70
70
  ]
71
71
 
72
- ,toolsHtml: "<ul class='wym_tools wym_section wym_buttons'>" + WYMeditor.TOOLS_ITEMS + WYMeditor.CLASSES + "</ul>"
72
+ ,toolsHtml: "<ul class='wym_tools wym_section wym_buttons'>"
73
+ + WYMeditor.TOOLS_ITEMS
74
+ + "</ul>"
73
75
 
74
76
  ,toolsItemHtml:
75
77
  "<li class='" + WYMeditor.TOOL_CLASS + "'>"
@@ -78,12 +80,14 @@ var wymeditor_boot_options = $.extend({
78
80
  + "</a>"
79
81
  + "</li>"
80
82
 
81
- , classesHtml: "<li class='wym_tools_class'>"
82
- + "<a href='#' name='" + WYMeditor.APPLY_CLASS + "' title='"+ WYMeditor.APPLY_CLASS +"' class='no-tooltip'>"
83
- + WYMeditor.APPLY_CLASS
84
- + "</a>"
85
- + "<ul class='wym_classes wym_classes_hidden'>" + WYMeditor.CLASSES_ITEMS + "</ul>"
86
- + "</li>"
83
+ , classesHtml: "<ul class='wym_classes_container wym_section wym_buttons'>"
84
+ + "<li class='wym_tools_class'>"
85
+ + "<a href='#' name='" + WYMeditor.APPLY_CLASS + "' title='"+ WYMeditor.APPLY_CLASS +"' class='no-tooltip'>"
86
+ + WYMeditor.APPLY_CLASS
87
+ + "</a>"
88
+ + "<ul class='wym_classes wym_classes_hidden'>" + WYMeditor.CLASSES_ITEMS + "</ul>"
89
+ + "</li>"
90
+ + "</ul>"
87
91
 
88
92
  , classesItemHtml: "<li><a href='#' name='"+ WYMeditor.CLASS_NAME + "'>"+ WYMeditor.CLASS_TITLE+ "</a></li>"
89
93
  , classesItemHtmlMultiple: "<li class='wym_tools_class_multiple_rules'>"
@@ -103,6 +107,7 @@ var wymeditor_boot_options = $.extend({
103
107
  + "<div class='wym_area_top clearfix'>"
104
108
  + WYMeditor.CONTAINERS
105
109
  + WYMeditor.TOOLS
110
+ + WYMeditor.CLASSES
106
111
  + "</div>"
107
112
  + "<div class='wym_area_main'>"
108
113
  + WYMeditor.HTML
@@ -839,7 +839,7 @@ WYMeditor.editor.prototype.bindEvents = function() {
839
839
  .blur(function() { $(this).toggleClass('hasfocus'); });
840
840
 
841
841
  //handle click event on classes buttons
842
- $(this._box).find(this._options.classSelector).bind('click', function() {
842
+ $(this._box).find(this._options.classSelector).bind('click', function(e) {
843
843
 
844
844
  var aClasses = eval(wym._options.classesItems);
845
845
  var sName = $(this).attr(WYMeditor.NAME);
@@ -874,7 +874,7 @@ WYMeditor.editor.prototype.bindEvents = function() {
874
874
  wym.exec(WYMeditor.APPLY_CLASS);
875
875
 
876
876
  wym._iframe.contentWindow.focus(); //See #154
877
- return(false);
877
+ e.preventDefault();
878
878
  });
879
879
 
880
880
  //handle event on update element
@@ -1098,6 +1098,8 @@ WYMeditor.editor.prototype.toggleClassSelector = function() {
1098
1098
  $(wym._box).find("a[name=" + WYMeditor.APPLY_CLASS +"]")
1099
1099
  .removeClass('selected').parent().removeClass('activated');
1100
1100
  }
1101
+
1102
+ wym.exec(WYMeditor.APPLY_CLASS);
1101
1103
  }
1102
1104
 
1103
1105
  /* @name removeClass
@@ -4300,6 +4302,9 @@ WYMeditor.WymClassExplorer.prototype.initIframe = function(iframe) {
4300
4302
  //set the text direction
4301
4303
  $('html', this._doc).attr('dir', this._options.direction);
4302
4304
 
4305
+ // Add class to say this is Internet Explorer
4306
+ $('html', this._doc).addClass('ie');
4307
+
4303
4308
  //init html value
4304
4309
  $(this._doc.body).html(this._wym._html);
4305
4310
 
@@ -40,6 +40,8 @@ WYMeditor.STRINGS['cs'] = {
40
40
  Containers: 'Typy obsahu',
41
41
  Classes: 'Třídy',
42
42
  Status: 'Stav',
43
- Source_Code: 'Zdrojový kód'
43
+ Source_Code: 'Zdrojový kód',
44
+ Apply_Style: 'Styl',
45
+ Insert: 'Vložit'
44
46
  };
45
47
 
@@ -7,14 +7,18 @@ body {
7
7
  }
8
8
  #body_content_left {
9
9
  float: left;
10
- width: 590px;
11
- padding-right: 10px;
10
+ width: 600px;
12
11
  }
13
12
  #body_content_right {
14
13
  float: right;
15
- padding-left: 10px;
16
- width: 390px;
14
+ width: 400px;
17
15
  }
16
+ #body_content_left .inner {
17
+ padding-right: 10px;
18
+ }
19
+ #body_content_right .inner {
20
+ padding-left: 10px;
21
+ }
18
22
  #body_content.no_body_content_left #body_content_right,
19
23
  #body_content.no_body_content_right #body_content_left {
20
24
  width: 100%;
@@ -312,7 +312,7 @@ body.login header h1 {
312
312
  margin: 0px;
313
313
  padding: 0px;
314
314
  position: absolute;
315
- bottom: 0px;
315
+ bottom: -1px;
316
316
  left: 0px;
317
317
  right: 0px;
318
318
  background: transparent;
@@ -311,7 +311,8 @@ background-image: url('/images/wymeditor/skins/refinery/eye.png');
311
311
  */
312
312
  /* make tools and containers play nicely next to eachother */
313
313
 
314
- .wym_skin_refinery .wym_tools, .wym_skin_refinery .wym_containers {
314
+ .wym_skin_refinery .wym_tools, .wym_skin_refinery .wym_containers,
315
+ .wym_skin_refinery .wym_classes_container {
315
316
  float: left;
316
317
  margin: 0px 0px 5px 0px;
317
318
  }
@@ -51,7 +51,7 @@
51
51
 
52
52
  /* Gecko min height fix */
53
53
  p { min-height: 1em; } /*min-height is needed under Firefox, because empty parargraphs */
54
- *+html p { min-height: auto; } /* but we have to remove it under IE7 because it triggers the 'haslayout' mode */
54
+ html.ie p { min-height: auto; } /* but we have to remove it under IE7 because it triggers the 'haslayout' mode */
55
55
  td { height: 1.6em; }
56
56
 
57
57
  /* labels */
@@ -2,10 +2,10 @@
2
2
 
3
3
  Gem::Specification.new do |s|
4
4
  s.name = %q{refinerycms-core}
5
- s.version = %q{0.9.9.4}
5
+ s.version = %q{0.9.9.5}
6
6
  s.summary = %q{Core engine for Refinery CMS}
7
7
  s.description = %q{The core of Refinery CMS. This handles the common functionality and is required by most engines}
8
- s.date = %q{2011-02-24}
8
+ s.date = %q{2011-03-08}
9
9
  s.email = %q{info@refinerycms.com}
10
10
  s.homepage = %q{http://refinerycms.com}
11
11
  s.rubyforge_project = %q{refinerycms}
@@ -14,14 +14,14 @@ Gem::Specification.new do |s|
14
14
  s.require_paths = %w(lib)
15
15
  s.executables = %w()
16
16
 
17
- s.add_dependency 'refinerycms-base', '~> 0.9.9.4'
18
- s.add_dependency 'refinerycms-settings', '~> 0.9.9.4'
17
+ s.add_dependency 'refinerycms-base', '~> 0.9.9.5'
18
+ s.add_dependency 'refinerycms-settings', '~> 0.9.9.5'
19
19
  s.add_dependency 'refinerycms-generators', '~> 0.9.9.3'
20
20
  s.add_dependency 'acts_as_indexed', '~> 0.7'
21
- s.add_dependency 'friendly_id_globalize3', '~> 3.2.0'
21
+ s.add_dependency 'friendly_id_globalize3', '~> 3.2.1'
22
22
  s.add_dependency 'globalize3', '>= 0.1.0.beta'
23
23
  s.add_dependency 'moretea-awesome_nested_set', '= 1.4.3.1'
24
- s.add_dependency 'rails', '~> 3.0.3'
24
+ s.add_dependency 'rails', '~> 3.0.5'
25
25
  s.add_dependency 'rdoc', '>= 2.5.11' # helps fix ubuntu
26
26
  s.add_dependency 'truncate_html', '~> 0.5'
27
27
  s.add_dependency 'will_paginate', '~> 3.0.pre'
@@ -96,6 +96,7 @@ Gem::Specification.new do |s|
96
96
  'config/locales/pt-BR.yml',
97
97
  'config/locales/rs.yml',
98
98
  'config/locales/ru.yml',
99
+ 'config/locales/sk.yml',
99
100
  'config/locales/sl.yml',
100
101
  'config/locales/sv.yml',
101
102
  'config/locales/vi.yml',
metadata CHANGED
@@ -2,7 +2,7 @@
2
2
  name: refinerycms-core
3
3
  version: !ruby/object:Gem::Version
4
4
  prerelease:
5
- version: 0.9.9.4
5
+ version: 0.9.9.5
6
6
  platform: ruby
7
7
  authors:
8
8
  - Resolve Digital
@@ -13,7 +13,7 @@ autorequire:
13
13
  bindir: bin
14
14
  cert_chain: []
15
15
 
16
- date: 2011-02-24 00:00:00 +13:00
16
+ date: 2011-03-08 00:00:00 +13:00
17
17
  default_executable:
18
18
  dependencies:
19
19
  - !ruby/object:Gem::Dependency
@@ -24,7 +24,7 @@ dependencies:
24
24
  requirements:
25
25
  - - ~>
26
26
  - !ruby/object:Gem::Version
27
- version: 0.9.9.4
27
+ version: 0.9.9.5
28
28
  type: :runtime
29
29
  version_requirements: *id001
30
30
  - !ruby/object:Gem::Dependency
@@ -35,7 +35,7 @@ dependencies:
35
35
  requirements:
36
36
  - - ~>
37
37
  - !ruby/object:Gem::Version
38
- version: 0.9.9.4
38
+ version: 0.9.9.5
39
39
  type: :runtime
40
40
  version_requirements: *id002
41
41
  - !ruby/object:Gem::Dependency
@@ -68,7 +68,7 @@ dependencies:
68
68
  requirements:
69
69
  - - ~>
70
70
  - !ruby/object:Gem::Version
71
- version: 3.2.0
71
+ version: 3.2.1
72
72
  type: :runtime
73
73
  version_requirements: *id005
74
74
  - !ruby/object:Gem::Dependency
@@ -101,7 +101,7 @@ dependencies:
101
101
  requirements:
102
102
  - - ~>
103
103
  - !ruby/object:Gem::Version
104
- version: 3.0.3
104
+ version: 3.0.5
105
105
  type: :runtime
106
106
  version_requirements: *id008
107
107
  - !ruby/object:Gem::Dependency
@@ -202,6 +202,7 @@ files:
202
202
  - config/locales/pt-BR.yml
203
203
  - config/locales/rs.yml
204
204
  - config/locales/ru.yml
205
+ - config/locales/sk.yml
205
206
  - config/locales/sl.yml
206
207
  - config/locales/sv.yml
207
208
  - config/locales/vi.yml
@@ -472,7 +473,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
472
473
  requirements: []
473
474
 
474
475
  rubyforge_project: refinerycms
475
- rubygems_version: 1.5.2
476
+ rubygems_version: 1.6.0
476
477
  signing_key:
477
478
  specification_version: 3
478
479
  summary: Core engine for Refinery CMS