fixed merge conflict

jessykate · Nov 14, 2010 · e6e1473 · e6e1473
2 parents 87a2efa + 757de21
commit e6e1473
Show file tree

Hide file tree

Showing 40 changed files with 5,667 additions and 7 deletions.
diff --git a/frontend/views.py b/frontend/views.py
@@ -98,8 +98,9 @@ def new_document(request):
             return HttpResponseRedirect("/cloud/%s" % cloud_id)
             return render_to_formtemplate(request, 'frontend/tagcloud_display.html', {'body' : body,
                                         'style' : style, 'generator_url' : generator_url,
-                                        'generator_url_display': generator_url_display})
-
+                                        'generator_url_display': generator_url_display, 
+                                        'tagcloud_json': content, 'tagcloud_form': form,
+                                        'max_words_max': 200}) #stubbed out values
         else:
             print request.POST
             print 'Form did not validate'

diff --git a/media/colorpicker.css b/media/colorpicker.css
@@ -0,0 +1,161 @@
+.colorpicker {
+	width: 356px;
+	height: 176px;
+	overflow: hidden;
+	position: absolute;
+	background: url(/images/colorpicker_background.png);
+	font-family: Arial, Helvetica, sans-serif;
+	display: none;
+}
+.colorpicker_color {
+	width: 150px;
+	height: 150px;
+	left: 14px;
+	top: 13px;
+	position: absolute;
+	background: #f00;
+	overflow: hidden;
+	cursor: crosshair;
+}
+.colorpicker_color div {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 150px;
+	height: 150px;
+	background: url(/images/colorpicker_overlay.png);
+}
+.colorpicker_color div div {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 11px;
+	height: 11px;
+	overflow: hidden;
+	background: url(/images/colorpicker_select.gif);
+	margin: -5px 0 0 -5px;
+}
+.colorpicker_hue {
+	position: absolute;
+	top: 13px;
+	left: 171px;
+	width: 35px;
+	height: 150px;
+	cursor: n-resize;
+}
+.colorpicker_hue div {
+	position: absolute;
+	width: 35px;
+	height: 9px;
+	overflow: hidden;
+	background: url(/images/colorpicker_indic.gif) left top;
+	margin: -4px 0 0 0;
+	left: 0px;
+}
+.colorpicker_new_color {
+	position: absolute;
+	width: 60px;
+	height: 30px;
+	left: 213px;
+	top: 13px;
+	background: #f00;
+}
+.colorpicker_current_color {
+	position: absolute;
+	width: 60px;
+	height: 30px;
+	left: 283px;
+	top: 13px;
+	background: #f00;
+}
+.colorpicker input {
+	background-color: transparent;
+	border: 1px solid transparent;
+	position: absolute;
+	font-size: 10px;
+	font-family: Arial, Helvetica, sans-serif;
+	color: #898989;
+	top: 4px;
+	right: 11px;
+	text-align: right;
+	margin: 0;
+	padding: 0;
+	height: 11px;
+}
+.colorpicker_hex {
+	position: absolute;
+	width: 72px;
+	height: 22px;
+	background: url(/images/colorpicker_hex.png) top;
+	left: 212px;
+	top: 142px;
+}
+.colorpicker_hex input {
+	right: 6px;
+}
+.colorpicker_field {
+	height: 22px;
+	width: 62px;
+	background-position: top;
+	position: absolute;
+}
+.colorpicker_field span {
+	position: absolute;
+	width: 12px;
+	height: 22px;
+	overflow: hidden;
+	top: 0;
+	right: 0;
+	cursor: n-resize;
+}
+.colorpicker_rgb_r {
+	background-image: url(/images/colorpicker_rgb_r.png);
+	top: 52px;
+	left: 212px;
+}
+.colorpicker_rgb_g {
+	background-image: url(/images/colorpicker_rgb_g.png);
+	top: 82px;
+	left: 212px;
+}
+.colorpicker_rgb_b {
+	background-image: url(/images/colorpicker_rgb_b.png);
+	top: 112px;
+	left: 212px;
+}
+.colorpicker_hsb_h {
+	background-image: url(/images/colorpicker_hsb_h.png);
+	top: 52px;
+	left: 282px;
+}
+.colorpicker_hsb_s {
+	background-image: url(/images/colorpicker_hsb_s.png);
+	top: 82px;
+	left: 282px;
+}
+.colorpicker_hsb_b {
+	background-image: url(/images/colorpicker_hsb_b.png);
+	top: 112px;
+	left: 282px;
+}
+.colorpicker_submit {
+	position: absolute;
+	width: 22px;
+	height: 22px;
+	background: url(/images/colorpicker_submit.png) top;
+	left: 322px;
+	top: 142px;
+	overflow: hidden;
+}
+.colorpicker_focus {
+	background-position: center;
+}
+.colorpicker_hex.colorpicker_focus {
+	background-position: bottom;
+}
+.colorpicker_submit.colorpicker_focus {
+	background-position: bottom;
+}
+.colorpicker_slider {
+	background-position: bottom;
+}
diff --git a/media/images/Thumbs.db b/media/images/Thumbs.db
diff --git a/media/images/blank.gif b/media/images/blank.gif
diff --git a/media/images/colorpicker_background.png b/media/images/colorpicker_background.png
diff --git a/media/images/colorpicker_hex.png b/media/images/colorpicker_hex.png
diff --git a/media/images/colorpicker_hsb_b.png b/media/images/colorpicker_hsb_b.png
diff --git a/media/images/colorpicker_hsb_h.png b/media/images/colorpicker_hsb_h.png
diff --git a/media/images/colorpicker_hsb_s.png b/media/images/colorpicker_hsb_s.png
diff --git a/media/images/colorpicker_indic.gif b/media/images/colorpicker_indic.gif
diff --git a/media/images/colorpicker_overlay.png b/media/images/colorpicker_overlay.png
diff --git a/media/images/colorpicker_rgb_b.png b/media/images/colorpicker_rgb_b.png
diff --git a/media/images/colorpicker_rgb_g.png b/media/images/colorpicker_rgb_g.png
diff --git a/media/images/colorpicker_rgb_r.png b/media/images/colorpicker_rgb_r.png
diff --git a/media/images/colorpicker_select.gif b/media/images/colorpicker_select.gif
diff --git a/media/images/colorpicker_submit.png b/media/images/colorpicker_submit.png
diff --git a/media/images/custom_background.png b/media/images/custom_background.png
diff --git a/media/images/custom_hex.png b/media/images/custom_hex.png
diff --git a/media/images/custom_hsb_b.png b/media/images/custom_hsb_b.png
diff --git a/media/images/custom_hsb_h.png b/media/images/custom_hsb_h.png
diff --git a/media/images/custom_hsb_s.png b/media/images/custom_hsb_s.png
diff --git a/media/images/custom_indic.gif b/media/images/custom_indic.gif
diff --git a/media/images/custom_rgb_b.png b/media/images/custom_rgb_b.png
diff --git a/media/images/custom_rgb_g.png b/media/images/custom_rgb_g.png
diff --git a/media/images/custom_rgb_r.png b/media/images/custom_rgb_r.png
diff --git a/media/images/custom_submit.png b/media/images/custom_submit.png
diff --git a/media/images/select.png b/media/images/select.png
diff --git a/media/images/select2.png b/media/images/select2.png
diff --git a/media/images/slider.png b/media/images/slider.png