tb_core 1.2.8 → 1.3.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 739d972307395196f258e7586655f5d3e4dc05f4
-  data.tar.gz: 4c96571597213dd796a09b8b7a2616a6987e69ee
+  metadata.gz: c19a45ee39c064d4f8fe5a37e83d2ee26979a73a
+  data.tar.gz: 729eb2c4d3de9ca6993fc8bbff3b5dfd26614e99
 SHA512:
-  metadata.gz: 1de99edf127c590639325dbf5b3241b329b2d5ec211eaff041e590db6a318707a297efa4909aa3354faca84a878ac1d84134dfc01d07d039c780e9ca0a4647a7
-  data.tar.gz: fde33ac415dd3fe5701d098a48f91a9f16191f3b82708776e923986c857e754efa02a18012537338020c3643403ad860785319b54f195c2e12c4b85833c76907
+  metadata.gz: 4a68766b6aaa05c91257c6c80761287f99ede62739efd62e3362477931c1e63af69f75bac9c1cc0f4a67e097e34d2e40ec0d90bbafafda4356e5d305dc3c4c8e
+  data.tar.gz: 3322a942a600a29b95e517522bb30e7d3853d7e5da2c80cf38c89ce99dd7b4098ed013812e37c99bf4c866d731b237fb893fecee5ba9dfc8f2b35b786667334c

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

@@ -1,8 +1,7 @@
 //= require jquery
 //= require jquery_ujs
 //= require tinymce-jquery
-//= require bootstrap/js/bootstrap
-//= require datepicker/js/bootstrap-datepicker
+//= require bootstrap-sprockets
 //= require jquery-ui/jquery-ui
 //= require ../../tb_core
 //= require_self

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

@@ -29,7 +29,7 @@ var updateBadges = function() {
 };
 
 var updateBadge = function(badge_id, count) {
-  var badgeIcon = $('#' + badge_id).find('.dash_icon_badge');
+  var badgeIcon = $('#' + badge_id).find('.dash-icon-badge');
   if(badgeIcon.length === 0) {
     return;
   }

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

@@ -13,15 +13,16 @@ spud.admin.modal = {
     var defaultFooter = modal.find('.modal-footer-default');
     if(options.buttons){
       var newFooter = defaultFooter.clone();
-      newFooter.addClass('modal-footer-additional');
+      newFooter.removeClass('modal-footer-default').addClass('modal-footer-additional');
       newFooter.find('.form-submit').remove();
       for(var key in options.buttons){
-        newFooter.append('<button class="btn '+key+'">'+options.buttons[key]+'</button>');
+        newFooter.append('<button class="btn btn-default '+key+'">'+options.buttons[key]+'</button>');
       }
       defaultFooter.hide();
-      modal.append(newFooter);
+      newFooter.insertAfter(defaultFooter);
     }
     else{
+      $('modal-footer-additional').remove();
       defaultFooter.show();
     }
     modal.modal('show');
@@ -35,13 +36,3 @@ spud.admin.modal = {
 };
 
 })();
-
-function displayModalDialogWithOptions(options){
-  console.warn('displayModalDialogWithOptions() is deprecated, please use spud.admin.modal.displayWithOptions.');
-  spud.admin.modal.displayWithOptions(options);
-}
-
-function hideModalDialog(){
-  console.warn('hideModalDialog() is deprecated, please use spud.admin.modal.hide');
-  spud.admin.modal.hide();
-}

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

@@ -4,128 +4,8 @@ var splitPane;
 
 spud.admin.users = {
   index: function(){
-    splitPane = new spud.admin.SplitPane('.admin-users-split-pane');
-    $('.admin-user-add-btn').on('click', true, clickedAddEditUser);
-    $('.admin-users-split-pane').on('click', '.admin-user-edit-btn', clickedAddEditUser);
-    $('.admin-users-split-pane').on('click', '.admin-user-edit-cancel-btn', clickedCancelAddEditUser);
-    $('.admin-users-split-pane').on('click', '.admin-user-delete-btn', clickedDeleteUser);
-    $('.admin-users-split-pane').on('submit', '.admin-user-form', submittedUserForm);
-    $('body').on('click', '.split-pane-refresh-btn', clickedRefreshButton);
-    if(typeof(FormData) != 'undefined'){
-      _html5Upload = true;
-    }
-  }
-};
-
-var _userHtmlCache;
-var _previouslySelected;
-var _html5Upload;
-
-var clickedAddEditUser = function(e){
-  e.preventDefault();
-  _previouslySelected = splitPane.getActiveItem();
-  _userHtmlCache = splitPane.getContentAreaHtml();
-  var isAdd = e.data;
-  if(isAdd){
-    splitPane.deselectActiveItem();
-  }
-  var title = $(this).attr('title');
-  var url = $(this).attr('href');
-  $.ajax(url, {
-    dataType:'html',
-    success:function(html){
-      splitPane.setContentAreaHtml(html);
-      splitPane.setToolbarTitle(title);
-      if(!_html5Upload){
-        splitPane.find('input[type=file]').each(function(){
-          $(this).replaceWith('<em>File upload requires an HTML5-capable browser.</em>');
-        });
-      }
-    }
-  });
-};
-
-var clickedCancelAddEditUser = function(e){
-  e.preventDefault();
-  splitPane.setContentAreaHtml(_userHtmlCache);
-  splitPane.setActiveItem(_previouslySelected);
-  splitPane.setToolbarTitle('');
-};
 
-var clickedDeleteUser = function(e){
-  e.preventDefault();
-  var url = $(this).attr('href');
-  $.ajax(url, {
-    dataType:'json',
-    type:'post',
-    data: {_method:'delete'},
-    success:function(html){
-      splitPane.removeCurrentlySelectedItem();
-      splitPane.setToolbarTitle('');
-    }
-  });
-};
-
-var submittedUserForm = function(e){
-  e.preventDefault();
-  var form = $(this);
-  var url = form.attr('action');
-
-  var submit = form.find('input[type=submit]');
-  submit.val(submit.attr('data-loading-text')).attr('disabled', true);
-
-  if(_html5Upload){
-    var fd = new FormData();
-    form.find('input, select').each(function(i, input){
-      input = $(input);
-      var name = input.prop('name');
-      var type = input.attr('type');
-      if(type == 'file'){
-        var file = input[0].files[0];
-        if(file !== undefined){
-          fd.append(name, file);
-        }
-      }
-      else if(type == 'checkbox'){
-        if(input.is(':checked')){
-          fd.append(name, input.val());
-        }
-      }
-      else{
-        fd.append(name, input.val());
-      }
-    });
-    var xhr = new XMLHttpRequest();
-    xhr.addEventListener('load', function(e){
-      splitPane.setContentAreaHtml(e.target.response);
-      if(this.status >= 200 && this.status < 400){
-        splitPane.refreshList();
-      }
-    });
-    xhr.open('POST', url);
-    xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
-    xhr.send(fd);
   }
-  else{
-    $.ajax(url, {
-      dataType:'html',
-      type: 'post',
-      data: form.serialize(),
-      success:function(html, textStatus, jqXHR){
-        splitPane.setContentAreaHtml(html);
-        splitPane.refreshList();
-      },
-      error:function(jqXHR, textStatus, errorThrown){
-        splitPane.setContentAreaHtml(jqXHR.responseText);
-      }
-    });
-  }
-};
-
-var clickedRefreshButton = function(e){
-  e.preventDefault();
-  splitPane.refreshList();
 };
 
 })();
-

data/app/assets/stylesheets/admin/core/application.css.scss

@@ -1,406 +1,145 @@
-//= require bootstrap/css/bootstrap
-//= require datepicker/css/datepicker
-//= require jquery-ui//jquery-ui
+//= require jquery-ui/jquery-ui
 //= require_self
-//= require admin/core/login
-//= require admin/core/users
-//= require admin/core/split_pane
+//= require_directory
+
+@import "bootstrap-sprockets";
+@import "bootstrap";
 
 body {
 	background:#eee;
 	background-color:#eee;
 	margin: 0 0;
 }
-a {
-	color:#0073EA;
-	text-decoration:none;
-}
-.btn a:visited {
-	color:none;
-}
-a:hover {
-	text-decoration:underline;
-}
-a:hover .ui-button-text {
-	color:#fff;
-}
+
+// Header
 #header {
-	position: relative;
-	padding: 5px 15px;
-	background:#fc862a;
-	background-image: linear-gradient(top, #fc862a 5%, #f56a0e 53%);
-	background-image: -o-linear-gradient(top, #fc862a 5%, #f56a0e 53%);
-	background-image: -moz-linear-gradient(top, #fc862a 5%, #f56a0e 53%);
-	background-image: -webkit-linear-gradient(top, #fc862a 5%, #f56a0e 53%);
-	background-image: -ms-linear-gradient(top, #fc862a 5%, #f56a0e 53%);
-	background-image: -webkit-gradient(
-		linear,
-		left top,
-		left bottom,
-		color-stop(0.05, #fc862a),
-		color-stop(0.53, #f56a0e)
-	);
-	color:#fff;
-	font: normal 14px/18px sans-serif;
-}
-#header a,
-#header a:visited {
-	color:#eee;
-	font-weight:normal;
-}
-.production-alert-header{
 	padding: 5px 15px;
-	background: #FFFF66;
-	p{
-		font-size: 12px;
-		line-height: 16px;
-		margin: 0;
-	}
-}
-.greeting {
-	color:#fff;
-}
-
-#header #user_meta {
-	float: right;
-}
-
-#header h1 {
-	font: normal 18px/18px sans-serif;
+	background: #333;
 	color: #fff;
-	display: inline;
-}
-#header h1 .site_name {
-	color:#CCC;
-	font-size:.7em;
-}
-#header #multisite_switcher
-{
-	margin:0 15px;
-	line-height:100px;
-}
-#breadcrumbs {
-	background:#fff;
-	height:25px;
-	/*border-top:1px solid rgb(200,148,72);*/
-	border-bottom:1px solid #999;
-	line-height:25px;
-	padding:5px 15px;
-	/*box-shadow: 0px 0px 10px #888;*/
-
-}
-#breadcrumbs a,
-#breadcrumbs a:visited {
-	color:#006699;
-	text-decoration:none;
-}
-#breadcrumbs a:hover {
-	color:#006699;
-	text-decoration:underline;
-}
-#breadcrumbs a.active,
-#breadcrumbs a.active:hover {
-	color:#000;
-	text-decoration:none;
-}
-
-#content {
-	padding:15px 15px;
+	font-size: 14px;
+	h1{
+		font: normal 18px/18px sans-serif;
+		color: #fff;
+		display: inline;
+	}
+	a{
+		color: white;
+	}
 }
 
-div.admin_application {
+// Admin Apps
+.admin-application {
 	width:150px;
 	background:#fff;
-	/*height:150px;*/
 	float:left;
-
 	text-align:center;
 	border:1px solid transparent;
 	border-radius:10px;
-	margin: 0 10px 20px 10px;
-	-webkit-touch-callout: none;
-	-webkit-user-select: none;
-	-khtml-user-select: none;
-	-moz-user-select: none;
-	-ms-user-select: none;
+	margin: 0 20px 20px 0;
+	position: relative;
 	user-select: none;
-}
-div.admin_application:hover {
-	background:#fff;
-	border:1px solid #ccc;
-
-}
-.admin_application a,
-.admin_application a:visited {
-	display:block;
-
-	color:#000;
-	padding:10px 10px;
-	text-decoration:none;
-}
-.admin_application img {
-	width:125px;
-	border:none;
-	height:125px;
+	&:hover{
+		background:#fff;
+		border:1px solid #ccc;
+	}
+	a, a:visited{
+		display:block;
+		color:#000;
+		padding:10px 10px;
+		text-decoration:none;	
+	}
+	img {
+		width: 125px;
+		border: none;
+		height: 125px;
+	}
+	.dash-icon-badge{
+		display: none;
+		position: absolute;
+		right: -15px;
+		top: -15px;
+		width: 36px;
+		height: 36px;
+		background: #e55137;
+		border-radius: 18px;
+		color: white;
+		line-height: 36px;
+		font-size: 15px;
+	}
 }
 
-.detail_wrapper {
+// Detail
+.detail-wrapper {
 	background:#fff;
-	width:960px;
 	min-height:300px;
 	border-radius:10px;
-	margin:15px auto 0px auto;
-}
-.detail_wrapper h2{
-	display:block;
-	line-height:50px;
-	color:#333;
-}
-.detail_wrapper .thumb_wrapper {
-	display:block;
-	width:50px;
-	height:50px;
-	float:left;
-	margin:0 10px 10px 10px;
-}
-.detail_wrapper h2 img {
-
-	width:100px;
-
-
-}
-.data_controls {
-	display:block;
-	margin-top:20px;
-	margin-right:10px;
-	float:right;
-}
-.data-table th {
-	position:relative;
-	padding-right:20px;
-}
-.data_controls{
-	.form-search{
+	margin: 0 auto 20px;
+	padding: 15px;
+	.detail-title{
+		margin: 0 0 15px;
+	}
+	.app-thumbnail{
+		width: 40px;
+		height: 40px;
 		display: inline-block;
+		margin: 0;
 	}
-}
-#details {
-	padding:0 10px;
-	clear:both;
-	overflow: hidden;
-}
-#detail_nav_wrapper {
-	float:left;
-	width:225px;
-	min-height:200px;
-}
-#detail_nav {
-	padding-right:5px;
-}
-#detail_main_wrapper {
-	width:705px;
-	min-height:200px;
-	float:left;
+	.data-controls{
+		float: right;
+	}
+	.pagination{
+		margin-bottom: 0;
+	}
+	.details{
 
-}
-#detail_main {
-	padding-left:5px;
+	}
 }
 
-
+// Forms
 div.field_with_errors {
-    display:inline;
+  display: inline;
 }
-.formError {
-    display:block;
-    color:#F00;
-    margin-left:100px;
+div.field_with_errors label, .form-field-error, .form-errors {
+	color: crimson;
 }
-div.field_with_errors label {
-    color:#F00;
+.date-select{
+	&.form-control{
+		display: inline-block;	
+	}
+	&.year{
+		width: 20%
+	}
+	&.month{
+		width: 35%
+	}
+	&.day{
+		width: 20%
+	}
+}
+.datetime-select{
+	&.form-control{
+		display: inline-block;
+	}
+	&.year{
+		width: 20%;
+	}
+	&.month{
+		width: 22.3%;
+	}
+	&.day, &.hour, &.minute{
+		width: 15%;
+	}
 }
 
-
-/*Table Layout*/
+// Tables
 td.no-wrap{
 	white-space: nowrap;
 }
-.admin-table {
-	width:100%;
-	border:1px solid #eee;
-	border-radius:10px;
-	border-collapse:collapse;
-}
-.admin-table thead tr{
-  background:#424242;
-	color:#fff;
-
-	border-radius:10px 10px 0 0;
-}
-.admin-table th {
-	font-weight:normal;
-	text-align:left;
-	padding: 5px 10px;
-}
-.admin-table td {
-	vertical-align:top;
-	padding: 5px 10px;
-}
-.admin-table tbody tr{
-	-webkit-transition: background 0.1s ease-in;
-	-moz-transition: background 0.1s ease-in;
-}
-.admin-table tbody tr:nth-child(even){
-	background: #f1f1f1;
-}
-.admin-table tbody tr:hover{
-	background: #FFEDDF;
-}
-.admin-table tbody tr:nth-child(even):hover{
-	background: #FAE7D9;
-}
-
-.admin-table th .current {
-  padding-right: 12px;
-  background-repeat: no-repeat;
-  background-position: right center;
-}
-.admin-table th a, .admin-table th a:visited {
-	color:#fff;
-}
-
-.admin-table th a:hover {
-	text-decoration: none;
-}
-
-.admin-table th .asc {
-  background-image: image-url("admin/up_arrow.gif");
-}
-
-.admin-table th .desc {
-  background-image: image-url("admin/down_arrow.gif");
-}
-
-
-.info_card {
-	width:400px;
-	padding:0 10px;
-	margin:0 auto;
-	border: 1px solid #BFBAB0;
-    background-color: #F2EFE9;
-    background: #F2EFE9 -webkit-gradient(linear, left top, left 60%, from(#FFFFFF), to(#E9EFF2)) ;
-    background: -moz-linear-gradient(top, #FFFFFF 0%, #E9EFF2 100%);
-    filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#ffFFFFFF,endColorstr=#ffE9EFF2);
-    -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr=#ffFFFFFF,endColorstr=#ffE9EFF2)";
-}
-.right_floated{
-	float:right;
-}
-.left_floated {
-	float:left;
-}
-.edit_controls {
-	float:right;
-	clear:both;
-	padding:2px;
-}
-.page_list
-{
-	border-top:1px solid #eee;
-	padding-top:10px;
-}
-.page_row {
-	clear:both;
-	/*height:42px;*/
-	line-height:42px;
-	padding-left:5px;
-}
-.page_row:hover {
-	background:#eee;
-}
-.left_guide {
-	border-left:2px solid #999;
-	margin-left:20px;
-}
-.formtab_buttons li {
-	width:auto;
-	clear:none;
-}
-.formtab label {
-	float:none;
-	margin:0;
-}
-.formtab {
-	width:910px;
-	padding: 0 0 !important;
-	overflow-y:visible;
-}
-.formtab textarea {
-	width:910px;
-
-	margin: 0 0;
-	height:200px;
-}
-form h2 {
-	line-height:20px !important;
-	height:20px;
-}
-
-form input.full-width {
-	display: block;
-	width: 99%;
-}
-/* Pagination
---------------- */
-.spud_admin_pagination{
-	margin: 10px 0;
-	overflow: hidden;
-}
-.spud_admin_pagination .pagination{
-	float: right;
-}
-
-/*Retina CSS*/
-@media only screen and (-webkit-min-device-pixel-ratio: 1.5),
-	only screen and (-o-min-device-pixel-ratio: 3/2),
-	only screen and (min--moz-device-pixel-ratio: 1.5),
-	only screen and (min-device-pixel-ratio: 1.5) {
-
-}
-
-.footer {
-	clear:both;
-	margin-top:10px;
-	position:absolute;
-	text-align:right;
-	font-size:.8em;
-	right:10px;
-	height:10px;
-	bottom:10px;
-}
-
-/* Modal Dialogs
----------------*/
-#modal_window .form-actions-no-modal{
-	display: none;
+td.table-actions{
+	white-space: nowrap;
+	text-align: right;
 }
-
-/* Admin Dashboard */
-a .image_wrapper {
-	position: relative;
-	.dash_icon_badge {
-		display: none;
-		position: absolute;
-		right: -28px;
-		top: -28px;
-		width: 40px;
-		height: 40px;
-		background: #e55137;
-		-moz-border-radius: 70px;
-		-webkit-border-radius: 20px;
-		border-radius: 20px;
-		color: white;
-		line-height: 36px;
-		font-size: 15px;
-	}
+.table .nesting-spacer{
+  display: inline-block;
+  width: 5%;
 }