Commit eea55446 authored by merlinofchaos's avatar merlinofchaos

Checkpoint checkin

parent 3a69a04c
/* $Id$ */
.views-tabset {
background: #E0E5E8;
background: transparent;
}
.views-tabset .views-tab fieldset {
......@@ -12,8 +12,8 @@
list-style-type: none !important;
list-style-image: none !important;
border-bottom: #5C707E 1px solid;
margin: 0;
padding: 0;
margin: 0;
}
.views-tabset .views-tabs ul li {
......@@ -22,7 +22,7 @@
background: #B3BEC6;
border-top: #5C707E 1px solid;
border-right: #5C707E 1px solid;
border-left: #5C707E 1px solid;
border-left: #5C707E 0px solid;
margin: 0;
padding: 3px 3px 3px 6px;
}
......@@ -38,8 +38,10 @@
.views-tabset .views-tabs {
float: left;
width: 119px;
border-bottom: #5C707E 1px solid;
border-left: #5C707E 1px solid;
background: #E0E5E8; float: left;
width: 118px;
}
.views-tabset .extra {
......@@ -52,6 +54,7 @@
.views-tabset .views-display {
border: #5C707E 1px solid;
border-bottom: 0px;
margin-left: 118px; /* 120 -1 causes borders to overlap */
min-height: 302px;
_height: 300px; /* stupid IE hack */
......@@ -124,10 +127,10 @@
}
.views-basic-info {
margin-top: 0.75em;
padding: 0.25em;
margin: 0.5em 0em 0 0;
padding: 0.5em;
font-weight: bold;
background: #E0E5E8;
background: transparent;
}
.views-display dl {
......@@ -158,23 +161,40 @@
#views-ajax-pad {
background: #E0E5E8;
background: transparent;
margin-top: 0px;
min-height: 200px;
_height: 200px; /* stupid IE */
}
#views-ajax-title {
background: transparent;
margin-top: 0;
margin-left: 118px;
padding: 0.25em 1em;
border-left: #5C707E 1px solid;
border-right: #5C707E 1px solid;
font-weight: bold;
}
#views-ajax-pad .message {
padding-top: 75px;
margin-left: 118px;
border: #5C707E 1px solid;
padding: 3em 0em;
text-align: center;
background: #ffd;
}
#views-ajax-pad form {
background: #ffd;
margin-left: 118px;
border: #5C707E 1px solid;
border-top: #D1D8DD 4px solid;
border-top: #D1D8DD 1px solid;
}
.views-override {
padding: 0.5em 1em 0em 1em;
}
#views-ajax-pad .form-buttons {
......@@ -199,21 +219,6 @@
display: none;
}
#views-ajax-title {
margin-left: 118px;
padding-left: 5px;
border-left: 1px solid black;
border-right: 1px solid black;
height: 1.5em;
white-space: nowrap;
overflow: hide;
font-weight: bold;
}
#views-ajax-form {
background-color: #E0E5E8;
}
html.js #views-ajax-pad {
display: block;
}
......
......@@ -624,10 +624,7 @@ function views_ui_edit_details_form_submit($form, &$form_state) {
$form_state['view']->description = $form_state['values']['description'];
$form_state['view']->tag = $form_state['values']['tag'];
views_ui_cache_set($form_state['view']);
if (empty($form_state['ajax'])) {
drupal_set_message(t('Your changes have been saved.'));
$form_state['redirect'] = 'admin/build/views/edit/' . $form_state['view']->name;
}
$form_state['redirect'] = 'admin/build/views/edit/' . $form_state['view']->name;
}
/**
......@@ -794,7 +791,7 @@ function theme_views_ui_rearrange_form($form) {
$row[] = drupal_render($form[$id]['name']);
$form[$id]['weight']['#attributes']['class'] = 'weight';
$row[] = drupal_render($form[$id]['weight']);
$row[] = drupal_render($form[$id]['removed']) . l('<span>' . t('Remove') . '</span>', 'javascript:void()', array('attributes' => array('id' => 'views-remove-link-' . $id, 'class' => 'views-button-remove views-remove-link', 'alt' => t('Remove this item'), 'title' => t('Remove this item')), 'html' => true));
$row[] = drupal_render($form[$id]['removed']) . l('<span>' . t('Remove') . '</span>', 'javascript:void()', array('attributes' => array('id' => 'views-remove-link-' . $id, 'class' => 'views-button-remove views-remove-link', 'alt' => t('Remove this item'), 'title' => t('Remove this item')), 'html' => true));
$rows[] = array('data' => $row, 'class' => 'draggable', 'id' => 'views-row-' . $id);
}
......@@ -1152,7 +1149,7 @@ function views_ui_add_info($type, $view, $display) {
$types = views_object_types();
$output = '';
$output .= l('<span>' . t('Rearrange') . '</span>', "admin/build/views/nojs/rearrange/$view->name/$display->id/$type", array('attributes' => array('class' => 'views-button-rearrange views-ajax-link'), 'html' => true));
$output .= l('<span>' . t('Rearrange') . '</span>', "admin/build/views/nojs/rearrange/$view->name/$display->id/$type", array('attributes' => array('class' => 'views-button-rearrange views-ajax-link'), 'html' => true));
$output .= l('<span>' . t('Add') . '</span>', "admin/build/views/nojs/add-item/$view->name/$display->id/$type", array('attributes' => array('class' => 'views-button-add views-ajax-link'), 'html' => true));
......
......@@ -911,7 +911,7 @@ class views_display_plugin_page extends views_display_plugin {
$form['path'] = array(
'#type' => 'textfield',
'#description' => t('This view will be displayed by visiting this path on your site.'),
'#default_value' => block_description,
'#default_value' => $this->get_option('path'),
);
break;
}
......
......@@ -96,7 +96,6 @@ Drupal.Views.Ajax.ajaxResponse = function(data) {
// Go through and add any requested tabs
if (data.tab) {
for (id in data.tab) {
console.log(data.tab[id]['title']);
$('#views-tabset').addTab(id, data.tab[id]['title'], 0);
$(id).html(data.tab[id]['body']);
$(id).addClass('views-tab');
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment