noodall-ui 0.5.5 → 0.5.6

data/app/assets/javascripts/admin/assets.js

@@ -7,7 +7,6 @@ function setUpAssets() {
       'script' );
     return false;
   });
-  ajaxifyForms('form.edit_asset');
 }
 setUpAssets();
 

data/app/controllers/noodall/admin/assets_controller.rb

@@ -66,8 +66,8 @@ module Noodall
       end
 
       def pending
-        @asset = Asset.first(:tags => nil, :offset => params[:offset], :order => "created_at DESC")
-        unless @asset.blank?
+        @asset = Asset.first(:tags => { '$size' => 0 }, :order => "created_at DESC")
+        if !@asset.blank?
           respond_to do |format|
             format.html { render :form }
             format.js { render :form }
@@ -230,7 +230,7 @@ module Noodall
       helper_method :admin_assets_type_url
 
       def pending_count
-        @pending_count ||= Asset.count(:tags => nil)
+        @pending_count ||= Asset.count(:tags => { '$size' => 0 })
       end
       helper_method :pending_count
 

data/app/views/noodall/admin/assets/_browser.html.erb

@@ -5,10 +5,8 @@
     <li class="file" title="<%= h( asset.title ) %>">
       <div class="file-detail" id="asset-<%= asset.id %>">
         <span class="file-title"><%= h( asset.title ) %></span>
-
         <%= (asset.image? or asset.video?) ? image_tag( asset.url('70x70#', asset.web_image_extension)  ) : asset_icon(asset) %>
       </div>
-
       <%= link_to 'Show', noodall_admin_asset_path(asset, :readonly => readonly), :class => 'show button', :title => 'View this asset' %>
       <%= link_to 'Add me', asset.url, :class => 'add button', :title => 'Add this asset' %>
     </li>

data/app/views/noodall/admin/assets/_form.html.erb

@@ -27,7 +27,7 @@
     <span class="input-wrap"><%= f.file_field :file %></span>
   </p>
   <p>
-    <span class="tooltip" title="Enter some tags for this asset">&nbsp;</span>
+    <span class="tooltip" title="Enter some tags (comma separated) for this asset">&nbsp;</span>
     <%= f.label :tag_list, "Tags" %><br/>
     <span class="input-wrap"><%= f.text_field :tag_list %></span>
   </p>

data/app/views/noodall/admin/assets/form.html.erb

@@ -1,4 +1,3 @@
-<% content_for :header, javascript_tag('setUpAssets()') unless @asset.new_record? %>
 
 <h1><%= @asset.new_record? ? 'New' : 'Editing' %> Asset</h1>
 

data/features/step_definitions/cms_node_steps.rb

@@ -92,15 +92,12 @@ Then /^I should see the child listed within the other parent's children$/ do
 end
 
 Then /^I should be able change the order of the root's children$/ do
-  table = table(tableish("table tr", 'td, th'))
-  title = table.hashes[2]['Title'] # 2 as zero index
+  title = find("table tbody tr:nth(3) td:first-child").text.strip
   within(:css, 'table tbody tr:nth(3)') { click_link "up" }
-  table = table(tableish("table tr", 'td, th'))
-  table.hashes[1]['Title'].should == title
+  find("table tbody tr:nth(2) td:first-child").text.strip.should == title
   within(:css, 'table tbody tr:nth(2)' ) { click_link "down" }
   within(:css, 'table tbody tr:nth(3)' ) { click_link "down" }
-  table = table(tableish("table tr", 'td, th'))
-  table.hashes[3]['Title'].should == title
+  find("table tbody tr:nth(4) td:first-child").text.strip.should == title
 end
 
 When /^I create a new child under an ancestor in "([^"]+)" template$/ do |template_title|

data/features/step_definitions/component_steps.rb

@@ -19,7 +19,7 @@ end
 When /^(?:|I )fill in the following within the component:$/ do |fields|
   within "#fancybox-content" do
     fields.rows_hash.each do |name, value|
-      When %{I fill in "#{name}" with "#{value}"}
+      step %{I fill in "#{name}" with "#{value}"}
     end
   end
 end

data/features/step_definitions/draft_steps.rb

@@ -12,7 +12,7 @@ end
 Then /^the form should contain version (\d+)$/ do |version|
   @_content = Noodall::Node.find(@_content.id) # Reload the model to remove memoized versions (reload does not do this)
   version = @_content.version_at(version.to_i)
-  Then %{the "Title" field should contain "#{version.content(:title)}"}
+  step %{the "Title" field should contain "#{version.content(:title)}"}
 end
 
 Then /^I should see a list of previous versions$/ do

data/features/step_definitions/groups_access_steps.rb

@@ -17,7 +17,7 @@ end
 
 Then(/^only users in the "([^\"]*)" and "([^\"]*)" should be able to ([^\"]*) content$/) do |group1, group2, actions|
   [group1, group2].each do |group|
-    Given %{I am signed in as a #{group}}
+    step %{I am signed in as a #{group}}
     actions.split(', ').each do |action|
       case action
       when "Update"
@@ -45,12 +45,12 @@ Then(/^only users in the "([^\"]*)" and "([^\"]*)" should be able to ([^\"]*) co
         visit node_path(@_content)
       end
     end
-    Then %{I sign out} #Neeed to do this or remeber cookie gets in the way
+    step %{I sign out} #Neeed to do this or remeber cookie gets in the way
   end
 end
 
 Then(/^users not in the "([^\"]*)" and "([^\"]*)" should not be able to ([^\"]*) content$/) do |group1, group2, action|
-  Given %{I am signed in as a nogood}
+  step %{I am signed in as a nogood}
   case action
   when "Update"
     visit noodall_admin_node_path(@_content)
@@ -77,7 +77,7 @@ Given /^content exists with permissions set$/ do
 end
 
 When /^a child of that content is created$/ do
-  Given %{I am signed in as a website administrator}
+  step %{I am signed in as a website administrator}
   visit noodall_admin_node_nodes_path(@_content)
   within(".choices") { click_link "New" }
   fill_in "Title", :with => "Permeable Content"
@@ -104,7 +104,7 @@ Then(/^by default the child should have the same permissions as it's parent$/) d
 end
 
 Then /^I should be able to carry out all actions regardless of group permissions$/ do
-  Given %{content exists with permissions set}
+  step %{content exists with permissions set}
   visit noodall_admin_node_path(@_content)
   click_button "Draft"
   visit noodall_admin_node_nodes_path(@_content)
@@ -126,7 +126,7 @@ end
 
 Then /^a user not in the group editor will no be able to edit any content$/ do
   Factory(:home, :title => 'Home', :publish => true)
-  Given %{I am signed in as a nogood}
+  step %{I am signed in as a nogood}
   visit noodall_admin_nodes_path
   page.should have_content("You do not have permission to do that")
 end

data/features/step_definitions/sorting_steps.rb

@@ -17,17 +17,17 @@ Given /^some nodes exist$/ do
 end
 
 Then /^the nodes should be ordered by "Name"$/ do
-  Then %{I should see in this order: A Header, B Header, C Header}
+  step %{I should see in this order: A Header, B Header, C Header}
 end
 
 
 Then /^the nodes should be ordered by "Type"$/ do
-  Then %{I should see in this order: Page A, Noodall/Node, Noodall/Node}
+  step %{I should see in this order: Page A, Noodall/Node, Noodall/Node}
 end
 
 
 Then /^the nodes should be ordered by "Updated"$/ do
-  Then %{I should see in this order: 15:37:00, 14:37:00, 13:37:00 }
+  step %{I should see in this order: 15:37:00, 14:37:00, 13:37:00 }
 end
 
 Then /^(?:|I )should see in this order(?: within "([^\"]*)")?: (.*)$/ do |selector, text|

data/features/support/env.rb

@@ -14,7 +14,6 @@ Spork.prefork do
   require 'cucumber/formatter/unicode' # Remove this line if you don't want Cucumber Unicode support
   require 'cucumber/rails/rspec'
   require 'cucumber/rails/world'
-  require 'cucumber/web/tableish'
   require 'cucumber/rspec/doubles'
 
   require 'ruby-debug' unless ENV["CI"]

data/lib/noodall/ui/version.rb

@@ -1,5 +1,5 @@
 module Noodall
   module UI
-    VERSION = "0.5.5"
+    VERSION = "0.5.6"
   end
 end

data/spec/dummy/config/environments/development.rb

@@ -4,7 +4,7 @@ Dummy::Application.configure do
   # In the development environment your application's code is reloaded on
   # every request.  This slows down response time but is perfect for development
   # since you don't have to restart the web server when you make code changes.
-  config.cache_classes = true
+  config.cache_classes = false
 
   # Log error messages when you accidentally call methods on nil.
   config.whiny_nils = true

data/vendor/assets/javascripts/plupload/i18n/de.js

@@ -1,25 +1,24 @@
 // German
 plupload.addI18n({
-	'Select files' : 'Wählen Sie die Dateien:',
-	'Add files to the upload queue and click the start button.' : 'Dateien hinzufügen und danach auf \'Starten des Uploads\' klicken und die Datei hochzuladen.',
-	'Filename' : 'Dateiname',
-	'Status' : 'Status',
-	'Size' : 'Größe',
-	'Add files' : 'Hinzufügen von Dateien',
-	'Stop current upload' : 'Stop aktuellen Upload',
-	'Start uploading queue' : 'Starte Upload',
-	'Uploaded %d/%d files': '%d/%d Dateien sind Hochgeladen',
-	'N/A' : 'Nicht verfügbar',
-	'Drag files here.' : 'Ziehen Sie die Dateien hier hin',
-	'File extension error.': 'Dateiendungs Fehler.',
-	'File size error.': 'Dateigrößen Fehler.',
-	'Init error.': 'Initialisierungs Fehler.',
-	'HTTP Error.': 'HTTP Fehler.',
-	'Security error.': 'Sicherheits Fehler.',
-	'Generic error.': 'Generic Fehler.',
-	'IO error.': 'Ein/Ausgabe Fehler.',
-	'Stop Upload': 'Stoppen des Uploads.',
-	'Add Files': 'Dateien hinzufügen',
-	'Start Upload': 'Starten des Uploads.',
-	'%d files queued': '%d Dateien in der Warteschlange.'
+    'Select files' : 'Dateien hochladen',
+    'Add files to the upload queue and click the start button.' : 'Dateien hinzufügen und auf \'Hochladen\' klicken.',
+    'Filename' : 'Dateiname',
+    'Status' : 'Status',
+    'Size' : 'Größe',
+    'Add files' : 'Dateien', // hinzufügen',
+    'Stop current upload' : 'Aktuelles Hochladen stoppen',
+    'Start uploading queue' : 'Hochladen starten',
+    'Uploaded %d/%d files': '%d/%d Dateien sind hochgeladen',
+    'N/A' : 'Nicht verfügbar',
+    'Drag files here.' : 'Ziehen Sie die Dateien hier hin',
+    'File extension error.': 'Fehler bei Dateiendung',
+    'File size error.': 'Fehler bei Dateigröße',
+    'Init error.': 'Initialisierungsfehler',
+    'HTTP Error.': 'HTTP-Fehler',
+    'Security error.': 'Sicherheitsfehler',
+    'Generic error.': 'Typischer Fehler',
+    'IO error.': 'Ein/Ausgabe-Fehler',
+    'Stop Upload': 'Hochladen stoppen',
+    'Start upload': 'Hochladen',
+    '%d files queued': '%d Dateien in der Warteschlange'
 });

data/vendor/assets/javascripts/plupload/i18n/fr.js

@@ -1,4 +1,4 @@
-// .po file like language pack
+// French
 plupload.addI18n({
     'Select files' : 'Sélectionnez les fichiers',
     'Add files to the upload queue and click the start button.' : 'Ajoutez des fichiers à la file et appuyez sur le bouton démarrer.',

data/vendor/assets/javascripts/plupload/i18n/hr.js

@@ -0,0 +1,25 @@
+// Croatian
+plupload.addI18n({
+    'Select files': 'Izaberite datoteke:',
+    'Add files to the upload queue and click the start button.': 'Dodajte datoteke u listu i kliknite Upload.',
+    'Filename': 'Ime datoteke',
+    'Status': 'Status',
+    'Size': 'Veličina',
+    'Add files': 'Dodajte datoteke',
+    'Stop current upload': 'Zaustavi trenutan upload',
+    'Start uploading queue': 'Pokreni Upload',
+    'Uploaded %d/%d files': 'Uploadano %d/%d datoteka',
+    'N/A': 'N/A',
+    'Drag files here.': 'Dovucite datoteke ovdje',
+    'File extension error.': 'Greška ekstenzije datoteke.',
+    'File size error.': 'Greška veličine datoteke.',
+    'Init error.': 'Greška inicijalizacije.',
+    'HTTP Error.': 'HTTP greška.',
+    'Security error.': 'Sigurnosna greška.',
+    'Generic error.': 'Generička greška.',
+    'IO error.': 'I/O greška.',
+    'Stop Upload': 'Zaustavi upload.',
+    'Add Files': 'Dodaj datoteke',
+    'Start Upload': 'Pokreni upload.',
+    '%d files queued': '%d datoteka na čekanju.'
+});

data/vendor/assets/javascripts/plupload/i18n/hu.js

@@ -0,0 +1,33 @@
+// Hungarian
+plupload.addI18n({
+    'Select files' : 'Fájlok kiválasztása',
+    'Add files to the upload queue and click the start button.' : 'Válaszd ki a fájlokat, majd kattints az Indítás gombra.',
+    'Filename' : 'Fájlnév',
+    'Status' : 'Állapot',
+    'Size' : 'Méret',
+    'Add files' : 'Hozzáadás',
+    'Stop current upload' : 'Jelenlegi feltöltés megszakítása',
+    'Start uploading queue' : 'Várakozási sor feltöltésének indítása',
+    'Uploaded %d/%d files': 'Feltöltött fájlok: %d/%d',
+    'N/A': 'Nem elérhető',
+    'Drag files here.' : 'Húzd ide a fájlokat.',
+    'Stop upload': 'Feltöltés megszakítása',
+    'Start upload': 'Indítás',
+    '%d files queued': '%d fájl sorbaállítva',
+    'File: %s': 'Fájl: %s',
+    'Close': 'Bezárás',
+    'Using runtime: ': 'Használt runtime: ',
+    'File: %f, size: %s, max file size: %m': 'Fájl: %f, méret: %s, maximális fájlméret: %m',
+    'Upload element accepts only %d file(s) at a time. Extra files were stripped.': 'A feltöltés egyszerre csak %d fájlt fogad el, a többi fájl nem lesz feltöltve.',
+    'Upload URL might be wrong or doesn\'t exist': 'A megadott URL hibás vagy nem létezik',
+    'Error: File too large: ': 'Hiba: A fájl túl nagy: ',
+    'Error: Invalid file extension: ': 'Hiba: Érvénytelen fájlkiterjesztés: ',
+    'File extension error.': 'Hibás fájlkiterjesztés.',
+    'File size error.': 'Hibás fájlméret.',
+    'File count error.': 'A fájlok számával kapcsolatos hiba.',
+    'Init error.': 'Init hiba.',
+    'HTTP Error.': 'HTTP hiba.',
+    'Security error.': 'Biztonsági hiba.',
+    'Generic error.': 'Általános hiba.',
+    'IO error.': 'I/O hiba.'
+});

data/vendor/assets/javascripts/plupload/i18n/it.js

@@ -1,21 +1,24 @@
-// .po file like language pack
-plupload.addI18n({
-	'Select files' : 'Seleziona i files',
-	'Add files to the upload queue and click the start button.' : 'Aggiungi i file alla coda di caricamento e clicca il pulsante di avvio.',
-	'Filename' : 'Nome file',
-	'Status' : 'Stato',
-	'Size' : 'Dimensione',
-	'Add files' : 'Aggiungi file',
-	'Stop current upload' : 'Interrompi il caricamento',
-	'Start uploading queue' : 'Avvia il caricamento',
-	'Uploaded %d/%d files': 'Caricati %d/%d file',
-	'N/A' : 'N/D',
-	'Drag files here.' : 'Trascina i file qui.',
-	'File extension error.': 'Errore estensione file.',
-	'File size error.': 'Errore dimensione file.',
-	'Init error.': 'Errore inizializzazione.',
-	'HTTP Error.': 'Errore HTTP.',
-	'Security error.': 'Errore sicurezza.',
-	'Generic error.': 'Errore generico.',
-	'IO error.': 'Errore IO.'
+// Italian
+plupload.addI18n({
+    'Select files' : 'Seleziona i files',
+    'Add files to the upload queue and click the start button.' : 'Aggiungi i file alla coda di caricamento e clicca il pulsante di avvio.',
+    'Filename' : 'Nome file',
+    'Status' : 'Stato',
+    'Size' : 'Dimensione',
+    'Add Files' : 'Aggiungi file',
+    'Stop current upload' : 'Interrompi il caricamento',
+    'Start uploading queue' : 'Avvia il caricamento',
+    'Uploaded %d/%d files': 'Caricati %d/%d file',
+    'N/A' : 'N/D',
+    'Drag files here.' : 'Trascina i file qui.',
+    'File extension error.': 'Errore estensione file.',
+    'File size error.': 'Errore dimensione file.',
+    'Init error.': 'Errore inizializzazione.',
+    'HTTP Error.': 'Errore HTTP.',
+    'Security error.': 'Errore sicurezza.',
+    'Generic error.': 'Errore generico.',
+    'IO error.': 'Errore IO.',
+	'Stop Upload': 'Ferma Upload',
+	'Start Upload': 'Inizia Upload',
+	'%d files queued': '%d file in lista'
 });

data/vendor/assets/javascripts/plupload/i18n/ro.js

@@ -0,0 +1,24 @@
+// Romanian
+plupload.addI18n({
+    'Select files' : 'Selectare fişiere',
+    'Add files to the upload queue and click the start button.' : 'Adaugă fişiere în lista apoi apasă butonul \'Începe încărcare\'.',
+    'Filename' : 'Nume fişier',
+    'Status' : 'Stare',
+    'Size' : 'Mărime',
+    'Add files' : 'Adăugare fişiere',
+    'Stop current upload' : 'Întrerupe încărcarea curentă',
+    'Start uploading queue' : 'Începe incărcarea',
+    'Uploaded %d/%d files': 'Fişiere încărcate %d/%d',
+    'N/A' : 'N/A',
+    'Drag files here.' : 'Trage aici fişierele',
+    'File extension error.': 'Extensie fişier eronată',
+    'File size error.': 'Eroare dimensiune fişier',
+    'Init error.': 'Eroare iniţializare',
+    'HTTP Error.': 'Eroare HTTP',
+    'Security error.': 'Eroare securitate',
+    'Generic error.': 'Eroare generică',
+    'IO error.': 'Eroare Intrare/Ieşire',
+    'Stop Upload': 'Oprire încărcare',
+    'Start upload': 'Începe încărcare',
+    '%d files queued': '%d fişiere listate'
+});

data/vendor/assets/javascripts/plupload/i18n/sr.js

@@ -0,0 +1,14 @@
+// Serbian
+plupload.addI18n({
+    'Select files' : 'Izaberite fajlove',
+    'Add files to the upload queue and click the start button.' : 'Dodajte fajlove u listu i kliknite na dugme Start.',
+    'Filename' : 'Naziv fajla',
+    'Status' : 'Status',
+    'Size' : 'Veličina',
+    'Add Files' : 'Dodaj fajlove',
+    'Stop current upload' : 'Zaustavi upload',
+    'Start uploading queue' : 'Počni upload',
+    'Drag files here.' : 'Prevucite fajlove ovde.',
+    'Start Upload': 'Počni upload',
+    'Uploaded %d/%d files': 'Snimljeno %d/%d fajlova'
+});

data/vendor/assets/javascripts/plupload/jquery.plupload.queue/css/jquery.plupload.queue.css

@@ -1,4 +1,4 @@
-/*
+/* 
    Plupload
 ------------------------------------------------------------------- */
 
@@ -11,7 +11,7 @@
     border: 1px solid #bababa;
     padding: 2px 8px 3px 20px;
 	margin-right: 4px;
-    background: #f3f3f3 url('/assets/plupload/jquery.plupload.queue/img/buttons.png') no-repeat 0 center;
+    background: #f3f3f3 url('../img/buttons.png') no-repeat 0 center;
 	outline: 0;
 
     /* Optional rounded corners for browsers that support it */
@@ -29,7 +29,7 @@
 .plupload_disabled, a.plupload_disabled:hover {
     color: #737373;
     border-color: #c5c5c5;
-    background: #ededed url('/assets/plupload/jquery.plupload.queue/img/buttons-disabled.png') no-repeat 0 center;
+    background: #ededed url('../img/buttons-disabled.png') no-repeat 0 center;
 	cursor: default;
 }
 
@@ -44,7 +44,7 @@
 
 .plupload_container {
 	padding: 8px;
-	background: url('/assets/plupload/jquery.plupload.queue/img/transp50.png');
+	background: url('../img/transp50.png');
 	/*-moz-border-radius: 5px;*/
 }
 
@@ -54,19 +54,9 @@
 	width: 98%;
 }
 
-.plupload_header {background: #2A2C2E url('/assets/plupload/jquery.plupload.queue/img/transp50.png');
-	/*-moz-border-radius: 5px;*/
-}
-
-.plupload_container input {
-	border: 1px solid #DDD;
-	font: normal 11px Verdana,sans-serif;
-	width: 98%;
-}
-
-.plupload_header {background: #2A2C2E url('/assets/plupload/jquery.plupload.queue/img/backgrounds.gif') repeat-x;}
+.plupload_header {background: #2A2C2E url('../img/backgrounds.gif') repeat-x;}
 .plupload_header_content {
-	background: url('/assets/plupload/jquery.plupload.queue/img/backgrounds.gif') no-repeat 0 -317px;
+	background: url('../img/backgrounds.gif') no-repeat 0 -317px;
 	min-height: 56px;
 	padding-left: 60px;
 	color: #FFF;
@@ -93,7 +83,7 @@
 
 .plupload_filelist li {
 	padding: 10px 8px;
-	background: #F5F5F5 url('/assets/plupload/jquery.plupload.queue/img/backgrounds.gif') repeat-x 0 -156px;
+	background: #F5F5F5 url('../img/backgrounds.gif') repeat-x 0 -156px;
 	border-bottom: 1px solid #DDD;
 }
 
@@ -102,7 +92,7 @@
 	padding: 8px 8px;
 	color: #42454A;
 }
-.plupload_filelist_header {
+.plupload_filelist_header {	
 	border-top: 1px solid #EEE;
 	border-bottom: 1px solid #CDCDCD;
 }
@@ -132,20 +122,20 @@
 	height: 16px;
 }
 
-li.plupload_uploading {background: #ECF3DC url('/assets/plupload/jquery.plupload.queue/img/backgrounds.gif') repeat-x 0 -238px;}
+li.plupload_uploading {background: #ECF3DC url('../img/backgrounds.gif') repeat-x 0 -238px;}
 li.plupload_done {color:#AAA}
 
 li.plupload_delete a {
-	background: url('/assets/plupload/jquery.plupload.queue/img/delete.gif');
+	background: url('../img/delete.gif');
 }
 
 li.plupload_failed a {
-	background: url('/assets/plupload/jquery.plupload.queue/img/error.gif');
+	background: url('../img/error.gif');
 	cursor: default;
 }
 
 li.plupload_done a {
-	background: url('/assets/plupload/jquery.plupload.queue/img/done.gif');
+	background: url('../img/done.gif');
 	cursor: default;
 }
 
@@ -175,7 +165,7 @@ li.plupload_done a {
 .plupload_clearer, .plupload_progress_bar {
 	display: block;
 	font-size: 0;
-	line-height: 0;
+	line-height: 0;	
 }
 
 li.plupload_droptext {