drg_cms 0.4.57 → 0.4.58

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 3d10b53c63a0f5d18e7c4ee0abf0d7d78c5245d9
4
- data.tar.gz: b6f551fc08937f420940e728f011436b506e4cce
3
+ metadata.gz: 5cc3356e32683c0e69159f4fafba4c1dc66da07a
4
+ data.tar.gz: 83ea7cd35a8299b96dce61012ddcc0ae51bee30a
5
5
  SHA512:
6
- metadata.gz: 8496a3fa343e395014a47881da429780d9d9c4a407719229685404594af2fdedabc86a59640897324387b58c42d697f97f71aad1c992fa3bd1c7871abfd99b11
7
- data.tar.gz: d47a2697eff35587bd695d958233eca2b7df5592a9677b88042ed8411ff161209b8182bd0b1304f0edb8e7bafd309cccae3cf367178ed2e9525556e50d6a39ab
6
+ metadata.gz: f3c88278551f008520d1c2f9429daec4f21d21ad5fba72460d372c63ae5d0250af1b8cd4c73ed89568a6a2d04970581769f728bf56a921483353c0b68145a54e
7
+ data.tar.gz: bb768228a9387447a7fa0ee6342105ab2664c5a1c6d405e051e1f48ba9cf9ec22fd8bed180d37d74e141df8b95cf115478eb1e0f961f417b132c87080a631b66
@@ -209,8 +209,9 @@ width: 24px;
209
209
 
210
210
  .dc-link-submit {
211
211
  text-align: left;
212
- /* border:1px solid #eee; */
213
- padding: 0px;
212
+ padding: 6px 6px;
213
+ /* border:1px solid #eee;
214
+ padding: 0px;*/
214
215
  margin: 0px;
215
216
 
216
217
  border-radius: 5px;
@@ -149,7 +149,8 @@ def _get_field_div(name) #:nodoc:
149
149
  end
150
150
  end
151
151
  klas_string = field['type'].camelize
152
- klas = DrgcmsFormField::const_get(klas_string)
152
+ klas = DrgcmsFormField::const_get(klas_string) || nil
153
+ return 'error' if klas.nil?
153
154
  o = klas.new(self, @record, field).render
154
155
  "<span id=\"filter_#{field['name']}\" class=\"div-hidden\">" << o.html << (o.js.size > 2 ? javascript_tag(o.js) : '') << '</span>'
155
156
  end
@@ -300,7 +300,8 @@ end
300
300
  # String. HTML code which includes add image and javascript to invoke new document create action.
301
301
  ####################################################################
302
302
  def dc_link_for_create(opts)
303
- title = opts.delete(:title) #
303
+ title = opts.delete(:title) #
304
+ title = t(title, title) if title
304
305
  target = opts.delete(:target) || 'iframe_cms'
305
306
  opts[:action] = 'new'
306
307
  url = @parent ? @parent.url_for(opts) : url_for(opts)
@@ -328,6 +329,7 @@ end
328
329
  ####################################################################
329
330
  def dc_link_for_edit(opts)
330
331
  title = opts.delete(:title) #
332
+ title = t(title, title) if title
331
333
  target = opts.delete(:target) || 'iframe_cms'
332
334
  opts[:action] = 'edit'
333
335
  opts[:controller] ||= 'cmsedit'
@@ -384,12 +386,12 @@ end
384
386
  def dc_page_edit_menu(opts=@opts)
385
387
  return '' if opts[:edit_mode] < 2
386
388
  # save some data to cookie. This can not go to session.
387
- t = @parent.site.page_table
388
- kukis = { "#{t}.dc_design_id" => @page.dc_design_id,
389
- "#{t}.menu_id" => @page.menu_id,
390
- "#{t}.kats" => @page.kats,
391
- "#{t}.page_id" => @page.id,
392
- "#{t}.dc_site_id" => @parent.site.id
389
+ table = @parent.site.page_table
390
+ kukis = { "#{table}.dc_design_id" => @page.dc_design_id,
391
+ "#{table}.menu_id" => @page.menu_id,
392
+ "#{table}.kats" => @page.kats,
393
+ "#{table}.page_id" => @page.id,
394
+ "#{table}.dc_site_id" => @parent.site.id
393
395
  }
394
396
  @parent.cookies[:record] = Marshal.dump(kukis)
395
397
  title = "#{t('drgcms.edit')}: #{@page.subject}"
@@ -256,7 +256,7 @@ def render
256
256
  tables = @parent.tables.inject('') { |r,v| r << "#{v[1]};" } + @yaml['table']
257
257
  ids = @parent.ids.inject('') { |r,v| r << "#{v};" } + @record._id
258
258
  opts = { controller: 'cmsedit', action: 'index', ids: ids, table: tables, formname: @yaml['formname'],
259
- iframe: "if_#{@yaml['name']}", readonly: @readonly }
259
+ field_name: @yaml['name'], iframe: "if_#{@yaml['name']}", readonly: @readonly }
260
260
  @html << "<iframe class='iframe_embedded' id='if_#{@yaml['name']}' name='if_#{@yaml['name']}' #{html}></iframe>"
261
261
  @js = <<EOJS
262
262
  $(document).ready( function() {
@@ -1,4 +1,4 @@
1
1
  module DrgCms #:nodoc:
2
2
  # drg_cms gem version
3
- VERSION = "0.4.57"
3
+ VERSION = "0.4.58"
4
4
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: drg_cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.57
4
+ version: 0.4.58
5
5
  platform: ruby
6
6
  authors:
7
7
  - Damjan Rems