Note page, bump jquery version

diff --git a/karmaworld/assets/css/global.css b/karmaworld/assets/css/global.css
index ab21bcd3f10844951150a2db2d6286197568aa12..6515429888282f6164934a0462badd7d63684df7 100644 (file)
--- a/karmaworld/assets/css/global.css
+++ b/karmaworld/assets/css/global.css
@@ -95,16 +95,32 @@ button {
   border: none;
   padding: 10px;
   border-radius: 0.1em;
+  font-family: inherit;
+  background: #333333;
+  cursor: pointer;
 }
 
-button.inline-button {
-  display: inline;
+button.important {
+  background: #f1592a;
 }
 
-button.important {
+button:hover,
+button:focus {
   background: #f1592a;
 }
 
+button.disabled,
+button.disabled:hover,
+button.disabled:focus {
+  background: #333333;
+  color: #bcbdc0;
+  cursor: default;
+}
+
+button.inline-button {
+  display: inline;
+}
+
 a {
   color: inherit;
   text-decoration: none;

diff --git a/karmaworld/assets/css/jquery-ui.css b/karmaworld/assets/css/jquery-ui.css
new file mode 100644 (file)
index 0000000..7ffb205
--- /dev/null
+++ b/karmaworld/assets/css/jquery-ui.css
@@ -0,0 +1,475 @@
+/*! jQuery UI - v1.9.2 - 2012-11-23
+* http://jqueryui.com
+* Includes: jquery.ui.core.css, jquery.ui.accordion.css, jquery.ui.autocomplete.css, jquery.ui.button.css, jquery.ui.datepicker.css, jquery.ui.dialog.css, jquery.ui.menu.css, jquery.ui.progressbar.css, jquery.ui.resizable.css, jquery.ui.selectable.css, jquery.ui.slider.css, jquery.ui.spinner.css, jquery.ui.tabs.css, jquery.ui.tooltip.css, jquery.ui.theme.css
+* Copyright 2012 jQuery Foundation and other contributors; Licensed MIT */
+
+/* Layout helpers
+----------------------------------*/
+.ui-helper-hidden { display: none; }
+.ui-helper-hidden-accessible { border: 0; clip: rect(0 0 0 0); height: 1px; margin: -1px; overflow: hidden; padding: 0; position: absolute; width: 1px; }
+.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
+.ui-helper-clearfix:before, .ui-helper-clearfix:after { content: ""; display: table; }
+.ui-helper-clearfix:after { clear: both; }
+.ui-helper-clearfix { zoom: 1; }
+.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
+
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-disabled { cursor: default !important; }
+
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Overlays */
+.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
+
+.ui-accordion .ui-accordion-header { display: block; cursor: pointer; position: relative; margin-top: 2px; padding: .5em .5em .5em .7em; zoom: 1; }
+.ui-accordion .ui-accordion-icons { padding-left: 2.2em; }
+.ui-accordion .ui-accordion-noicons { padding-left: .7em; }
+.ui-accordion .ui-accordion-icons .ui-accordion-icons { padding-left: 2.2em; }
+.ui-accordion .ui-accordion-header .ui-accordion-header-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
+.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; overflow: auto; zoom: 1; }
+
+.ui-autocomplete {
+       position: absolute;
+       top: 0;
+       left: 0;
+       cursor: default;
+}
+
+/* workarounds */
+* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */
+
+.ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; cursor: pointer; text-align: center; zoom: 1; overflow: visible; } /* the overflow property removes extra width in IE */
+.ui-button, .ui-button:link, .ui-button:visited, .ui-button:hover, .ui-button:active { text-decoration: none; }
+.ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */
+button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */
+.ui-button-icons-only { width: 3.4em; } 
+button.ui-button-icons-only { width: 3.7em; } 
+
+/*button text element */
+.ui-button .ui-button-text { display: block; line-height: 1.4;  }
+.ui-button-text-only .ui-button-text { padding: .4em 1em; }
+.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: .4em; text-indent: -9999999px; }
+.ui-button-text-icon-primary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; }
+.ui-button-text-icon-secondary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 2.1em .4em 1em; }
+.ui-button-text-icons .ui-button-text { padding-left: 2.1em; padding-right: 2.1em; }
+/* no icon support for input elements, provide padding by default */
+input.ui-button { padding: .4em 1em; }
+
+/*button icon element(s) */
+.ui-button-icon-only .ui-icon, .ui-button-text-icon-primary .ui-icon, .ui-button-text-icon-secondary .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -8px; }
+.ui-button-icon-only .ui-icon { left: 50%; margin-left: -8px; }
+.ui-button-text-icon-primary .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: .5em; }
+.ui-button-text-icon-secondary .ui-button-icon-secondary, .ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
+.ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
+
+/*button sets*/
+.ui-buttonset { margin-right: 7px; }
+.ui-buttonset .ui-button { margin-left: 0; margin-right: -.3em; }
+
+/* workarounds */
+button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */
+
+.ui-datepicker { width: 17em; padding: .2em .2em 0; display: none; }
+.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; }
+.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; }
+.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; }
+.ui-datepicker .ui-datepicker-prev { left:2px; }
+.ui-datepicker .ui-datepicker-next { right:2px; }
+.ui-datepicker .ui-datepicker-prev-hover { left:1px; }
+.ui-datepicker .ui-datepicker-next-hover { right:1px; }
+.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px;  }
+.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; }
+.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; }
+.ui-datepicker select.ui-datepicker-month-year {width: 100%;}
+.ui-datepicker select.ui-datepicker-month, 
+.ui-datepicker select.ui-datepicker-year { width: 49%;}
+.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; }
+.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0;  }
+.ui-datepicker td { border: 0; padding: 1px; }
+.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; }
+.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; }
+.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; }
+.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; }
+
+/* with multiple calendars */
+.ui-datepicker.ui-datepicker-multi { width:auto; }
+.ui-datepicker-multi .ui-datepicker-group { float:left; }
+.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; }
+.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; }
+.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; }
+.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; }
+.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; }
+.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; }
+.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; }
+.ui-datepicker-row-break { clear:both; width:100%; font-size:0em; }
+
+/* RTL support */
+.ui-datepicker-rtl { direction: rtl; }
+.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; }
+.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; }
+.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; }
+.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; }
+.ui-datepicker-rtl .ui-datepicker-group { float:right; }
+.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+
+/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */
+.ui-datepicker-cover {
+    position: absolute; /*must have*/
+    z-index: -1; /*must have*/
+    filter: mask(); /*must have*/
+    top: -4px; /*must have*/
+    left: -4px; /*must have*/
+    width: 200px; /*must have*/
+    height: 200px; /*must have*/
+}
+.ui-dialog { position: absolute; top: 0; left: 0; padding: .2em; width: 300px; overflow: hidden; }
+.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative;  }
+.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0; }
+.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
+.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
+.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
+.ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
+.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { float: right; }
+.ui-dialog .ui-dialog-buttonpane button { margin: .5em .4em .5em 0; cursor: pointer; }
+.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; }
+.ui-draggable .ui-dialog-titlebar { cursor: move; }
+
+.ui-menu { list-style:none; padding: 2px; margin: 0; display:block; outline: none; }
+.ui-menu .ui-menu { margin-top: -3px; position: absolute; }
+.ui-menu .ui-menu-item { margin: 0; padding: 0; zoom: 1; width: 100%; }
+.ui-menu .ui-menu-divider { margin: 5px -2px 5px -2px; height: 0; font-size: 0; line-height: 0; border-width: 1px 0 0 0; }
+.ui-menu .ui-menu-item a { text-decoration: none; display: block; padding: 2px .4em; line-height: 1.5; zoom: 1; font-weight: normal; }
+.ui-menu .ui-menu-item a.ui-state-focus,
+.ui-menu .ui-menu-item a.ui-state-active { font-weight: normal; margin: -1px; }
+
+.ui-menu .ui-state-disabled { font-weight: normal; margin: .4em 0 .2em; line-height: 1.5; }
+.ui-menu .ui-state-disabled a { cursor: default; }
+
+/* icon support */
+.ui-menu-icons { position: relative; }
+.ui-menu-icons .ui-menu-item a { position: relative; padding-left: 2em; }
+
+/* left-aligned */
+.ui-menu .ui-icon { position: absolute; top: .2em; left: .2em; }
+
+/* right-aligned */
+.ui-menu .ui-menu-icon { position: static; float: right; }
+
+.ui-progressbar { height:2em; text-align: left; overflow: hidden; }
+.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }
+.ui-resizable { position: relative;}
+.ui-resizable-handle { position: absolute;font-size: 0.1px; display: block; }
+.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; }
+.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; }
+.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0; }
+.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0; height: 100%; }
+.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0; height: 100%; }
+.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; }
+.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; }
+.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; }
+.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}
+.ui-selectable-helper { position: absolute; z-index: 100; border:1px dotted black; }
+
+.ui-slider { position: relative; text-align: left; }
+.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; }
+.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; }
+
+.ui-slider-horizontal { height: .8em; }
+.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; }
+.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
+.ui-slider-horizontal .ui-slider-range-min { left: 0; }
+.ui-slider-horizontal .ui-slider-range-max { right: 0; }
+
+.ui-slider-vertical { width: .8em; height: 100px; }
+.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
+.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
+.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
+.ui-slider-vertical .ui-slider-range-max { top: 0; }
+.ui-spinner { position:relative; display: inline-block; overflow: hidden; padding: 0; vertical-align: middle; }
+.ui-spinner-input { border: none; background: none; padding: 0; margin: .2em 0; vertical-align: middle; margin-left: .4em; margin-right: 22px; }
+.ui-spinner-button { width: 16px; height: 50%; font-size: .5em; padding: 0; margin: 0; text-align: center; position: absolute; cursor: default; display: block; overflow: hidden; right: 0; }
+.ui-spinner a.ui-spinner-button { border-top: none; border-bottom: none; border-right: none; } /* more specificity required here to overide default borders */
+.ui-spinner .ui-icon { position: absolute; margin-top: -8px; top: 50%; left: 0; } /* vertical centre icon */
+.ui-spinner-up { top: 0; }
+.ui-spinner-down { bottom: 0; }
+
+/* TR overrides */
+.ui-spinner .ui-icon-triangle-1-s {
+       /* need to fix icons sprite */
+       background-position:-65px -16px;
+}
+
+.ui-tabs { position: relative; padding: .2em; zoom: 1; } /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
+.ui-tabs .ui-tabs-nav { margin: 0; padding: 0; }
+.ui-tabs .ui-tabs-nav li { list-style: none; float: left; position: relative; top: 0; border-bottom: 0; padding: 0; white-space: nowrap; }
+.ui-tabs .ui-tabs-nav li a { float: left; padding: .5em 1em; text-decoration: none; }
+.ui-tabs .ui-tabs-nav li.ui-tabs-active { margin-bottom: -1px; padding-bottom: 1px; }
+.ui-tabs .ui-tabs-nav li.ui-tabs-active a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-tabs-loading a { cursor: text; }
+.ui-tabs .ui-tabs-nav li a, .ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
+.ui-tabs { display: block; border-width: 0; background: none; }
+.ui-tabs-panel { display: block; }
+
+.ui-tooltip {
+       padding: 8px;
+       position: absolute;
+       z-index: 9999;
+       max-width: 300px;
+       -webkit-box-shadow: 0 0 5px #aaa;
+       box-shadow: 0 0 5px #aaa;
+}
+/* Fades and background-images don't work well together in IE6, drop the image */
+* html .ui-tooltip {
+       background-image: none;
+}
+body .ui-tooltip { border-width: 2px; }
+
+/* Component containers
+----------------------------------*/
+.ui-widget { font-size: 1.1em/*{fsDefault}*/; }
+.ui-widget .ui-widget { font-size: 1em; }
+.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-size: 1em; }
+.ui-widget-content { border: 1px solid #aaaaaa/*{borderColorContent}*/; background: #ffffff/*{bgColorContent}*/ url(images/ui-bg_flat_75_ffffff_40x100.png)/*{bgImgUrlContent}*/ 50%/*{bgContentXPos}*/ 50%/*{bgContentYPos}*/ repeat-x/*{bgContentRepeat}*/; color: #222222/*{fcContent}*/; }
+.ui-widget-content a { color: #222222/*{fcContent}*/; }
+.ui-widget-header { border: none; background: transparent; color: #222222/*{fcHeader}*/; font-weight: bold; }
+.ui-widget-header a { color: #222222/*{fcHeader}*/; }
+
+/* Interaction states
+----------------------------------*/
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #d3d3d3/*{borderColorDefault}*/; background: #e6e6e6/*{bgColorDefault}*/ url(images/ui-bg_glass_75_e6e6e6_1x400.png)/*{bgImgUrlDefault}*/ 50%/*{bgDefaultXPos}*/ 50%/*{bgDefaultYPos}*/ repeat-x/*{bgDefaultRepeat}*/; font-weight: normal/*{fwDefault}*/; color: #555555/*{fcDefault}*/; }
+.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #555555/*{fcDefault}*/; text-decoration: none; }
+.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #999999/*{borderColorHover}*/; background: #dadada/*{bgColorHover}*/ url(images/ui-bg_glass_75_dadada_1x400.png)/*{bgImgUrlHover}*/ 50%/*{bgHoverXPos}*/ 50%/*{bgHoverYPos}*/ repeat-x/*{bgHoverRepeat}*/; font-weight: normal/*{fwDefault}*/; color: #212121/*{fcHover}*/; }
+.ui-state-hover a, .ui-state-hover a:hover, .ui-state-hover a:link, .ui-state-hover a:visited { color: #212121/*{fcHover}*/; text-decoration: none; }
+.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { background: #ffffff/*{bgColorActive}*/ url(images/ui-bg_glass_65_ffffff_1x400.png)/*{bgImgUrlActive}*/ 50%/*{bgActiveXPos}*/ 50%/*{bgActiveYPos}*/ repeat-x/*{bgActiveRepeat}*/; font-weight: normal/*{fwDefault}*/; color: #212121/*{fcActive}*/; }
+.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #212121/*{fcActive}*/; text-decoration: none; }
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight  {border: 1px solid #fcefa1/*{borderColorHighlight}*/; background: #fbf9ee/*{bgColorHighlight}*/ url(images/ui-bg_glass_55_fbf9ee_1x400.png)/*{bgImgUrlHighlight}*/ 50%/*{bgHighlightXPos}*/ 50%/*{bgHighlightYPos}*/ repeat-x/*{bgHighlightRepeat}*/; color: #363636/*{fcHighlight}*/; }
+.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636/*{fcHighlight}*/; }
+.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a/*{borderColorError}*/; background: #fef1ec/*{bgColorError}*/ url(images/ui-bg_glass_95_fef1ec_1x400.png)/*{bgImgUrlError}*/ 50%/*{bgErrorXPos}*/ 50%/*{bgErrorYPos}*/ repeat-x/*{bgErrorRepeat}*/; color: #cd0a0a/*{fcError}*/; }
+.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #cd0a0a/*{fcError}*/; }
+.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #cd0a0a/*{fcError}*/; }
+.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
+.ui-priority-secondary, .ui-widget-content .ui-priority-secondary,  .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
+.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
+.ui-state-disabled .ui-icon { filter:Alpha(Opacity=35); } /* For IE8 - See #6059 */
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_222222_256x240.png)/*{iconsContent}*/; }
+.ui-widget-content .ui-icon {background-image: url(images/ui-icons_222222_256x240.png)/*{iconsContent}*/; }
+.ui-widget-header .ui-icon {background-image: url(images/ui-icons_222222_256x240.png)/*{iconsHeader}*/; }
+.ui-state-default .ui-icon { background-image: url(images/ui-icons_888888_256x240.png)/*{iconsDefault}*/; }
+.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_454545_256x240.png)/*{iconsHover}*/; }
+.ui-state-active .ui-icon {background-image: url(images/ui-icons_454545_256x240.png)/*{iconsActive}*/; }
+.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_2e83ff_256x240.png)/*{iconsHighlight}*/; }
+.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_cd0a0a_256x240.png)/*{iconsError}*/; }
+
+/* positioning */
+.ui-icon-carat-1-n { background-position: 0 0; }
+.ui-icon-carat-1-ne { background-position: -16px 0; }
+.ui-icon-carat-1-e { background-position: -32px 0; }
+.ui-icon-carat-1-se { background-position: -48px 0; }
+.ui-icon-carat-1-s { background-position: -64px 0; }
+.ui-icon-carat-1-sw { background-position: -80px 0; }
+.ui-icon-carat-1-w { background-position: -96px 0; }
+.ui-icon-carat-1-nw { background-position: -112px 0; }
+.ui-icon-carat-2-n-s { background-position: -128px 0; }
+.ui-icon-carat-2-e-w { background-position: -144px 0; }
+.ui-icon-triangle-1-n { background-position: 0 -16px; }
+.ui-icon-triangle-1-ne { background-position: -16px -16px; }
+.ui-icon-triangle-1-e { background-position: -32px -16px; }
+.ui-icon-triangle-1-se { background-position: -48px -16px; }
+.ui-icon-triangle-1-s { background-position: -64px -16px; }
+.ui-icon-triangle-1-sw { background-position: -80px -16px; }
+.ui-icon-triangle-1-w { background-position: -96px -16px; }
+.ui-icon-triangle-1-nw { background-position: -112px -16px; }
+.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
+.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
+.ui-icon-arrow-1-n { background-position: 0 -32px; }
+.ui-icon-arrow-1-ne { background-position: -16px -32px; }
+.ui-icon-arrow-1-e { background-position: -32px -32px; }
+.ui-icon-arrow-1-se { background-position: -48px -32px; }
+.ui-icon-arrow-1-s { background-position: -64px -32px; }
+.ui-icon-arrow-1-sw { background-position: -80px -32px; }
+.ui-icon-arrow-1-w { background-position: -96px -32px; }
+.ui-icon-arrow-1-nw { background-position: -112px -32px; }
+.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
+.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
+.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
+.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
+.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
+.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
+.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
+.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
+.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
+.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
+.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
+.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
+.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
+.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
+.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
+.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
+.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
+.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
+.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
+.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
+.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
+.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
+.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
+.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
+.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
+.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
+.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
+.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
+.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
+.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
+.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
+.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
+.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
+.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
+.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
+.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
+.ui-icon-arrow-4 { background-position: 0 -80px; }
+.ui-icon-arrow-4-diag { background-position: -16px -80px; }
+.ui-icon-extlink { background-position: -32px -80px; }
+.ui-icon-newwin { background-position: -48px -80px; }
+.ui-icon-refresh { background-position: -64px -80px; }
+.ui-icon-shuffle { background-position: -80px -80px; }
+.ui-icon-transfer-e-w { background-position: -96px -80px; }
+.ui-icon-transferthick-e-w { background-position: -112px -80px; }
+.ui-icon-folder-collapsed { background-position: 0 -96px; }
+.ui-icon-folder-open { background-position: -16px -96px; }
+.ui-icon-document { background-position: -32px -96px; }
+.ui-icon-document-b { background-position: -48px -96px; }
+.ui-icon-note { background-position: -64px -96px; }
+.ui-icon-mail-closed { background-position: -80px -96px; }
+.ui-icon-mail-open { background-position: -96px -96px; }
+.ui-icon-suitcase { background-position: -112px -96px; }
+.ui-icon-comment { background-position: -128px -96px; }
+.ui-icon-person { background-position: -144px -96px; }
+.ui-icon-print { background-position: -160px -96px; }
+.ui-icon-trash { background-position: -176px -96px; }
+.ui-icon-locked { background-position: -192px -96px; }
+.ui-icon-unlocked { background-position: -208px -96px; }
+.ui-icon-bookmark { background-position: -224px -96px; }
+.ui-icon-tag { background-position: -240px -96px; }
+.ui-icon-home { background-position: 0 -112px; }
+.ui-icon-flag { background-position: -16px -112px; }
+.ui-icon-calendar { background-position: -32px -112px; }
+.ui-icon-cart { background-position: -48px -112px; }
+.ui-icon-pencil { background-position: -64px -112px; }
+.ui-icon-clock { background-position: -80px -112px; }
+.ui-icon-disk { background-position: -96px -112px; }
+.ui-icon-calculator { background-position: -112px -112px; }
+.ui-icon-zoomin { background-position: -128px -112px; }
+.ui-icon-zoomout { background-position: -144px -112px; }
+.ui-icon-search { background-position: -160px -112px; }
+.ui-icon-wrench { background-position: -176px -112px; }
+.ui-icon-gear { background-position: -192px -112px; }
+.ui-icon-heart { background-position: -208px -112px; }
+.ui-icon-star { background-position: -224px -112px; }
+.ui-icon-link { background-position: -240px -112px; }
+.ui-icon-cancel { background-position: 0 -128px; }
+.ui-icon-plus { background-position: -16px -128px; }
+.ui-icon-plusthick { background-position: -32px -128px; }
+.ui-icon-minus { background-position: -48px -128px; }
+.ui-icon-minusthick { background-position: -64px -128px; }
+.ui-icon-close { background-position: -80px -128px; }
+.ui-icon-closethick { background-position: -96px -128px; }
+.ui-icon-key { background-position: -112px -128px; }
+.ui-icon-lightbulb { background-position: -128px -128px; }
+.ui-icon-scissors { background-position: -144px -128px; }
+.ui-icon-clipboard { background-position: -160px -128px; }
+.ui-icon-copy { background-position: -176px -128px; }
+.ui-icon-contact { background-position: -192px -128px; }
+.ui-icon-image { background-position: -208px -128px; }
+.ui-icon-video { background-position: -224px -128px; }
+.ui-icon-script { background-position: -240px -128px; }
+.ui-icon-alert { background-position: 0 -144px; }
+.ui-icon-info { background-position: -16px -144px; }
+.ui-icon-notice { background-position: -32px -144px; }
+.ui-icon-help { background-position: -48px -144px; }
+.ui-icon-check { background-position: -64px -144px; }
+.ui-icon-bullet { background-position: -80px -144px; }
+.ui-icon-radio-on { background-position: -96px -144px; }
+.ui-icon-radio-off { background-position: -112px -144px; }
+.ui-icon-pin-w { background-position: -128px -144px; }
+.ui-icon-pin-s { background-position: -144px -144px; }
+.ui-icon-play { background-position: 0 -160px; }
+.ui-icon-pause { background-position: -16px -160px; }
+.ui-icon-seek-next { background-position: -32px -160px; }
+.ui-icon-seek-prev { background-position: -48px -160px; }
+.ui-icon-seek-end { background-position: -64px -160px; }
+.ui-icon-seek-start { background-position: -80px -160px; }
+/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
+.ui-icon-seek-first { background-position: -80px -160px; }
+.ui-icon-stop { background-position: -96px -160px; }
+.ui-icon-eject { background-position: -112px -160px; }
+.ui-icon-volume-off { background-position: -128px -160px; }
+.ui-icon-volume-on { background-position: -144px -160px; }
+.ui-icon-power { background-position: 0 -176px; }
+.ui-icon-signal-diag { background-position: -16px -176px; }
+.ui-icon-signal { background-position: -32px -176px; }
+.ui-icon-battery-0 { background-position: -48px -176px; }
+.ui-icon-battery-1 { background-position: -64px -176px; }
+.ui-icon-battery-2 { background-position: -80px -176px; }
+.ui-icon-battery-3 { background-position: -96px -176px; }
+.ui-icon-circle-plus { background-position: 0 -192px; }
+.ui-icon-circle-minus { background-position: -16px -192px; }
+.ui-icon-circle-close { background-position: -32px -192px; }
+.ui-icon-circle-triangle-e { background-position: -48px -192px; }
+.ui-icon-circle-triangle-s { background-position: -64px -192px; }
+.ui-icon-circle-triangle-w { background-position: -80px -192px; }
+.ui-icon-circle-triangle-n { background-position: -96px -192px; }
+.ui-icon-circle-arrow-e { background-position: -112px -192px; }
+.ui-icon-circle-arrow-s { background-position: -128px -192px; }
+.ui-icon-circle-arrow-w { background-position: -144px -192px; }
+.ui-icon-circle-arrow-n { background-position: -160px -192px; }
+.ui-icon-circle-zoomin { background-position: -176px -192px; }
+.ui-icon-circle-zoomout { background-position: -192px -192px; }
+.ui-icon-circle-check { background-position: -208px -192px; }
+.ui-icon-circlesmall-plus { background-position: 0 -208px; }
+.ui-icon-circlesmall-minus { background-position: -16px -208px; }
+.ui-icon-circlesmall-close { background-position: -32px -208px; }
+.ui-icon-squaresmall-plus { background-position: -48px -208px; }
+.ui-icon-squaresmall-minus { background-position: -64px -208px; }
+.ui-icon-squaresmall-close { background-position: -80px -208px; }
+.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
+.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
+.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
+.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
+.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
+.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Corner radius */
+.ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl { -moz-border-radius-topleft: 4px/*{cornerRadius}*/; -webkit-border-top-left-radius: 4px/*{cornerRadius}*/; -khtml-border-top-left-radius: 4px/*{cornerRadius}*/; border-top-left-radius: 4px/*{cornerRadius}*/; }
+.ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { -moz-border-radius-topright: 4px/*{cornerRadius}*/; -webkit-border-top-right-radius: 4px/*{cornerRadius}*/; -khtml-border-top-right-radius: 4px/*{cornerRadius}*/; border-top-right-radius: 4px/*{cornerRadius}*/; }
+.ui-corner-all, .ui-corner-bottom, .ui-corner-left, .ui-corner-bl { -moz-border-radius-bottomleft: 4px/*{cornerRadius}*/; -webkit-border-bottom-left-radius: 4px/*{cornerRadius}*/; -khtml-border-bottom-left-radius: 4px/*{cornerRadius}*/; border-bottom-left-radius: 4px/*{cornerRadius}*/; }
+.ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { -moz-border-radius-bottomright: 4px/*{cornerRadius}*/; -webkit-border-bottom-right-radius: 4px/*{cornerRadius}*/; -khtml-border-bottom-right-radius: 4px/*{cornerRadius}*/; border-bottom-right-radius: 4px/*{cornerRadius}*/; }
+
+/* Overlays */
+.ui-widget-overlay { background: #aaaaaa/*{bgColorOverlay}*/ url(images/ui-bg_flat_0_aaaaaa_40x100.png)/*{bgImgUrlOverlay}*/ 50%/*{bgOverlayXPos}*/ 50%/*{bgOverlayYPos}*/ repeat-x/*{bgOverlayRepeat}*/; opacity: .3;filter:Alpha(Opacity=30)/*{opacityOverlay}*/; }
+.ui-widget-shadow { margin: -8px/*{offsetTopShadow}*/ 0 0 -8px/*{offsetLeftShadow}*/; padding: 8px/*{thicknessShadow}*/; background: #aaaaaa/*{bgColorShadow}*/ url(images/ui-bg_flat_0_aaaaaa_40x100.png)/*{bgImgUrlShadow}*/ 50%/*{bgShadowXPos}*/ 50%/*{bgShadowYPos}*/ repeat-x/*{bgShadowRepeat}*/; opacity: .3;filter:Alpha(Opacity=30)/*{opacityShadow}*/; -moz-border-radius: 8px/*{cornerRadiusShadow}*/; -khtml-border-radius: 8px/*{cornerRadiusShadow}*/; -webkit-border-radius: 8px/*{cornerRadiusShadow}*/; border-radius: 8px/*{cornerRadiusShadow}*/; }
\ No newline at end of file

diff --git a/karmaworld/assets/css/lightbox.css b/karmaworld/assets/css/lightbox.css
deleted file mode 100644 (file)
index 4387470..0000000
--- a/karmaworld/assets/css/lightbox.css
+++ /dev/null
@@ -1,209 +0,0 @@
-/* MODAL CONTENT */
-.modal_content
-{
-  width: 100%;
-  height: 100%;
-  position: absolute;
-  top: 0px;
-  left: 0px;
-  background-color: rgba(0, 0, 0, .8);
-  z-index: 999;
-  display:none;
-}
-
-.lightbox_modal
-{
-  margin: 121px auto 0px;
-  background-color: #000;
-  border: solid 1px rgba(255, 255, 255, .5);
-}
-
-.lightbox_header
-{
-  font-family: "MuseoSlab-700";
-  font-size: 43px;
-  text-align: center;
-  padding-top: 65px;
-  padding-bottom: 54px;
-  color: #FFF;
-}
-
-.lightbox_header.short_row
-{
-  padding-bottom: 15px!important;
-}
-
-.lightbox_subhead
-{
-  font-family: "MuseoSlab-500";
-  font-size: 19px;
-  color: #FFF;
-  text-align: center;
-  padding-bottom: 35px;
-}
-
-/* FORM CONTENT */
-.lightbox_row
-{
-  padding-bottom: 25px;
-}
-
-.lightbox_label
-{
-  font-family: "MuseoSlab-500";
-  font-size: 14px;
-  color: #9f9e9e;
-}
-
-.lightbox_copy
-{
-  font-family: "MuseoSlab-500";
-  font-size: 18px;
-  color: #FFF;
-}
-
-.lightbox_instruction
-{
-  font-family: "MuseoSans-500";
-  font-size: 12px;
-  color: #fff;
-  padding-top: 5px;
-}
-
-.lightbox_instruction a
-{
-  color: #fff;
-  text-decoration: underline;
-}
-
-.lightbox_textfield
-{
-  -webkit-border-radius: 8px!important; /* Safari 3-4, iOS 1-3.2, Android ≤1.6 */
-          border-radius: 8px!important; /* Opera 10.5, IE9+, Safari 5, Chrome, Firefox 4+, iOS 4, Android 2.1+ */
-  font-size: 18px!important;
-  font-family: "MuseoSlab-500"!important;
-  height: 34px!important;
-  background-color: #e3e3e3!important;
-  border: 1px solid #333!important;
-  -webkit-box-shadow: inset 0px 0px 4px 0px rgba( 0, 0, 0, .75 )!important; /* Safari 3-4, iOS 4.0.2 - 4.2, Android 2.3+ */
-          box-shadow: inset 0px 0px 4px 0px rgba( 0, 0, 0, .75 )!important; /* Opera 10.5, IE9+, Firefox 4+, Chrome 6+, iOS 5 */
-}
-
-.lightbox_textarea
-{
-  height: 138px!important;
-}
-
-/* JOIN COURSE */
-.join_course_row
-{
-  text-align: center;
-  padding-bottom: 27px;
-}
-
-#join_course_or
-{
-  font-family: "MuseoSans-300";
-  font-size: 14px;
-  color: #fff;
-}
-
-.lightbox_field_label
-{
-  font-family: "MuseoSlab-700";
-  font-size: 16px;
-  color: #f05a28;
-  text-align: center;
-  padding-bottom: 10px;
-}
-
-#lightbox_search_txt
-{
-  background: url(../img/lightbox_search_icon.png) 5px no-repeat;
-  padding-left: 28px;
-}
-
-.signup_course_row
-{
-  text-align: center;
-  padding-bottom: 15px;
-}
-
-#lightbox_signup_submit
-{
-  margin: 0 auto;
-  width: 108px;
-  padding-bottom: 27px;
-}
-
-#lightbox_signup_submit .lightbox_bevel
-{
-  -webkit-border-radius: 8px; /* Safari 3-4, iOS 1-3.2, Android ≤1.6 */
-          border-radius: 8px; /* Opera 10.5, IE9+, Safari 5, Chrome, Firefox 4+, iOS 4, Android 2.1+ */
-          /* useful if you don't want a bg color from leaking outside the border: */
-  -moz-background-clip: padding; -webkit-background-clip: padding-box; background-clip: padding-box;
-  background-color: #505050;
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#505050), to(#414141)); /* Safari 4+, Chrome */
-  background-image: -webkit-linear-gradient(top, #505050, #414141); /* Chrome 10+, Safari 5.1+, iOS 5+ */
-  background-image:    -moz-linear-gradient(top, #505050, #414141); /* Firefox 3.6-15 */
-  background-image:      -o-linear-gradient(top, #505050, #414141); /* Opera 11.10-12.00 */
-  background-image:         linear-gradient(to bottom, #505050, #414141); /* Firefox 16+, IE10, Opera 12.50+ */
-  padding-bottom: 1px;
-}
-
-#lightbox_signup_submit .button_interior
-{
-  margin-top: -1px;
-  text-align: center;
-  font-family: "MuseoSlab-700";
-  font-size: 16px;
-  padding: 8px;
-  color: #FFF;
-  border: 1px solid #000;
-}
-
-/* LIGHTBOX CLOSE */
-.lightbox_close
-{
-  width: 38px;
-  height: 38px;
-  -webkit-border-radius: 19px; /* Safari 3-4, iOS 1-3.2, Android ≤1.6 */
-          border-radius: 19px; /* Opera 10.5, IE9+, Safari 5, Chrome, Firefox 4+, iOS 4, Android 2.1+ */
-  position: absolute;
-  z-index: 2;
-  top: -19px;
-  right: -19px;
-  border: solid 2px rgba( 255, 255, 255, .5 ) !important;
-  background: rgba(0, 0, 0, .8) url(../img/lightbox_close_x.png) 50% 50% no-repeat!important;
-  cursor: pointer;
-}
-
-/* HAXs! */
-div#file-uploader-label h2
-{
-  font-size: 12pt;
-}
-
-.select_box
-{
-  display:none;
-}
-
-.qq-upload-list
-{
-  display: none;
-}
-
-button.lightbox-button {
-    background:none!important;
-    border:none; 
-    color: #FFF;
-    cursor: pointer;
-    padding:0!important;
-    font-family: "MuseoSlab-700";
-    font-size: 16px;
-}
-
-button.lightbox-button:hover {
-    text-decoration: underline;
-}

diff --git a/karmaworld/assets/css/note_course_pages.css b/karmaworld/assets/css/note_course_pages.css
index e8008a3b07970cee85d32f2d16e8fc86665e77c7..6db9ced37c015e3e91a901f13f49b1fde33a1679 100644 (file)
--- a/karmaworld/assets/css/note_course_pages.css
+++ b/karmaworld/assets/css/note_course_pages.css
@@ -6,7 +6,7 @@ span.course-header-school
 
 #course-header-name
 {
-  font: 2.5em 'museo700';
+  font-size: 2.5em;
 }
 
 #course-header
@@ -20,12 +20,6 @@ span.course-header-school
   margin-top: 20px;
 }
 
-#edit-button,
-#flag-button
-{
-  cursor: pointer;
-}
-
 input.search-courses {
   display: inline;
   margin: 0 0 10px 5px;
@@ -66,3 +60,52 @@ table.dataTable div.note-text {
   margin: 10px 0 10px 0;
 }
 
+table.dataTable span.note-thanks {
+  padding: 10px 0 0 0;
+}
+
+div.return-to-course {
+  background: #f5f5f5;
+  padding: 10px 0 10px 0;
+  font-size: 0.8em;
+}
+
+div#note_header {
+  margin: 20px 0 20px 0;
+}
+
+div.header-title-row {
+  margin: 10px 0 10px 0;
+}
+
+.header-title {
+  font-size: 2.5em;
+}
+
+.modify-button {
+  border-radius: 3px;
+  padding: 5px 10px 5px 10px;
+  margin: 0 5px 0 5px;
+  font-size: 0.8em;
+}
+
+.ui-tabs-panel {
+  border: none;
+  border-top: 1px solid #dfdfdf;
+  padding: 20px 10px 20px 10px;
+}
+
+.ui-tabs-nav li {
+  margin: 0 10px 0 10px;
+  border: 1px solid #dfdfdf;
+}
+
+#tabs {
+  border: none;
+}
+
+#outline-btn,
+#minus-btn,
+#plus-btn {
+  cursor: pointer;
+}
\ No newline at end of file

diff --git a/karmaworld/assets/css/responsive-tables.css b/karmaworld/assets/css/responsive-tables.css
deleted file mode 100644 (file)
index 4765406..0000000
--- a/karmaworld/assets/css/responsive-tables.css
+++ /dev/null
@@ -1,50 +0,0 @@
-/* Foundation v2.1.4 http://foundation.zurb.com */
-/* Artfully masterminded by ZURB  */
-
-/* -------------------------------------------------- 
-   Table of Contents
------------------------------------------------------
-:: Shared Styles
-:: Page Name 1
-:: Page Name 2
-*/
-
-
-/* -----------------------------------------
-   Shared Styles
------------------------------------------ */
-
-table th { font-weight: bold; }
-table td, table th { padding: 9px 10px; text-align: left; }
-
-/* Mobile */
-@media only screen and (max-width: 767px) {
-       
-       table.responsive { margin-bottom: 0; }
-       
-       .pinned { position: absolute; left: 0; top: 0; background: #fff; width: 35%; overflow: hidden; overflow-x: scroll; border-right: 1px solid #ccc; border-left: 1px solid #ccc; }
-       .pinned table { border-right: none; border-left: none; width: 100%; }
-       .pinned table th, .pinned table td { white-space: nowrap; }
-       .pinned td:last-child { border-bottom: 0; }
-       
-       div.table-wrapper { position: relative; margin-bottom: 20px; overflow: hidden; border-right: 1px solid #ccc; }
-       div.table-wrapper div.scrollable table { margin-left: 35%; }
-       div.table-wrapper div.scrollable { overflow: scroll; overflow-y: hidden; }      
-       
-       table.responsive td, table.responsive th { position: relative; white-space: nowrap; overflow: hidden; }
-       table.responsive th:first-child, table.responsive td:first-child, table.responsive td:first-child, table.responsive.pinned td { display: none; }
-       
-}
-
-/* -----------------------------------------
-   Page Name 1
------------------------------------------ */
-
-
-
-
-/* -----------------------------------------
-   Page Name 2
------------------------------------------ */
-
-

diff --git a/karmaworld/assets/js/course.js b/karmaworld/assets/js/course.js
index bb2b9a6d78113c55594a0748a414c3194c3b9303..b0ddc762fc05c9feee7caf8120b46b68d9ac9661 100644 (file)
--- a/karmaworld/assets/js/course.js
+++ b/karmaworld/assets/js/course.js
@@ -56,12 +56,3 @@ window.KARMAWORLD.Course = {
     $("#id_instructor_name").autocomplete(opts);
   }
 };
-
-function dialogWidth() {
-  var bodyWidth = $('body').width();
-  if (bodyWidth < 700) {
-    return bodyWidth;
-  } else {
-    return 700;
-  }
-}

diff --git a/karmaworld/assets/js/note-detail.js b/karmaworld/assets/js/note-detail.js
index b4b3b6a9c1cc66dd47673cc653b8e0836e28f18c..df60c5382068596ff03c451d2742be4aac4a2cb6 100644 (file)
--- a/karmaworld/assets/js/note-detail.js
+++ b/karmaworld/assets/js/note-detail.js
@@ -72,6 +72,9 @@ function writeNoteFrame(contents) {
 }
 
 $(function() {
+
+  $("#tabs").tabs();
+
   $("#thank-button").click(function(event) {
     event.preventDefault();
 
@@ -114,6 +117,35 @@ $(function() {
     }
   });
 
+  $('#note-tag-dialog').dialog({
+    title: "Edit note tags",
+    autoOpen: false,
+    modal: true,
+    show: { effect: 'fade', duration: 500 },
+    width: dialogWidth()
+  });
+
+  $('#edit-note-tags').click(function(event) {
+    $('#note-tag-dialog').dialog("open");
+  });
+
+  $('#save_note_tags').click(function(event) {
+    $.ajax({
+      url: edit_note_tags_url,
+      dataType: 'json',
+      data: $('#note_tags_input').val(),
+      type: 'POST',
+      success: function(data) {
+        $('#note_tags_form').slideUp();
+        $('.tags').empty();
+        $.each(data.fields.tags, function(index, tag) {
+          $('.tags').append($('<span>', { class: 'tag-span', text: tag }));
+        });
+        $('#note-tag-dialog').dialog("close");
+      }
+    });
+  });
+
   $("#note-download-button").click(function(event) {
     if (confirm('It costs 2 karma points to download a note. Are you sure?')) {
       // disable handler so it won't be run again
@@ -153,25 +185,8 @@ $(function() {
         writeNoteFrame("<h3 style='text-align: center'>Sorry, your note could not be retrieved.</h3>");
       }
     });
+  }
+
 
-    $('#edit_note_tags').click(function(event) {
-      $('#note_tags_form').slideToggle();
-    });
 
-    $('#save_note_tags').click(function(event) {
-      $.ajax({
-        url: edit_note_tags_url,
-        dataType: 'json',
-        data: $('#note_tags_input').val(),
-        type: 'POST',
-        success: function(data) {
-          $('#note_tags_form').slideUp();
-          $('.tags').empty();
-          $.each(data.fields.tags, function(index, tag) {
-            $('.tags').append($('<span>', { class: 'tag-span', text: tag }));
-          });
-        }
-      });
-    });
-  }
 });

diff --git a/karmaworld/assets/js/utils.js b/karmaworld/assets/js/utils.js
new file mode 100644 (file)
index 0000000..d621c2a
--- /dev/null
+++ b/karmaworld/assets/js/utils.js
@@ -0,0 +1,9 @@
+
+function dialogWidth() {
+  var bodyWidth = $('body').width();
+  if (bodyWidth < 700) {
+    return bodyWidth;
+  } else {
+    return 700;
+  }
+}

diff --git a/karmaworld/templates/base.html b/karmaworld/templates/base.html
index 575f45eb5ef19c60a5125110996a840360d2778d..462a6533f14598bacc3b803cbdfe7d6ba7b1ede2 100644 (file)
--- a/karmaworld/templates/base.html
+++ b/karmaworld/templates/base.html
@@ -10,13 +10,12 @@
   <link rel="stylesheet" type="text/css" media="all" href="{{ STATIC_URL }}css/fontface/fontface.css">
   <link rel="stylesheet" type="text/css" media="all" href="{{ STATIC_URL }}css/foundation.min.css">
   <link rel="stylesheet" type="text/css" media="all" href="{{ STATIC_URL }}css/global.css">
-  <link rel="stylesheet" href="//code.jquery.com/ui/1.9.2/themes/base/jquery-ui.css">
-  <link rel="stylesheet" href="{{ STATIC_URL }}css/vendor/opentip.css"> <!-- opentip -->
-  <!-- include Font Awesome -->
-  <link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet">
+  <link rel="stylesheet" type="text/css" media="all" href="{{ STATIC_URL }}css/jquery-ui.css">
+  <link rel="stylesheet" href="{{ STATIC_URL }}css/vendor/opentip.css">
+  <link rel="stylesheet" href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css">
 
-  <script src="//ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js"></script>
-  <script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8/jquery-ui.min.js"></script>
+  <script src="//code.jquery.com/jquery-2.1.0.min.js"></script>
+  <script src="//code.jquery.com/ui/1.10.4/jquery-ui.min.js"></script>
   <script type="text/javascript" src="//use.typekit.net/pnc8diw.js"></script>
   <script type="text/javascript">try{Typekit.load();}catch(e){}</script>
 
@@ -57,6 +56,7 @@
     {% block bodyscripts %}
     {% endblock %}
     <!-- end block bodyscripts -->
+    <script src="{{ STATIC_URL }}js/utils.js"></script>
     <script src="{{ STATIC_URL }}js/opentip-jquery-excanvas.min.js"></script>
     <script src="{{ STATIC_URL }}js/foundation.min.js"></script>
     <script src="{{ STATIC_URL }}js/foundation.offcanvas.js"></script>

diff --git a/karmaworld/templates/courses/course_detail.html b/karmaworld/templates/courses/course_detail.html
index 0ea9db7220d49b352dc69cf5a88528cc615f3d1c..896058aa36c648ff4a0a950d9e7f1629fe4b68f2 100644 (file)
--- a/karmaworld/templates/courses/course_detail.html
+++ b/karmaworld/templates/courses/course_detail.html
@@ -42,7 +42,7 @@
         </div>
       </div>
 
-      <div class="row">
+      <div class="row museo700">
         <div class="small-12 columns">
           <span id="course-header-name">{{ course.name }}</span>
 
@@ -51,13 +51,13 @@
 
           {% if user.is_authenticated %}
             {% if user.get_profile.can_edit_items %}
-              <span id="edit-button"> <i class="fa fa-edit"></i> Edit this course</span>&nbsp;&nbsp;
+              <button id="edit-button" class="modify-button"> <i class="fa fa-edit"></i> Edit this course</button>&nbsp;&nbsp;
             {% endif %}
 
             {% if already_flagged %}
               <i class="fa fa-flag"></i> You have reported this course as inappropriate
             {% else %}
-              <span id="flag-button"><i class="fa fa-flag"></i> Report course as inappropriate</span>
+              <button id="flag-button" class="modify-button"><i class="fa fa-flag"></i> Report course as inappropriate</button>
             {% endif %}
           {% else %}
             <i class="fa fa-flag"></i> Log in to flag a course as inappropraite

diff --git a/karmaworld/templates/courses/course_list.html b/karmaworld/templates/courses/course_list.html
index 78f0be360ae00cb038ee13218eebcd0584696cab..ce0463e3fcdc77eb4d372eed1ab9456f076bef34 100644 (file)
--- a/karmaworld/templates/courses/course_list.html
+++ b/karmaworld/templates/courses/course_list.html
@@ -25,66 +25,12 @@
   <script src="{{ STATIC_URL }}js/course-list.js"></script>
 {% endblock %}
 
-<<<<<<< HEAD
 {% block bodyscripts %}
   <script src="{{ STATIC_URL }}js/jquery.dataTables.min.js"></script>
   <script src="{{ STATIC_URL }}js/jquery.backstretch.min.js"></script>
   <script>
     $("#splash").backstretch("{{ STATIC_URL }}img/banner.jpg");
   </script>
-=======
-  // load dataTable for course data
-  $('#data_table_list').dataTable({
-    // remove the default filter label
-    'oLanguage': {
-      'sSearch': '',
-    },
-    // we will set column widths explicitly
-    'bAutoWidth': false,
-    // don't provide a option for the user to change the table page length
-    'bLengthChange': false,
-    // sepcify the number of rows in a page
-    'iDisplayLength': 20,
-    // Position the filter bar at the top
-    'sDom': '<"top"f>rt<"bottom"p><"clear">', 
-    // Specify options for each column
-    "aoColumnDefs": [ 
-      {
-        // 4th element: thanks
-        "aTargets": [ 6 ],
-        "bSortable": true,
-        "bVisible": true,
-        "aDataSort": [ 3 ]
-      },
-      {
-        // 3rd element: notes
-        "aTargets": [ 5 ],
-        "bSortable": true,
-        "bVisible": true,
-        "aDataSort": [ 2 ]
-      },
-      {
-        // 2nd element: date
-        "aTargets": [ 4 ],
-        "bSortable": true,
-        "bVisible": true,
-        "aDataSort": [ 1 ]
-      },
-      {
-        // 1st element: "sort by" label
-        "aTargets": [ 0 ],
-        "bSortable": false,
-        "bVisible": true
-      }
-    ],
-    // Initial sorting
-    'aaSorting': [[6,'desc']]
-  });
-  $('.dataTables_filter input').attr("placeholder", "search courses");
-  // TODO: can't prepend html to .dataTables_filter input html for fontawesome search icon
-});
-</script>
->>>>>>> master
 {% endblock %}
 
 {% block content %}

diff --git a/karmaworld/templates/courses/course_list_entry.html b/karmaworld/templates/courses/course_list_entry.html
index 101277d7fb4a97b2c288f06a030ff726e733dc9e..89459afcdcdeb8f0b775650256d9ad5c2c123161 100644 (file)
--- a/karmaworld/templates/courses/course_list_entry.html
+++ b/karmaworld/templates/courses/course_list_entry.html
@@ -34,7 +34,6 @@
 
       <div class="table-entry-third-line">
         <span class="table-note-count"><i class="fa fa-file-text-o"></i>&nbsp;&nbsp;{{ course.file_count }} Notes</span>
-        <span class="table-quiz-count"><i class="fa fa-question"></i>&nbsp;&nbsp;{{ course.quiz_count }} Quizzes </span>
         <span class="table-thanks-count"><i class="fa fa-thumbs-up"></i>&nbsp;&nbsp;{{ course.get_popularity }} Thanks </span>
         <span>Updated {{ course.updated_at|date:"b d, o"|capfirst }}</span>
       </div>

diff --git a/karmaworld/templates/notes/note_detail.html b/karmaworld/templates/notes/note_detail.html
index cd639c9c54de6ed9b597b8d1991b544389e9004a..fc4c3a5574186295a9c22a686ed5efafb10fbb09 100644 (file)
--- a/karmaworld/templates/notes/note_detail.html
+++ b/karmaworld/templates/notes/note_detail.html
@@ -31,189 +31,173 @@
 {% block content %}
   <section id="note_content">
 
-    <div id="note_header" class="hero_gradient_bar">
+    <div class="return-to-course">
       <div class="row">
-        <div class="twelve columns header_subhead">
+        <div class="small-12 columns">
           <a href="{{note.course.get_absolute_url}}">
-            <i class="fa fa-arrow-left"></i>&nbsp;back to {{ note.course.name }}
+            <i class="fa fa-angle-double-left"></i> See all notes for {{ note.course.name }}
           </a>
         </div>
       </div>
+    </div>
+
+    <div id="note_header">
 
       <div class="row">
-        <div class="small-12 columns header_title">
-          {{ note.name }}
-        </div><!-- /note_name -->
+        <div class="small-12 columns">
+          <strong>Lecture note for {{ note.course.name }} </strong>
+          at
+          {% if note.course.department.school %}
+            {{ note.course.department.school.name }}
+          {% else %}
+            {{ note.course.school.name }}
+          {% endif %}
+          &nbsp;&nbsp;
+          <i class="fa fa-thumbs-up"></i> <span id="thank-number">{{ note.thanks }}</span> Thanks
+        </div>
       </div>
 
-      <div class="row">
-        <div id="note_tags" class="twelve columns activity_details_context">
-          <span>Tags: </span>
+      <div class="row museo700">
+        <div class="small-12 columns header-title-row">
+          <span class="header-title">{{ note.name }} </span>
+          {% if user.is_authenticated %}
+            {% if already_thanked %}
+              <button id="thank-button-disabled" class="modify-button disabled opentip"
+                      data-ot="You've already thanked this note"
+                       {% include 'partial/opentip_settings.html' %}>
+                <i class="fa fa-thumbs-up"></i> Thank Note</button>
+            {% else %}
+              <button id="thank-button" class="modify-button"><i class="fa fa-thumbs-up"></i> Thank Note</button>
+              <button id="thank-button-disabled" class="modify-button disabled opentip hide"
+                      data-ot="You've already thanked this note"
+                       {% include 'partial/opentip_settings.html' %}>
+                <i class="fa fa-thumbs-up"></i> Thank Note</button>
+            {% endif %}
+          {% else %}
+            <button id="thank-button-disabled" class="modify-button disabled opentip"
+                      data-ot="Log in to thank this note"
+                       {% include 'partial/opentip_settings.html' %}>
+                <i class="fa fa-thumbs-up"></i> Thank Note</button>
+          {% endif %}
+
+          {% if user.is_authenticated %}
+            {% if already_flagged %}
+              <button id="flag-button-disabled" class="modify-button disabled opentip"
+                      data-ot="You've already reported this note"
+                       {% include 'partial/opentip_settings.html' %}>
+                <i class="fa fa-thumbs-up"></i> Report Note</button>
+            {% else %}
+              <button id="flag-button" class="modify-button"><i class="fa fa-thumbs-up"></i> Report Note</button>
+              <button id="flag-button-disabled" class="modify-button disabled opentip hide"
+                      data-ot="You've already reported this note"
+                       {% include 'partial/opentip_settings.html' %}>
+                <i class="fa fa-thumbs-up"></i> Report Note</button>
+            {% endif %}
+          {% else %}
+            <button id="flag-button-disabled" class="modify-button disabled opentip"
+                      data-ot="Log in to report this note"
+                       {% include 'partial/opentip_settings.html' %}>
+                <i class="fa fa-thumbs-up"></i> Report Note</button>
+          {% endif %}
+
+          {% if user.is_authenticated %}
+            <a href="{{ note.get_fp_url }}">
+              <button id="note-download-button" class="modify-button opentip"
+                      data-ot="It costs 2 karma points to download a note"
+                      {% include 'partial/opentip_settings.html' %}>
+                <i class="fa fa-download"></i> Download Note</button></a>
+          {% else %}
+            <button id="note-download-button-disabled" class="modify-button disabled opentip"
+                      data-ot="Log in to download this note"
+                       {% include 'partial/opentip_settings.html' %}>
+              <i class="fa fa-download"></i> Download Note</button>
+          {% endif %}
+
+          {% if user.get_profile.can_edit_items %}
+            <button id="edit-note-tags" class="modify-button">
+              <i class="fa fa-pencil-square-o"></i> Edit Tags
+            </button>
+          {% endif %}
+
+        </div>
+      </div>
+
+      <div id="note-tags" class="row">
+        <div class="small-12 columns">
+          <strong>Tags: </strong>
           <span class="tags">
             {% for tag in note.tags.all %}
               <span class="tag-span">{{ tag.name }}</span>
             {% endfor %}
           </span>
-          {% if user.get_profile.can_edit_items %}
-            <i id="edit_note_tags" class="fa fa-pencil-square-o"></i>
-          {% endif %}
         </div><!-- /note_tags -->
       </div>
 
-      {% if user.get_profile.can_edit_items %}
+      <div id="note-tag-dialog" class="row">
+        <div class="small-12 columns">
+          <input id="note_tags_input" type="text" value="{% for tag in note.tags.all %}{{ tag.name }}{% if not forloop.last %}, {% endif %}{% endfor %}">
+          <button id="save_note_tags" type=button><i class="fa fa-save"></i> Save</button>
+        </div>
+      </div>
+
+      {% if note.license %}
         <div class="row">
-          <div id="note_tags_form" class="twelve columns activity_details_context hide">
-            <input id="note_tags_input" type="text" value="{% for tag in note.tags.all %}{{ tag.name }}{% if not forloop.last %}, {% endif %}{% endfor %}">
-            <button id="save_note_tags" type=button><i class="fa fa-save"></i> Save</button>
-          </div>
+          <div id="note_pedigree" class="twelve columns activity_details_status">
+            {{ note.license.html|safe }} {% if note.upstream_link %}<a href="{{note.upstream_link}}" target="_blank">{{ note.upstream_link|slice:":80" }}</a>{% endif %}
+          </div><!-- /note_pedigree -->
         </div>
       {% endif %}
 
-      <div class="row">
-        <div id="note_status" class="twelve columns">
-          <div class="activity_details_status">
-            So far, <span id="thank-number" class="activity_details_status_number">{{ note.thanks }}</span> people have completely fallen in love with with these notes.
-          </div><!-- /activity_details_status -->
-          <div class="activity_details_status">
-
-          </div>
-        </div><!-- /note_status -->
-      </div>
-
-      <div class="row">
-        <div id="note_actions" class="large-3 medium-6 small-12 columns small-centered">
-          <div class="row">
-            {% if user.is_authenticated %}
-              <div class="small-4 column">
-                {% if already_flagged %}
-                  <img src="{{ STATIC_URL }}img/note_flag_disabled.png"
-                       alt="note_flag"
-                       width="25" height="35"
-                       data-ot="You've already flagged this note"
-                       {% include 'partial/opentip_settings.html' %}
-                       class="opentip" />
-                {% else %}
-                  <a href="#" id="flag-button">
-                    <img src="{{ STATIC_URL }}img/note_flag.png" alt="note_flag" width="25" height="35" />
-                  </a>
-                {% endif %}
-                <a href="#" id="flag-button-disabled" class="hide">
-                  <img src="{{ STATIC_URL }}img/note_flag_disabled.png" alt="note_flag" width="25" height="35" />
-                </a>
-              </div>
-              <div class="small-4 column">
-                {% if already_thanked %}
-                  <img src="{{ STATIC_URL }}img/note_thank_disabled.png"
-                       alt="note_thank"
-                       width="34" height="34"
-                       data-ot="You've already thanked this note"
-                       {% include 'partial/opentip_settings.html' %}
-                       class="opentip" />
-                {% else %}
-                  <a href="#" id="thank-button">
-                    <img src="{{ STATIC_URL }}img/note_thank.png" alt="note_thank" width="34" height="34"/>
-                  </a>
-                {% endif %}
-                <a href="#" id="thank-button-disabled" class="hide">
-                  <img src="{{ STATIC_URL }}img/note_thank_disabled.png" alt="note_thank" width="34" height="34"/>
-                </a>
-              </div>
-              <div class="small-4 column">
-                <a id="note-download-button" href="{{ note.get_fp_url }}">
-                  <img
-                    src="{{ STATIC_URL }}img/note_download.png"
-                    alt="note_download"
-                    width="51" height="36"
-                    data-ot="It costs 2 karma points to download a note"
-                    {% include 'partial/opentip_settings.html' %}
-                    class="opentip" />
-                </a>
-              </div>
-            {% else %}
-              <div class="small-4 column">
-                <img src="{{ STATIC_URL }}img/note_flag_disabled.png"
-                     alt="note_flag"
-                     width="25" height="35"
-                     data-ot="You need to log in to flag a note"
-                     {% include 'partial/opentip_settings.html' %}
-                     class="opentip" />
+    </div><!-- /note header -->
+
+    <div class="row">
+      <div id="tabs" class="small-12 columns">
+        <ul>
+          <li><a href="#note_container">Note</a></li>
+        </ul>
+        <div id="note_container">
+          {% if pdf_controls %}
+            <div id="zoom-buttons" class="row show-for-medium-up">
+              <div id="outline-btn-wrapper" class="small-1 columns hide show-for-medium-up">
+                <i id="outline-btn" class="zoom-button fa fa-bars fa-2x"></i>
               </div>
-              <div class="small-4 column">
-                <img src="{{ STATIC_URL }}img/note_thank_disabled.png"
-                     alt="note_thank"
-                     width="34" height="34"
-                     data-ot="You need to log in to thank a note"
-                     {% include 'partial/opentip_settings.html' %}
-                     class="opentip" />
+              <div class="small-4 columns">
+                <span>Jump to page:
+                <input id="scroll-to" type="text" style="width: 3em; display: inline" /></span>
               </div>
-              <div class="small-4 column">
-                <img
-                  src="{{ STATIC_URL }}img/note_download_disabled.png"
-                  alt="note_download"
-                  width="51" height="36"
-                  data-ot="You need to log in to download a note"
-                  {% include 'partial/opentip_settings.html' %}
-                  class="opentip" />
+              <div class="small-2 small-centered columns center">
+                <i id="minus-btn" class="zoom-button fa fa-search-minus fa-2x"></i>
+                <i id="plus-btn" class="zoom-button fa fa-search-plus fa-2x"></i>
               </div>
-              {% endif %}
+            </div>
+          {% endif %}
 
+          <div class="row">
+            <div class="small-12 small-centered columns medium-12 large-12 body_copy">
+              {% if note.static_html %}
+                <div class="note-text">
+                  {% if note.has_markdown %}
+                    <span id="note-markdown" data-markdown="{{note.notemarkdown.markdown}}"></span>
+                  {% else %}
+                    <iframe style="border:none; width:100%; min-height: 1000px;"
+                          id="noteframe"></iframe>
+                    <noscript>
+                      {{ note.text }}
+                    </noscript>
+                  {% endif %}
+                </div> <!-- .note-text -->
+
+              {% else %} {# note.static_html #}
+                <div class="note-error">
+                  This document's content is currently unavailable. Please try again later.
+                </div>
+              {% endif %} {# note.static_html #}
+            </div><!-- /body_copy -->
           </div>
-        </div><!-- /note_actions -->
-      </div>
-
-      {% if note.license %}
-      <div class="row">
-        <div id="note_pedigree" class="twelve columns activity_details_status">
-          {{ note.license.html|safe }} {% if note.upstream_link %}<a href="{{note.upstream_link}}" target="_blank">{{ note.upstream_link|slice:":80" }}</a>{% endif %}
-        </div><!-- /note_pedigree -->
-      </div>
-      {% endif %}
-
-      </div><!-- /course_header -->
-
-      {% if pdf_controls %}
-      <div id="zoom-buttons" class="row show-for-medium-up">
-        <div id="outline-btn-wrapper" class="small-1 columns hide show-for-medium-up">
-          <i id="outline-btn" class="zoom-button fa fa-bars fa-2x"></i>
-        </div>
-        <div class="small-4 columns">
-          <span>Jump to page:
-          <input id="scroll-to" type="text" style="width: 3em; display: inline" /></span>
-        </div>
-        <div class="small-2 small-centered columns center">
-          <i id="minus-btn" class="zoom-button fa fa-search-minus fa-2x"></i>
-          <i id="plus-btn" class="zoom-button fa fa-search-plus fa-2x"></i>
-        </div>
-      </div>
-      {% endif %}
 
-
-    <div id="note_container">
-      <div class="row">
-        <div class="small-12 small-centered columns medium-12 large-12 body_copy">
-          {% if note.static_html %}
-            <div class="note-text">
-              {% if note.has_markdown %}
-                <span id="note-markdown" data-markdown="{{note.notemarkdown.markdown}}"></span>
-              {% else %}
-                <iframe style="border:none; width:100%; min-height: 1000px;"
-                      id="noteframe"></iframe>
-                <noscript>
-                  {{ note.text }}
-                </noscript>
-              {% endif %}
-            </div> <!-- .note-text -->
-
-          {% else %} {# note.static_html #}
-            <div class="note-error">
-              This document's content is currently unavailable. Please try again later.
-            </div>
-          {% endif %} {# note.static_html #}
-        </div><!-- /body_copy -->
+        </div><!-- /note_container -->
       </div>
-
-    </div><!-- /note_container -->
-
+    </div>
 
   </section><!--/note_content-->
 

diff --git a/karmaworld/templates/notes/note_list_entry.html b/karmaworld/templates/notes/note_list_entry.html
index de48d3117a4b0e21e13d862341666df31686837b..f9c89d0fa0443b6fdb856782f17690205c3c7dbf 100644 (file)
--- a/karmaworld/templates/notes/note_list_entry.html
+++ b/karmaworld/templates/notes/note_list_entry.html
@@ -10,9 +10,10 @@
           <a href="{{ note.get_absolute_url }}">
             {{ note.name }}</a>
         </span>
+        <span class="hide-for-large-up"></span>
         <span class="note-thanks"><i class="fa fa-thumbs-up"></i> {{ note.thanks }} thanks</span>
       </div>
-      <div class="note-text">{{ note.text|slice:":500" }} &hellip;</div>
+      <div class="note-text show-for-large-up">{{ note.text|slice:":500" }} &hellip;</div>
       <div class="note-tags">
         {% if note.tags.count > 0 %}
           <span class="activity_details_context"><strong>Tags:</strong>