noodall-ui 0.1.17 → 0.2.0

data/app/views/assets/_image_choice.html.erb

@@ -0,0 +1,17 @@
+<%= render 'menu' %>
+<h2>Choose Image Size</h2>
+
+<div id="image-choices">
+
+  <div class="choice small" title="Small">
+    <%= link_to image_tag( @asset.url('110x110', @asset.web_image_extension), :alt => @asset.description, :id => "asset-#{@asset.id}" ), @asset.url('800x600', @asset.web_image_extension), :class => 'lightbox', :title => @asset.title %>
+  </div>
+
+  <div class="choice medium" title="Medium">
+    <%= link_to image_tag( @asset.url('220x220', @asset.web_image_extension), :alt => @asset.description, :id => "asset-#{@asset.id}" ), @asset.url('800x600', @asset.web_image_extension), :class => 'lightbox', :title => @asset.title %>
+  </div>
+
+  <div class="choice large" title="Large">
+    <%= link_to image_tag( @asset.url('460x', @asset.web_image_extension), :alt => @asset.description, :id => "asset-#{@asset.id}" ), @asset.url('800x600', @asset.web_image_extension), :class => 'lightbox', :title => @asset.title %>
+  </div>
+</div>

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

@@ -1,10 +1,5 @@
 <% if @asset.image? %>
-<%= link_to image_tag( @asset.url('100x100#', @asset.web_image_extension), :alt => @asset.description, :id => "asset-#{@asset.id}" ), @asset.url('800x600', @asset.web_image_extension), :class => 'lightbox', :title => @asset.title %>
-<% elsif @asset.video? %>
-<div class="video">
-  <%= link_to image_tag( @asset.url('220x125#', @asset.web_image_extension), :alt => @asset.description, :id => "asset-#{@asset.id}" ), @asset.url, :class => 'lightboxVideo', :title => @asset.title %>
-  <strong><%= @asset.title %></strong>
-</div>
+  <%= render :partial => '/assets/image_choice' %>
 <% else -%>
-<%= link_to( @asset.title, @asset.url, :title => @asset.description, :id => "asset-#{@asset.id}" ) %>
+  <%= link_to( @asset.title, @asset.url, :title => @asset.description, :id => "asset-#{@asset.id}" ) %>
 <% end -%>

data/features/manage_assets.feature

@@ -16,13 +16,14 @@ In order to allow easy access to documents whilst editing a website editor will
     When I am using the asset library
     Then I should be able to browse assets by content type
     And I should be able to browse assets by tags
-    
+
   @javascript
   Scenario: Insert an asset
     Given files have been uploaded to the asset library
     When I am editing content
     And I click the editor "Insert Asset" button
     And follow "Images"
-    And I click "Add" on an Asset 
+    And I click "Add" on an Asset
+    And I click on the small icon
     Then the "Image" asset should appear in the content editor
 

data/features/step_definitions/asset_steps.rb

@@ -61,6 +61,10 @@ When /^I click "([^"]*)" on an Asset$/ do |button_name|
   end
 end
 
+When /^I click on the small icon$/ do
+  page.find('div.choice.small').click
+end
+
 Then /^the "([^"]*)" asset should appear in the content editor$/ do |asset_type|
   within_frame('node_body_ifr') do
     page.should have_css("#tinymce img[src^='/media/']")

data/lib/noodall/ui/version.rb

@@ -1,5 +1,5 @@
 module Noodall
   module UI
-    VERSION = "0.1.17"
+    VERSION = "0.2.0"
   end
 end

data/public/javascripts/admin/tiny_mce_config.js

@@ -12,7 +12,7 @@ lite_tiny_mce_config = {
     //"safari,pagebreak,style,layer,table,save,advhr,advimage,advlink,emotions,iespell,inlinepopups,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking",
     // Theme options
     theme_advanced_blockformats : "h2,h3,h4,p",
-    theme_advanced_buttons1 : "bold,italic,underline,|,bullist,numlist,|,link,unlink,|,table,delete_table,col_before,col_after,row_before,row_after,delete_col,delete_row",
+    theme_advanced_buttons1 : "bold,italic,underline,|,bullist,numlist,|,link,unlink,|,table,delete_table,tablecontrols,col_before,col_after,row_before,row_after,delete_col,delete_row",
     theme_advanced_buttons2 : "",
     theme_advanced_buttons3 : "",
     theme_advanced_buttons4 : "",
@@ -36,7 +36,7 @@ tiny_mce_config = {};
 $.extend(tiny_mce_config, lite_tiny_mce_config, {
     editor_selector : "editor",
     theme_advanced_buttons1 : "bold,italic,underline,|,formatselect,removeformat ,|,bullist,numlist,|,link,unlink,anchor,|,outdent,indent,blockquote,|,justifyleft,justifycenter,justifyright,justifyfull",
-    theme_advanced_buttons2 : "table,delete_table,col_before,col_after,row_before,row_after,delete_col,delete_row,|,code,attribs,image,media, assetbrowser,nodebrowser",
+    theme_advanced_buttons2 : "table,delete_table,tablecontrols,col_before,col_after,row_before,row_after,delete_col,delete_row,|,code,attribs,image,media, assetbrowser,nodebrowser",
 
     setup : function(ed) {
       // Add a custom button
@@ -45,14 +45,29 @@ $.extend(tiny_mce_config, lite_tiny_mce_config, {
         image : '/images/admin/image_small.png',
         href: '#asset-browser',
         onclick : function() {
-          Browser.before_close = function() {
-            asset_id = Browser.assets_to_add[0];
+          Browser.do_action_and_close = function() {
+            asset_id = Browser.assets_to_add[0]
             if (asset_id) {
               add_url = $('#asset-' + asset_id).siblings('a.show').attr('href').split('?')[0] + '/add';
               $.get(add_url, { node_id: NoodallNode.id() }, function(data) {
-                tinyMCE.activeEditor.focus();
-                tinyMCE.activeEditor.selection.setContent(data);
-                $.fancybox.close();
+                $('#asset-browser').html(data);
+
+                choices = $('#asset-browser .choice');
+                if (choices.length > 0) {
+                  $.each(choices, function(i, choice){
+                    $(choice).click(function(){
+                      tinyMCE.activeEditor.focus();
+                      tinyMCE.activeEditor.selection.setContent($(this).html());
+                      Browser.close();
+                      return false;
+                    })
+                  });
+                } else {
+                  tinyMCE.activeEditor.focus();
+                  tinyMCE.activeEditor.selection.setContent(data);
+                  Browser.close();
+                  return false;
+                }
               }, 'html');
             }
             return false;

data/public/stylesheets/admin/ie.css

@@ -4,7 +4,7 @@
 #tags,
 .multi-file-files ol li,
 .pagination,
-div.file-form{
+div.file-forms{
   height: 1%;
 }
 
@@ -14,7 +14,17 @@ div.file-form{
 }
 
 .pagination span, .pagination a, th label {
-        vertical-align: middle;
+  vertical-align: middle;
+}
+
+#tags, #pending {
+    clear:right;
+    float:right;
+    height: 405px;
+    margin-bottom: 20px;
+    overflow: auto;
+    padding: 9px;
+    width: 15%;
 }
 
 #tags a {
@@ -25,9 +35,18 @@ div.file-form{
         margin:10px 10px 0 0;
 }
 
-#fancybox-inner ul#browser-list {
-        margin-top:50px;
-        clear:both;
+#browser-list {
+  margin-top:50px;
+  clear:both;
+  display: block;
+
+}
+
+#fancybox-inner #tags {
+  margin-top:30px;
+  clear:both;
+  display: block;
+
 }
 
 #fancybox-inner #asset-browser {
@@ -56,6 +75,11 @@ form#uploader {
   width:100%;
 }
 
+
+#assets.pending #content{
+  padding-bottom: 100px;
+}
+
 #assets ul.choices {
 margin:-60px 0 -50px;
 }
@@ -92,6 +116,11 @@ ol#slot-list li {
   padding:10px;
 }
 
+.slot_tag {
+  margin-top: -37px;
+}
+
+
 .multi-file-files ol li {
   min-height:100px;
 }
@@ -109,10 +138,37 @@ th .tooltip {
   display:block !important;
 }
 
-.pagination .next_page {
-  margin:5px 0 0 0;
+.pagination a, .pagination span, .pagination em{
+  float:left;
+  margin:0 20px 0 0;
+  display:block;
+  clear:none;
 }
 
 .multi-file-files ol li:first-child {
   height:500px;
 }
+
+
+/*FORM BUILDER*/
+
+.add.form-builder {
+    margin-top: 0px;
+}
+#form-fields fieldset p span.tooltip {
+  z-index:8888;
+  position: relative;
+  top: 20px;
+}
+
+#forms #content form p {
+  z-index:9999;
+  position: relative;
+}
+
+#forms #content form p#text_field, 
+#forms #content form p#select,
+#forms #content form p#radio,
+#forms #content form p#check_box {
+    z-index:1;
+}

data/public/stylesheets/admin/layout.css

@@ -277,6 +277,28 @@ form#uploader {
   margin-bottom: 10px;
 }
 
+#asset-browser #image-choices {
+  clear: both;
+}
+
+#asset-browser div.choice  {
+  width: 195px;
+  height: 165px;
+  float: left;
+  margin: 95px 0 0 50px;
+  cursor: pointer;
+  background: url(/images/admin/image_choices.png)
+}
+
+#asset-browser div.medium {
+  background-position: -236px;
+}
+#asset-browser div.large {
+  background-position: -472px;
+}
+#asset-browser div.choice a {
+  display: none;
+}
 /* PAGINATION */
 
 .pagination {

data/public/stylesheets/admin/skin.css

@@ -683,9 +683,6 @@ a:hover {
   color:#D4954C;
 }
 
-
-
-
 /*download button*/
 #content form input.download-button{
   background:url("/images/admin/nav.gif") no-repeat scroll 0 -88px transparent;
@@ -701,3 +698,7 @@ a:hover {
   background-position: -122px -88px;
   cursor:pointer;
 }
+
+/*span liks*/
+.link-node, .link-asset {color: #60A0BE;}
+.link-node:hover, .link-asset:hover {color: #000; cursor: pointer;}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: noodall-ui
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 17
-  version: 0.1.17
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Steve England
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-15 00:00:00 +00:00
+date: 2011-02-23 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -127,6 +127,7 @@ files:
 - app/helpers/noodall/nodes_helper.rb
 - app/models/asset.rb
 - app/models/home.rb
+- app/views/assets/_image_choice.html.erb
 - app/views/layouts/noodall_admin.html.erb
 - app/views/nodes/home.html.erb
 - app/views/noodall/admin/assets/_browser.html.erb
@@ -276,6 +277,7 @@ files:
 - public/images/admin/edit.gif
 - public/images/admin/edit.png
 - public/images/admin/image.png
+- public/images/admin/image_choices.png
 - public/images/admin/image_small.png
 - public/images/admin/info-white.png
 - public/images/admin/info.png