+ input("DocPage.content", array('class'=>'page', 'label'=>'Page', 'between'=>'X '));
+ ?>
+
+
+
+
+ input('Product.principle_id', array('id'=>'principleSelect', 'label'=>'Principle','empty'=>'Select Principle'));?>
+
+
\ No newline at end of file
diff --git a/views/elements/document_quote_view.ctp b/views/elements/document_quote_view.ctp
index e43f018f..98282059 100644
--- a/views/elements/document_quote_view.ctp
+++ b/views/elements/document_quote_view.ctp
@@ -1,4 +1,9 @@
-
$page):?>
-
+
+ input("DocPage.{$key}.id");?>
+ input("DocPage.{$key}.content", array('class'=>'page', 'label'=>'Page '.$page['page_number'], 'between'=>'X '));?>
+ input("DocPage.{$key}.document_id", array('type'=>'hidden'));?>
+ input("DocPage.{$key}.page_number", array('type'=>'hidden'));?>
+
- input("DocPage.{$key}.id");?>
- input("DocPage.{$key}.content", array('class'=>'page', 'label'=>'Page'));?>
- input("DocPage.{$key}.document_id", array('type'=>'hidden'));?>
+
-
-
-
end('Save');?>
-data);?>
-
-
-
+data);?>
+
+
+
diff --git a/webroot/css/quotenik.css b/webroot/css/quotenik.css
index 490bcf56..572107de 100755
--- a/webroot/css/quotenik.css
+++ b/webroot/css/quotenik.css
@@ -1495,4 +1495,13 @@ div.address span {
left: 50%;
top: 50%;
+}
+
+.pages {
+ width: 50%;
+}
+
+.pages label {
+ display: inline;
+ padding-right: 0.2em;
}
\ No newline at end of file
diff --git a/webroot/js/add_edit_shipment.js b/webroot/js/add_edit_shipment.js
index 8659855d..313915fb 100644
--- a/webroot/js/add_edit_shipment.js
+++ b/webroot/js/add_edit_shipment.js
@@ -282,23 +282,9 @@ $(function() {
newInvoiceForm.prepend(closeButton);
$("#invoices").append(newInvoiceForm);
-
-
-
- }
-
- function getCakeID(model, count, field) {
- return model+count+capitalizeFirstLetter(field);
- }
-
- function getCakeName(model, count, field) {
- return 'data['+model+']['+count+']['+field+']';
- }
-
- function capitalizeFirstLetter(string) {
- return string.charAt(0).toUpperCase() + string.slice(1);
}
+
/**
* A more generic way of handling the HABTM
[REMOVE BUTTON] NAME [HIDDEN INPUT]
@@ -325,23 +311,6 @@ $(function() {
}
-
- function getSelectedID(elementID) {
- var id;
- $(elementID+" :selected").each(function(i, selected) {
- id = this.value;
- });
- return id;
- }
-
- function getSelectedText(elementID) {
- var text;
- $(elementID+" :selected").each(function(i, selected) {
- text = $(selected).text();
- });
- return text;
- }
-
/**
* Resets the Form to its default site
*/
diff --git a/webroot/js/document_add_edit.js b/webroot/js/document_add_edit.js
index a2fd6f3a..aabf308f 100644
--- a/webroot/js/document_add_edit.js
+++ b/webroot/js/document_add_edit.js
@@ -1,16 +1,133 @@
+
+
+
$(function() {
- $("#addPage").button().click(function() {
- alert("LETS ADD STUFFFF");
- return false;
+
+
+
+ $( "#lineItemModal" ).dialog({
+ autoOpen: false,
+ height: 900,
+ width: 600,
+ modal: true,
+ buttons: {
+ "Add Line Item": function() {
+ //var thisShipmentInputs = $('#ShipmentAddForm').find('input,select,textarea');
+
+ $.post('/line_items/ajax_add', null, function(data) {
+ $( "#lineItemModal" ).dialog('close');
+ //window.location.reload(); //Change this to fetch a new copy of the table and update a
.
+ });
+
+ },
+ Cancel: function() {
+ $( this ).dialog( "close" );
+ //$("#ShipmentAddForm")[0].reset();
+ $("#principlesList").empty();
+ }
+ },
+ close: function() {
+
+ $("#importFields").hide();
+ $("#principle").hide();
+
+
+ }
});
-
- $("#addLineItem").button().click(function() {
+ //Setup CKEditor toolbars
+ var config = {
+ toolbar:[
+ ['Cut','Copy','Paste','PasteText','PasteFromWord','-','Scayt'],
+ ['Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'],
+ ['Image','Table','HorizontalRule','SpecialChar'],
+ '/',
+ ['Styles','Format'],
+ ['Bold','Italic','Strike'],
+ ['NumberedList','BulletedList','-','Outdent','Indent','Blockquote'],
+ ['Link','Unlink'],
+ ['Maximize','-','About']
+ ]
+ };
+
+
+ $("#pageContentFactory").hide();
+
+
+ //Add a new Page Element.
+ $("#addPage").button().click(function(event) {
+ event.preventDefault();
+
+
+ $('.page').ckeditor(function() {
+ this.destroy();
+ });
+
+
+
+ var newPage = $('#pageContentFactory').clone();
+ newPage.removeAttr('id');
+ newPage.show();
+
+
+
+ var pageCount = $('.docPage').length;
+
+ //alert(pageCount);
+
+ pageCount++;
+ var model = 'DocPage';
+ var field = 'content';
+ var ID = getCakeID(model,pageCount, field);
+ var name = getCakeName(model, pageCount, field);
+
+ newPage.find('label').attr('for', ID);
+
+ newPage.find('textarea').attr('id', ID).attr('name', name);
+ newPage.addClass('docPage');
+
+ var hiddenName = getCakeName(model, pageCount, 'page_number');
+
+ newPage.append('