drg_cms 0.5.50.2 → 0.5.51.1

data/config/locales/models_sl.yml

@@ -62,6 +62,7 @@ sl:
         rails_view: Rails view
         design: Standard dizajn
         dc_parts: Sestavni elementi
+        inherit_policy: Uporabi od strani
 
       dc_design:
         tabletitle: Dizajni
@@ -504,6 +505,11 @@ sl:
         public: Je javen
         sort: Privzeto razvrsti
 
+      dc_memory:
+        fields: Splošno
+        ztab: Napredno
+        dc_element: Ime elementa
+
 # help pomoč na obrazcih ####################################################
 
     help:
@@ -534,6 +540,7 @@ sl:
         design: Standard dizajn lahko definirate tudi pri spletišču
         dc_parts: Sestavni elementi strani
         request_processor: Ime ruby metode, ki bo klicana namesto dc_process_default_request 
+        inherit_policy: Uporabi politiko od druge strani
 
       dc_design:
         name: Unikatno ime za dizajn. Pomembno za iskanje

data/lib/drg_cms.rb

@@ -133,6 +133,7 @@ def self.routes
     end
     match 'elfinder' => 'dc_elfinder#connector', via: [:get, :post]
     resources :cmsedit
+    resources :cms, controller: :cmsedit
   end
 end
 

data/lib/drg_cms/version.rb

@@ -1,4 +1,4 @@
 module DrgCms #:nodoc:
   # drg_cms gem version
-  VERSION = "0.5.50.2"
+  VERSION = "0.5.51.1"
 end

data/lib/tasks/log_statistics.rb

@@ -14,7 +14,13 @@ end
 # Init some internal vars
 ###################################################################
 def init
-  @by_day = [] 
+  @by_day = {}
+  if File.exist?('result.txt')
+    File.readlines('result.txt').each do |line|
+      a = line.chomp.split("\t")
+      @by_day[a.first] = a
+    end
+  end  
 end
 
 ###################################################################
@@ -22,18 +28,20 @@ end
 # average response time.
 ###################################################################
 def response_by_days
-  i = 0
   selected_files.each do |file_name|
-    result = [file_name[0,6], 0, 0]
+    key = file_name[0,6]
+    next if @by_day[key]
+    result = [key, 0, 0, 0]
     File.readlines(file_name).each do |line|
       next unless line.match 'Completed 200 OK in'
       time = $'.split('ms').first.strip.to_i
       result[1] += 1
       result[2] += time
     end
+# average    
+    result[3] += result[2]/result[1]
     p result
-    @by_day << result
-#     break if (i+=1) > 4
+    @by_day[key] = result
   end
 end
 
@@ -41,7 +49,6 @@ end
 # Prints links which resultet in 404 error.
 ###################################################################
 def analyze_404
-  i = 0
   selected_files.each do |file_name|
     result = [file_name[0,6], 0, 0]
     url = ''
@@ -61,6 +68,5 @@ end
 
 init
 response_by_days
-p @by_day
-c = @by_day.inject('') {|result, e| result << e.join("\t") + "\n"} 
+c = @by_day.inject('') {|result, e| result << e.last.join("\t") + "\n"} 
 File.open('result.txt','w') {|f| f.write(c) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drg_cms
 version: !ruby/object:Gem::Version
-  version: 0.5.50.2
+  version: 0.5.51.1
 platform: ruby
 authors:
 - Damjan Rems
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-26 00:00:00.000000000 Z
+date: 2017-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -162,6 +162,9 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- app/assets/images/32px.png
+- app/assets/images/drg_cms/32px.png
+- app/assets/images/drg_cms/40px.png
 - app/assets/images/drg_cms/add.png
 - app/assets/images/drg_cms/arrow_in.png
 - app/assets/images/drg_cms/arrow_out.png
@@ -180,12 +183,15 @@ files:
 - app/assets/images/drg_cms/reload.png
 - app/assets/images/drg_cms/search_16.png
 - app/assets/images/drg_cms/spinner.gif
+- app/assets/images/drg_cms/throbber.gif
 - app/assets/images/drg_cms/view_tile.png
 - app/assets/images/drg_cms/x.png
+- app/assets/images/throbber.gif
 - app/assets/javascripts/drg_cms/drg_cms.js
 - app/assets/javascripts/drg_cms/jquery-migrate.js
 - app/assets/javascripts/drg_cms/jquery.bpopup.min.js
 - app/assets/javascripts/drg_cms/jquery.datetimepicker.js
+- app/assets/javascripts/drg_cms/jstree.min.js
 - app/assets/javascripts/drg_cms/select-multiple.js
 - app/assets/javascripts/drg_cms/some_scripts.js
 - app/assets/javascripts/drg_cms_application.js
@@ -193,6 +199,7 @@ files:
 - app/assets/stylesheets/drg_cms/__jquery-ui.css
 - app/assets/stylesheets/drg_cms/drg_cms.css
 - app/assets/stylesheets/drg_cms/jquery.datetimepicker.css
+- app/assets/stylesheets/drg_cms/jstree.css
 - app/assets/stylesheets/drg_cms/select-multiple.css
 - app/assets/stylesheets/drg_cms/th-bg.png
 - app/assets/stylesheets/drg_cms/theme.css
@@ -204,6 +211,7 @@ files:
 - app/controllers/dc_common_controller.rb
 - app/controllers/dc_main_controller.rb
 - app/controllers/dc_page_control.rb
+- app/controllers/design_element_settings_control.rb
 - app/forms/all_options.yml
 - app/forms/cms_forms.yml
 - app/forms/cms_menu.yml
@@ -253,6 +261,11 @@ files:
 - app/helpers/dc_poll_renderer.rb
 - app/helpers/dc_renderer.rb
 - app/helpers/dc_simple_menu_renderer.rb
+- app/models/concerns/dc_page_concern.rb
+- app/models/concerns/dc_piece_concern.rb
+- app/models/concerns/dc_policy_rule_concern.rb
+- app/models/concerns/dc_site_concern.rb
+- app/models/concerns/dc_user_concern.rb
 - app/models/dc_ad.rb
 - app/models/dc_ad_stat.rb
 - app/models/dc_big_menu.rb
@@ -269,6 +282,7 @@ files:
 - app/models/dc_journal.rb
 - app/models/dc_key_value_store.rb
 - app/models/dc_link.rb
+- app/models/dc_memory.rb
 - app/models/dc_menu.rb
 - app/models/dc_menu_item.rb
 - app/models/dc_page.rb