!!BUGFIX: Refactored CSS and Requirements: Created more specific css-files to reduce side-effects and ease debugging, moved generic form-styling from cms/css/cms_*.css into sapphire/css/Form.css.

!!BUGFIX: Ordered Requirement-inclusions in CMSMain/LeftAndMain to be more coherent (avoiding duplicate Requirement-calls)
ENHANCEMENT: Removed some css-rules disabled by comments
ENHANCEMENT: coding-conventions (see r42726)
FEATURE: Added Profile-page with LeftAndMain->myprofile()

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42728 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2007-09-27 20:56:55 +00:00
parent 5816ce849f
commit 0fddddb87e
14 changed files with 377 additions and 800 deletions

View File

@ -47,8 +47,6 @@ class AssetAdmin extends LeftAndMain {
Requirements::javascript("sapphire/javascript/Security_login.js"); Requirements::javascript("sapphire/javascript/Security_login.js");
Requirements::javascript("jsparty/SWFUpload/SWFUpload.js"); Requirements::javascript("jsparty/SWFUpload/SWFUpload.js");
// Requirements::javascript('sapphire/javascript/TableListField.js');
// Include the right JS] // Include the right JS]
// Hayden: This didn't appear to be used at all // Hayden: This didn't appear to be used at all
/*$fileList = new FileList("Form_EditForm_Files", null); /*$fileList = new FileList("Form_EditForm_Files", null);
@ -58,6 +56,8 @@ class AssetAdmin extends LeftAndMain {
Requirements::javascript("jsparty/greybox/AmiJS.js"); Requirements::javascript("jsparty/greybox/AmiJS.js");
Requirements::javascript("jsparty/greybox/greybox.js"); Requirements::javascript("jsparty/greybox/greybox.js");
Requirements::css("jsparty/greybox/greybox.css"); Requirements::css("jsparty/greybox/greybox.css");
Requirements::css("cms/css/AssetAdmin.css");
} }
/** /**

View File

@ -1,5 +1,4 @@
<?php <?php
/** /**
* The main "content" area of the CMS. * The main "content" area of the CMS.
* This class creates a 2-frame layout - left-tree and right-form - to sit beneath the main * This class creates a 2-frame layout - left-tree and right-form - to sit beneath the main
@ -7,84 +6,24 @@
* @todo Create some base classes to contain the generic functionality that will be replicated. * @todo Create some base classes to contain the generic functionality that will be replicated.
*/ */
class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionProvider { class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionProvider {
static $tree_class = "SiteTree"; static $tree_class = "SiteTree";
static $subitem_class = "Member"; static $subitem_class = "Member";
/** /**
* SiteTree Columns that can be filtered using the the Site Tree Search button * SiteTree Columns that can be filtered using the the Site Tree Search button
*/ */
static $site_tree_filter_options = array('ClassName' => 'Page Type', 'Status' => 'Status', static $site_tree_filter_options = array(
'MetaDescription' => 'Description', 'MetaKeywords' => 'Keywords'); 'ClassName' => 'Page Type',
'Status' => 'Status',
'MetaDescription' => 'Description',
'MetaKeywords' => 'Keywords'
);
public function init() { public function init() {
parent::init(); parent::init();
Requirements::javascript(MCE_ROOT . "tiny_mce_src.js");
Requirements::javascript("jsparty/tiny_mce_improvements.js");
Requirements::javascript("jsparty/hover.js");
Requirements::javascript("jsparty/scriptaculous/controls.js");
Requirements::javascript("cms/javascript/MemberList.js");
Requirements::javascript("cms/javascript/CMSMain.js");
Requirements::javascript("cms/javascript/CMSMain_left.js");
Requirements::javascript("cms/javascript/CMSMain_right.js");
Requirements::javascript("cms/javascript/ForumAdmin.js");
Requirements::javascript("cms/javascript/SideTabs.js");
Requirements::javascript("cms/javascript/TaskList.js");
Requirements::javascript("cms/javascript/CommentList.js");
Requirements::javascript("cms/javascript/SideReports.js");
Requirements::javascript("cms/javascript/LangSelector.js");
Requirements::javascript('cms/javascript/TranslationTab.js');
Requirements::javascript("sapphire/javascript/UpdateURL.js");
Requirements::javascript("sapphire/javascript/UniqueFields.js");
Requirements::javascript("sapphire/javascript/RedirectorPage.js");
Requirements::css("sapphire/css/FieldEditor.css");
Requirements::javascript("sapphire/javascript/FieldEditor.js");
Requirements::javascript("sapphire/javascript/TableListField.js");
Requirements::javascript("sapphire/javascript/TableField.js");
Requirements::javascript("sapphire/javascript/ComplexTableField.js");
Requirements::javascript("sapphire/javascript/RelationComplexTableField.js");
Requirements::javascript("survey/javascript/SurveyResponses.js");
Requirements::javascript("survey/javascript/FormResponses.js");
Requirements::javascript( 'sapphire/javascript/DataReport.js' );
Requirements::css("survey/css/SurveyFilter.css");
Requirements::javascript("sapphire/javascript/SelectionGroup.js");
// For Parents
Requirements::javascript("parents/javascript/NotifyMembers.js");
// For Tourism
Requirements::css("tourism/css/SurveyCMSMain.css");
Requirements::javascript("tourism/javascript/QuotasReport.js");
// For Mikano
Requirements::javascript("sapphire/javascript/ReportField.js");
// For Ptraining
Requirements::javascript("ptraining/javascript/BookingList.js");
// For Forum
Requirements::javascript("forum/javascript/ForumAccess.js");
// For Gallery
Requirements::javascript('gallery/javascript/GalleryPage_CMS.js');
Requirements::themedCSS('typography');
// For Widgets
Requirements::css('cms/css/WidgetAreaEditor.css');
Requirements::javascript('cms/javascript/WidgetAreaEditor.js');
// HACK ALERT:
// We need a better way of including all of the CSS that *might* be used by this application.
// Perhaps the ajax responses can include some instructions to go get more CSS / JavaScript?
if(Director::fileExists('mot')) {
Requirements::css("mot/css/WorkflowWidget.css");
}
// We don't want this showing up in every ajax-response, it should always be present in a CMS-environment // We don't want this showing up in every ajax-response, it should always be present in a CMS-environment
if(!Director::is_ajax()) { if(!Director::is_ajax()) {
Requirements::javascriptTemplate("cms/javascript/tinymce.template.js", array( Requirements::javascriptTemplate("cms/javascript/tinymce.template.js", array(
@ -92,6 +31,28 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
"BaseURL" => Director::absoluteBaseURL(), "BaseURL" => Director::absoluteBaseURL(),
)); ));
} }
Requirements::javascript('cms/javascript/CMSMain.js');
Requirements::javascript('cms/javascript/CMSMain_left.js');
Requirements::javascript('cms/javascript/CMSMain_right.js');
/**
* HACK ALERT: Project-specific requirements
*
* We need a better way of including all of the CSS that *might* be used by this application.
* Perhaps the ajax responses can include some instructions to go get more CSS / JavaScript?
*/
Requirements::css("mot/css/WorkflowWidget.css");
Requirements::css("survey/css/SurveyFilter.css");
Requirements::javascript("survey/javascript/SurveyResponses.js");
Requirements::javascript("survey/javascript/FormResponses.js");
Requirements::javascript("parents/javascript/NotifyMembers.js");
Requirements::css("tourism/css/SurveyCMSMain.css");
Requirements::javascript("tourism/javascript/QuotasReport.js");
Requirements::javascript("sapphire/javascript/ReportField.js");
Requirements::javascript("ptraining/javascript/BookingList.js");
Requirements::javascript("forum/javascript/ForumAccess.js");
Requirements::javascript('gallery/javascript/GalleryPage_CMS.js');
} }
//------------------------------------------------------------------------------------------// //------------------------------------------------------------------------------------------//
@ -1338,7 +1299,7 @@ JS
* Return a dropdown with existing languages * Return a dropdown with existing languages
*/ */
function LangSelector() { function LangSelector() {
$langs = i18n::get_existing_languages('SiteTree'); $langs = i18n::get_existing_content_languages('SiteTree');
return new DropdownField("LangSelector","Language",$langs,Translatable::current_lang()); return new DropdownField("LangSelector","Language",$langs,Translatable::current_lang());
} }
@ -1347,7 +1308,7 @@ JS
* Determine if there are more than one languages in our site tree * Determine if there are more than one languages in our site tree
*/ */
function MultipleLanguages() { function MultipleLanguages() {
$langs = i18n::get_existing_languages('SiteTree'); $langs = i18n::get_existing_content_languages('SiteTree');
return (count($langs) > 1); return (count($langs) > 1);
} }
@ -1357,6 +1318,7 @@ JS
*/ */
function EditingLang() { function EditingLang() {
if(!Translatable::is_default_lang()) { if(!Translatable::is_default_lang()) {
var_dump(Translatable::current_lang());
return i18n::get_language_name(Translatable::current_lang()); return i18n::get_language_name(Translatable::current_lang());
} else { } else {
return false; return false;

View File

@ -6,6 +6,7 @@ class CommentAdmin extends LeftAndMain {
parent::init(); parent::init();
Requirements::javascript("cms/javascript/CommentAdmin_right.js"); Requirements::javascript("cms/javascript/CommentAdmin_right.js");
Requirements::css("cms/css/CommentAdmin.css");
} }
public function Link($action = null) { public function Link($action = null) {

View File

@ -11,6 +11,12 @@ abstract class LeftAndMain extends Controller {
function init() { function init() {
Director::set_site_mode('cms'); Director::set_site_mode('cms');
// set language
$member = Member::currentUser();
if(!empty($member->Lang)) {
i18n::set_locale($member->Lang);
}
parent::init(); parent::init();
@ -44,45 +50,87 @@ abstract class LeftAndMain extends Controller {
Security::permissionFailure($this, $messageSet); Security::permissionFailure($this, $messageSet);
return; return;
} }
Requirements::javascript('jsparty/prototype.js');
Requirements::javascript('jsparty/behaviour.js');
Requirements::javascript('jsparty/prototype_improvements.js');
Requirements::javascript('jsparty/loader.js');
Requirements::javascript('jsparty/hover.js');
Requirements::javascript('jsparty/layout_helpers.js');
Requirements::javascript("jsparty/prototype.js"); Requirements::javascript(MCE_ROOT . 'tiny_mce_src.js');
Requirements::javascript("jsparty/behaviour.js"); Requirements::javascript('jsparty/tiny_mce_improvements.js');
Requirements::javascript("jsparty/prototype_improvements.js");
Requirements::javascript("jsparty/loader.js");
Requirements::javascript("jsparty/layout_helpers.js"); Requirements::javascript('jsparty/scriptaculous/effects.js');
Requirements::javascript("jsparty/tree/tree.js"); Requirements::javascript('jsparty/scriptaculous/dragdrop.js');
Requirements::css("jsparty/tree/tree.css"); Requirements::javascript('jsparty/scriptaculous/controls.js');
Requirements::javascript("jsparty/scriptaculous/effects.js");
Requirements::javascript("jsparty/scriptaculous/dragdrop.js");
Requirements::javascript("jsparty/tabstrip/tabstrip.js"); Requirements::css('jsparty/greybox/greybox.css');
Requirements::css("jsparty/tabstrip/tabstrip.css"); Requirements::javascript('jsparty/greybox/AmiJS.js');
Requirements::javascript('jsparty/greybox/greybox.js');
Requirements::javascript('jsparty/tree/tree.js');
Requirements::css('jsparty/tree/tree.css');
Requirements::javascript('jsparty/tabstrip/tabstrip.js');
Requirements::css("jsparty/greybox/greybox.css"); Requirements::css('jsparty/tabstrip/tabstrip.css');
Requirements::javascript("jsparty/greybox/AmiJS.js");
Requirements::javascript("jsparty/greybox/greybox.js");
Requirements::javascript("cms/javascript/LeftAndMain.js");
Requirements::javascript("cms/javascript/LeftAndMain_left.js");
Requirements::javascript("cms/javascript/LeftAndMain_right.js");
Requirements::javascript("jsparty/calendar/calendar.js");
Requirements::javascript("jsparty/calendar/lang/calendar-en.js");
Requirements::javascript("jsparty/calendar/calendar-setup.js");
Requirements::css("sapphire/css/CalendarDateField.css");
Requirements::css("jsparty/calendar/calendar-win2k-1.css");
Requirements::javascript('sapphire/javascript/Validator.js');
Requirements::css("sapphire/css/SubmittedFormReportField.css");
Requirements::css('cms/css/TinyMCEImageEnhancement.css'); Requirements::css('cms/css/TinyMCEImageEnhancement.css');
Requirements::javascript("jsparty/SWFUpload/SWFUpload.js");
Requirements::javascript("cms/javascript/Upload.js");
Requirements::javascript("sapphire/javascript/Security_login.js");
Requirements::javascript('cms/javascript/TinyMCEImageEnhancement.js'); Requirements::javascript('cms/javascript/TinyMCEImageEnhancement.js');
Requirements::javascript('cms/javascript/LeftAndMain.js');
Requirements::javascript('cms/javascript/LeftAndMain_left.js');
Requirements::javascript('cms/javascript/LeftAndMain_right.js');
Requirements::css('sapphire/css/Form.css');
Requirements::javascript('cms/javascript/MemberList.js');
Requirements::javascript('cms/javascript/ForumAdmin.js');
Requirements::javascript('cms/javascript/SideTabs.js');
Requirements::javascript('cms/javascript/TaskList.js');
Requirements::javascript('cms/javascript/CommentList.js');
Requirements::javascript('cms/javascript/SideReports.js');
Requirements::javascript('cms/javascript/LangSelector.js');
Requirements::javascript('cms/javascript/TranslationTab.js');
Requirements::javascript('sapphire/javascript/Validator.js');
Requirements::javascript('sapphire/javascript/UpdateURL.js');
Requirements::javascript('sapphire/javascript/UniqueFields.js');
Requirements::javascript('sapphire/javascript/RedirectorPage.js');
Requirements::javascript('sapphire/javascript/DataReport.js' );
Requirements::css('sapphire/css/SubmittedFormReportField.css');
Requirements::javascript('sapphire/javascript/FieldEditor.js');
Requirements::css('sapphire/css/FieldEditor.css');
Requirements::css('sapphire/css/TableListField.css');
Requirements::css('sapphire/css/ComplexTableField.css');
Requirements::javascript('sapphire/javascript/TableListField.js');
Requirements::javascript('sapphire/javascript/TableField.js');
Requirements::javascript('sapphire/javascript/ComplexTableField.js');
Requirements::javascript('sapphire/javascript/RelationComplexTableField.js');
Requirements::css('sapphire/css/TreeDropdownField.css');
Requirements::css('sapphire/css/CheckboxSetField.css');
Requirements::javascript('jsparty/calendar/calendar.js');
Requirements::javascript('jsparty/calendar/lang/calendar-en.js');
Requirements::javascript('jsparty/calendar/calendar-setup.js');
Requirements::css('sapphire/css/CalendarDateField.css');
Requirements::css('jsparty/calendar/calendar-win2k-1.css');
Requirements::javascript('sapphire/javascript/SelectionGroup.js');
Requirements::css('sapphire/css/SelectionGroup.css');
Requirements::javascript('jsparty/SWFUpload/SWFUpload.js');
Requirements::javascript('cms/javascript/Upload.js');
Requirements::themedCSS('typography');
// For Widgets
Requirements::css('cms/css/WidgetAreaEditor.css');
Requirements::javascript('cms/javascript/WidgetAreaEditor.js');
Requirements::javascript("sapphire/javascript/Security_login.js");
$dummy = null; $dummy = null;
$this->extend('augmentInit', $dummy); $this->extend('augmentInit', $dummy);
@ -665,6 +713,17 @@ JS;
$id = isset($_REQUEST['ID']) ? $_REQUEST['ID'] : $this->currentPageID(); $id = isset($_REQUEST['ID']) ? $_REQUEST['ID'] : $this->currentPageID();
if($id) return $this->getEditForm($id); if($id) return $this->getEditForm($id);
} }
public function myprofile() {
$form = $this->Member_ProfileForm();
return $this->customise(array(
'Form' => $form
))->renderWith('BlankPage');
}
public function Member_ProfileForm() {
return new Member_ProfileForm($this, 'Member_ProfileForm', Member::currentUser());
}
public function printable() { public function printable() {
$id = $_REQUEST['ID'] ? $_REQUEST['ID'] : $this->currentPageID(); $id = $_REQUEST['ID'] ? $_REQUEST['ID'] : $this->currentPageID();

View File

@ -47,14 +47,9 @@ class NewsletterAdmin extends LeftAndMain {
} }
// needed for MemberTableField (Requirements not determined before Ajax-Call) // needed for MemberTableField (Requirements not determined before Ajax-Call)
Requirements::javascript("jsparty/greybox/AmiJS.js");
Requirements::javascript("jsparty/greybox/greybox.js");
Requirements::javascript("sapphire/javascript/TableListField.js");
Requirements::javascript("sapphire/javascript/TableField.js");
Requirements::javascript("sapphire/javascript/ComplexTableField.js");
Requirements::javascript("cms/javascript/MemberTableField.js"); Requirements::javascript("cms/javascript/MemberTableField.js");
Requirements::css("jsparty/greybox/greybox.css");
Requirements::css("sapphire/css/ComplexTableField.css"); Requirements::css("cms/css/NewsletterAdmin.css");
} }
public function remove() { public function remove() {

View File

@ -24,6 +24,8 @@ class ReportAdmin extends LeftAndMain {
Requirements::javascript("cms/javascript/ReportAdmin_left.js"); Requirements::javascript("cms/javascript/ReportAdmin_left.js");
Requirements::javascript("cms/javascript/ReportAdmin_right.js"); Requirements::javascript("cms/javascript/ReportAdmin_right.js");
Requirements::css("cms/css/ReportAdmin.css");
// TODO Find a better solution to integrate optional Requirements in a specific order // TODO Find a better solution to integrate optional Requirements in a specific order
if(Director::fileExists("ecommerce/css/DataReportCMSMain.css")) { if(Director::fileExists("ecommerce/css/DataReportCMSMain.css")) {
Requirements::css("ecommerce/css/DataReportCMSMain.css"); Requirements::css("ecommerce/css/DataReportCMSMain.css");

21
css/AssetAdmin.css Normal file
View File

@ -0,0 +1,21 @@
#right form .inlineformaction {
margin-left: 0;
}
.dragfile,
.dragfile img {
float: left;
cursor: move;
}
.NumFilesIndicator {
text-align: left;
padding: 1px 1px 1px 10px;
font-size: 16px;
font-weight: bold;
border: 1px solid #cc9;
color: #660;
background-color: #F9F9E3;
margin: 2px;
}
.DraggedHandle {
width: 30em !important;
}

16
css/CommentAdmin.css Normal file
View File

@ -0,0 +1,16 @@
#CommentList {
padding: 0;
margin: 0;
}
#CommentList li {
list-style-type: none;
background-color: #EEE;
border: 1px #CCC solid;
padding: 3px;
margin: 7px;
}
#CommentList li .extra {
margin-top: 3px;
font-size: 80%;
font-style: italic;
}

40
css/NewsletterAdmin.css Normal file
View File

@ -0,0 +1,40 @@
/**
* SiteTree
*/
ul.tree span.a.MailType,
ul.tree span.a.last.MailType,
ul.tree span.a.children.MailType {
background-image: none;
}
ul.tree span.a.MailType span.c,
ul.tree span.a.last.MailType span.c,
ul.tree span.a.children.MailType span.c {
margin: 0;
}
/**
* Form
*/
div#ImportFile iframe {
width: 80%;
height: auto;
border: none;
}
table.ReportField {
position: relative;
border: solid 1px #82C0FF;
border-collapse: collapse;
}
table.ReportField thead th {
background-color: #82C0FF;
}
table.ReportField td, table.ReportField {
border: solid 1px #82C0FF;
}
table.ReportField tr {
border-bottom: solid 1px #82C0FF;
}

11
css/ReportAdmin.css Normal file
View File

@ -0,0 +1,11 @@
#ReportSelector_holder {
background-color: #EEE;
border-bottom: 1px #CCC solid;
margin: 0;
padding: 3px;
}
#right iframe.AWStatsReport {
width: 98%;
height: 85%;
}

8
css/SecurityAdmin.css Normal file
View File

@ -0,0 +1,8 @@
#Form_EditForm_Permissions .Arg,
#Form_EditForm_Permissions .Enabled {
width: 6em;
}
#Form_EditForm_Permissions .Arg input {
text-align: right;
}

View File

@ -3,9 +3,9 @@
border-bottom: 1px #CCC solid; border-bottom: 1px #CCC solid;
padding: 0; padding: 0;
margin: 0; margin: 0;
/* height: 23px; */ /* height: 23px; */
float: left; float: left;
width: 100%; width: 100%;
} }
#TreeActions li.action { #TreeActions li.action {
float: left; float: left;
@ -26,35 +26,22 @@
#TreeActions li.action:hover { #TreeActions li.action:hover {
background-color: #CCC; background-color: #CCC;
} }
#left form.actionparams { #left form.actionparams {
background-color: #CCC; background-color: #CCC;
border-bottom: 1px #EEE solid; border-bottom: 1px #EEE solid;
margin: 0; margin: 0;
padding: 0.5em; padding: 0.5em;
} }
#left form.actionparams select { #left form.actionparams select {
width: 75%; width: 75%;
margin: 0; margin: 0;
} }
#ReportSelector_holder select, #PageType { #PageType,
#ReportSelector_holder select {
width: 75%; width: 75%;
float: left; float: left;
margin-right: 3px; margin-right: 3px;
} }
#LangSelector_holder {
float: none;
background-color: #EEEEEE;
border-bottom: 1px solid #CCCCCC;
border-top: 1px solid #CCCCCC;
}
#LangSelector_holder select {
width: 70%;
}
#LangSelector_holder.onelang {
display: none;
}
#left form.actionparms input.action { #left form.actionparms input.action {
width: 5%; width: 5%;
margin: 0; margin: 0;
@ -102,7 +89,6 @@
#left div.field select { #left div.field select {
width: 100%; width: 100%;
} }
#left .SelectionGroup li.selected label.selector { #left .SelectionGroup li.selected label.selector {
font-weight: bold; font-weight: bold;
} }
@ -111,9 +97,9 @@
ul.tree span.a { ul.tree span.a {
cursor: pointer; cursor: pointer;
} }
.filefolderhover span.a, ul.tree span.a.over { .filefolderhover span.a,
ul.tree span.a.over {
background-color: #FFFFBB !important; background-color: #FFFFBB !important;
/* these push the highlight out to the left of the window */ /* these push the highlight out to the left of the window */
margin-left: -100px; margin-left: -100px;
padding-left: 100px; padding-left: 100px;
@ -126,7 +112,6 @@ ul.tree span.a.current {
background-color: #EEEEFF !important; background-color: #EEEEFF !important;
border-top: 1px #CCCCFF solid; border-top: 1px #CCCCFF solid;
border-bottom: 1px #CCCCFF solid; border-bottom: 1px #CCCCFF solid;
/* these push the highlight out to the left of the window */ /* these push the highlight out to the left of the window */
margin-left: -100px; margin-left: -100px;
padding-left: 100px; padding-left: 100px;
@ -156,6 +141,7 @@ ul.tree span.a.loading span.b span.c a {
ul.tree.multiselect span.a span.b a { ul.tree.multiselect span.a span.b a {
background-image: url(../images/tickbox-unticked.gif) !important; background-image: url(../images/tickbox-unticked.gif) !important;
} }
ul.tree.multiselect span.a.nodelete span.b a { ul.tree.multiselect span.a.nodelete span.b a {
background-image: url(../images/tickbox-canttick.gif) !important; background-image: url(../images/tickbox-canttick.gif) !important;
} }
@ -168,14 +154,10 @@ ul.tree.multiselect span.a.selected span.b span.c a {
ul.tree.multiselect li.selected ul span.a a { ul.tree.multiselect li.selected ul span.a a {
background-image: url(../images/tickbox-greyticked.gif) !important; background-image: url(../images/tickbox-greyticked.gif) !important;
} }
/*
ul.tree.multiselect li.selected ul {
display: none;
}
*/
/* Span-B: Plus/Minus icon */ /* Span-B: Plus/Minus icon */
ul.tree.multiselect li.selected span.a.children span.b, ul.tree.multiselect li.selected span.a.unexpanded span.b { ul.tree.multiselect li.selected span.a.children span.b,
ul.tree.multiselect li.selected span.a.unexpanded span.b {
background-image: none; background-image: none;
cursor: default; cursor: default;
} }
@ -206,7 +188,7 @@ ul.tree ins,
background-repeat : no-repeat; background-repeat : no-repeat;
text-decoration : none; text-decoration : none;
} }
/* Deleated on stage */ /* Deleted on stage */
ul.tree del, ul.tree del,
#publication_key del { #publication_key del {
color: red; color: red;
@ -268,30 +250,6 @@ ul.tree span.modified,
} }
#CommentList {
padding: 0;
margin: 0;
}
#CommentList li {
list-style-type: none;
background-color: #EEE;
border: 1px #CCC solid;
padding: 3px;
margin: 7px;
}
#CommentList li .extra {
margin-top: 3px;
font-size: 80%;
font-style: italic;
}
#ReportSelector_holder {
background-color: #EEE;
border-bottom: 1px #CCC solid;
margin: 0;
padding: 3px;
}
#treepanes .pane_actions { #treepanes .pane_actions {
margin: 7px 4px; margin: 7px 4px;
} }
@ -344,10 +302,14 @@ ul.tree span.modified,
/** /**
* Change the styling of the root tree node * Change the styling of the root tree node
*/ */
ul.tree span.a.Root, ul.tree span.a.last.Root, ul.tree span.a.children.Root { ul.tree span.a.Root,
ul.tree span.a.last.Root,
ul.tree span.a.children.Root {
background-image: none; background-image: none;
} }
ul.tree span.a.Root span.c, ul.tree span.a.last.Root span.c, ul.tree span.a.children.Root span.c { ul.tree span.a.Root span.c,
ul.tree span.a.last.Root span.c,
ul.tree span.a.children.Root span.c {
margin: 0; margin: 0;
} }
ul#sitetree.tree ul { ul#sitetree.tree ul {
@ -359,13 +321,6 @@ ul#sitetree.tree ul ul {
ul.tree span.a.MailType, ul.tree span.a.last.MailType, ul.tree span.a.children.MailType {
background-image: none;
}
ul.tree span.a.MailType span.c, ul.tree span.a.last.MailType span.c, ul.tree span.a.children.MailType span.c {
margin: 0;
}
.contextMenu { .contextMenu {
padding: 0; padding: 0;
margin: 0; margin: 0;
@ -388,7 +343,9 @@ ul.tree span.a.MailType span.c, ul.tree span.a.last.MailType span.c, ul.tree spa
text-decoration: none; text-decoration: none;
} }
ul.tree li.untranslated a:link, ul.tree li.untranslated a:hover, ul.tree li.untranslated a:visited { ul.tree li.untranslated a:link,
ul.tree li.untranslated a:hover,
ul.tree li.untranslated a:visited {
color: #CCCCCC color: #CCCCCC
} }
@ -402,4 +359,33 @@ ul.tree li.untranslated a:link, ul.tree li.untranslated a:hover, ul.tree li.untr
/* IE7 fix: */ /* IE7 fix: */
#left form.actionparams #InputSiteTreeFilterDate table { #left form.actionparams #InputSiteTreeFilterDate table {
width: 70%; width: 70%;
}
#right ins * {
background-color: green;
}
#right del *{
background-color: red;
}
#sitetree a.contents {
font-style: italic;
}
/**
* i18n
*/
#LangSelector_holder {
float: none;
background-color: #EEEEEE;
border-bottom: 1px solid #CCCCCC;
border-top: 1px solid #CCCCCC;
}
#LangSelector_holder select {
width: 70%;
}
#LangSelector_holder.onelang {
display: none;
} }

View File

@ -1,42 +1,18 @@
/**
* Forms
*/
.right form { .right form {
margin: 1em; margin: 1em;
position: relative; position: relative;
/*top: 70px;*/ /*top: 70px;*/
} }
html>body .right from { html>body .right from {
/*top: 50px;*/ /*top: 50px;*/
} }
.right form .field {
iframe {
border : none;
}
.right form div.field {
clear: both;
margin-left: 10em;
font-size: 1.2em; font-size: 1.2em;
vertical-align: middle;
}
.right form p.field {
clear: both;
font-size: 1.2em;
margin: 0;
}
.right form div.field.nolabel {
margin-left: 0;
}
.right form label.left {
float: left;
width: 10em;
margin-left: -10em;
}
.right form input.maxlength {
width: auto;
} }
.right form textarea { .right form textarea {
@ -55,36 +31,17 @@ html>body .right form textarea.htmleditor {
width: 98%; width: 98%;
} }
.right form span.readonly {
border: 1px #CCC dotted;
background-color: #F7F7F7;
display: block;
width: 98%;
padding: 3px;
margin:5px 0;
}
.right form .validation,
.right form .error,
.right form .required
{
border: 1px solid #f00;
background: #fcc;
padding: 0.5em;
width: 50%;
}
.right form .TableField .message {
width: auto;
}
.right form .creditCardfield input { .right form .creditCardfield input {
width: 4.415em; width: 4.415em;
} }
.right form input.checkbox, .right form .optionset input, .right form .htmleditor select, .right form input.action { .right form input.checkbox,
.right form .optionset input,
.right form .htmleditor select,
.right form input.action {
width: auto; width: auto;
} }
.right form ul.optionset { .right form ul.optionset {
padding: 0; padding: 0;
} }
@ -102,236 +59,14 @@ html>body .right form textarea.htmleditor {
clear: both; clear: both;
} }
.right form .fieldgroup input, .right form .fieldgroup select { .right form .fieldgroup input,
.right form .fieldgroup select {
width: auto; width: auto;
} }
/** /**
* TableField (and subclasses) * Actions/Buttons
*/ */
table.TableField,
table.TableListField,
.TableListField table.data,
table.CMSList {
border-collapse: collapse;
border-spacing: 0;
border : 1px solid #aaaaaa;
width : 100%;
}
/* HACK Preventing IE6 from showing double borders */
body>div table.TableField,
body>div table.TableListField,
body>div .TableListField table.data,
body>div table.CMSList {
border-collapse: separate;
}
table.TableField td,
table.TableListField td,
.TableListField table.data td,
table.CMSList td {
border-style:none;
}
table.TableField th,
table.TableListField th,
.TableListField table.data th,
table.CMSList th {
whitespace: no-wrap;
}
table.TableField thead th,
.TableListField table.data thead th,
table.CMSList thead th {
background-image : url(../../cms/images/tables/thead.png);
background-repeat : repeat-x;
background-position : left bottom;
background-color : #ebeadb;
height : 24px;
border-right : 1px solid #aca899;
border-left : 1px solid #ffffff;
padding-left : 5px;
}
table.TableField thead th span,
.TableListField table.data thead th span {
display: block;
float: left;
}
table.TableField thead th a,
.TableListField table.data thead th a,
table.CMSList thead th a {
color: #000;
}
table.TableField thead th span.sortLink,
.TableListField table.data thead th span.sortLink,
table.CMSList thead th span.sortLink {
width: 16px;
height: 16px;
overflow: hidden;
}
table.TableField tfoot tr.summary td,
.TableListField table.data tfoot tr.summary td,
table.CMSList tfoot tr.summary td {
background-color : #ebeadb;
}
table.TableField tbody td,
table.TableField tfoot td,
.TableListField table.data tbody td,
.TableListField table.data tfoot td,
table.CMSList tbody td,
table.CMSList tfoot td {
border : 1px solid #f1efe2;
padding-left : 5px;
}
.TableField td input,
.TableListField td input {
width: 98%;
}
table.data tbody td input {
border:0 !important;
}
table.TableField tbody td.checkbox,
.TableListField table.data tbody td.checkbox,
table.CMSList tbody td.checkbox {
border : 1px solid #f1efe2;
padding-left : 5px;
background-image : url(../../cms/images/tables/checkbox.png);
background-repeat : repeat-x;
background-position : left bottom;
}
table.TableField tbody tr.over td,
.TableListField table.data tbody tr.over td,
table.CMSList tbody td.over td{
background-color: #FFC;
}
table.TableField tbody tr.current td,
.TableListField table.data tbody tr.current td,
table.CMSList tbody td.current td {
background-color: #316ac5;
color : white;
}
.TableListField table.data tfoot .addlink img {
vertical-align: middle;
margin: 3px 6px 3px 3px;
}
.right form .TableField span.readonly {
border: 0;
background: none;
padding: 0;
margin-bottom: 0;
}
.TableListField div.utility {
margin-top: 0.5em;
}
.TableListField div.utility a {
font-size: 9px;
border: 1px solid #aaa;
padding: 2px;
}
/**
* Selection Groups
*/
.SelectionGroup {
padding: 0px;
clear : both;
}
.SelectionGroup li {
list-style-type: none;
float : left;
clear : both;
}
.SelectionGroup li input {
width: 20px;
float : left;
}
.SelectionGroup li div.field {
display: none;
font-size: 1em;
}
.SelectionGroup li input, .right .SelectionGroup li label {
display: block;
}
.SelectionGroup li.selected div.field {
margin-left: 30px;
display: block;
margin-bottom: 1em;
}
.SelectionGroup li.selected label.selector {
font-weight: bold;
}
/**
* Composite Fields - raw concatenation of fields for programmatic purposes.
*/
.right form div.field.CompositeField {
margin-left: 7.5em;
}
.right form div.field.CompositeField div.field {
font-size: 1em;
}
.right form div.field.CompositeField {
clear: both;
}
.right form div.field.CompositeField label.left {
float: left;
width: 10em;
margin-left: -10em;
}
.right form div.column2 {
float: left;
width: 45%;
margin-right: 4%;
}
.right form div.multicolumn {
width: 100%;
float: left;
clear: left;
}
/**
* Checkbox set fields
*/
#right form .CheckboxSetField ul{
margin:0;
padding:0;
}
#right form .CheckboxSetField ul li{
list-style:none !important;
margin:0;
padding:0;
}
#right form .CheckboxSetField input{
width:auto;
}
.ajaxActions { .ajaxActions {
position: absolute; position: absolute;
bottom: 3px; bottom: 3px;
@ -339,27 +74,12 @@ table.CMSList tbody td.current td {
padding: 0; padding: 0;
margin: 0; margin: 0;
text-align: right; text-align: right;
/*
background-image:url(../images/textures/ToolBar.png);
height : 21px;
border-left : 1px solid #808080;
border-bottom : 1px solid #808080;
*/
} }
.ajaxActions input { .ajaxActions input {
/*
padding: 0;
border-style: none;
background-color:transparent;
*/
cursor: pointer; cursor: pointer;
float : left; float : left;
height : 25px; height : 25px;
/*
background-image:url(../images/textures/seperator.png);
background-repeat:no-repeat;
background-position:right;
*/
background-image: url(../images/textures/ToolBar.png); background-image: url(../images/textures/ToolBar.png);
padding-left: 10px; padding-left: 10px;
padding-right : 10px; padding-right : 10px;
@ -372,17 +92,21 @@ table.CMSList tbody td.current td {
border-width: 3px; border-width: 3px;
margin: 1px; margin: 1px;
} }
.ajaxActions input:active { .ajaxActions input:active {
background: #F4F4F4 none repeat scroll 0%; background: #F4F4F4 none repeat scroll 0%;
border-color: #999999 rgb(204, 204, 204) rgb(204, 204, 204) rgb(153, 153, 153); border-color: #999999 rgb(204, 204, 204) rgb(204, 204, 204) rgb(153, 153, 153);
} }
.ajaxActions input:hover { .ajaxActions input:hover {
background: #fff; background: #fff;
} }
input.delete:hover { input.delete:hover {
background: #ce0000; background: #ce0000;
color: #fff; color: #fff;
} }
input.loading { input.loading {
background-color: #fff; background-color: #fff;
background-image: url(../images/network-save.gif); background-image: url(../images/network-save.gif);
@ -391,6 +115,9 @@ input.loading {
padding-left: 16px; padding-left: 16px;
} }
/**
* Tabs
*/
.right form div.tab { .right form div.tab {
clear: left; clear: left;
overflow: auto; overflow: auto;
@ -400,61 +127,55 @@ input.loading {
top: 0px; top: 0px;
margin: 0; margin: 0;
padding: 10px; padding: 10px;
/*width: 98%;*/
} }
.right form div.tabset { .right form div.tabset {
border: 1px solid #fff; /* Hack for FF1.5/Win Float-Bug */ border: 1px solid #fff; /* Hack for FF1.5/Win Float-Bug */
clear: left; clear: left;
margin: 0; margin: 0;
/*width: 100%;*/
} }
/** /**
* Bottom-right * Bottom-right
*/ */
#rightbottom { #rightbottom {
border : none;
margin-top : 4px;
border : none; margin-left : 1px;
margin-top : 4px; border : 1px solid #808080;
margin-left : 1px;
border : 1px solid #808080;
} }
#rightbottom form { #rightbottom form {
margin: 1em; margin: 1em;
/*position: relative;
top: 50px;*/
} }
#rightbottom form div { #rightbottom form div {
margin-top : 3px; margin-top : 3px;
} }
#rightbottom form div.field { #rightbottom form div.field {
clear: both; clear: both;
margin-left: 10em; margin-left: 10em;
font-size: 1.2em; font-size: 1.2em;
border : none;
border : none;
} }
#rightbottom form label.left { #rightbottom form label.left {
float: left; float: left;
width: 10em; width: 10em;
margin-left: -10em; margin-left: -10em;
} }
#rightbottom form input, #rightbottom form select, #rightbottom form textarea { #rightbottom form input,
#rightbottom form select,
#rightbottom form textarea {
width: 90%; width: 90%;
} }
#rightbottom form input.checkbox, #rightbottom form .optionset input, #rightbottom form .htmleditor select, #rightbottom form input.action { #rightbottom form input.checkbox,
#rightbottom form .optionset input,
#rightbottom form .htmleditor select,
#rightbottom form input.action {
width: auto; width: auto;
} }
#rightbottom form ul.optionset { #rightbottom form ul.optionset {
@ -468,7 +189,8 @@ border : 1px solid #808080;
clear: both; clear: both;
} }
#rightbottom form .fieldgroup input, #rightbottom form .fieldgroup select { #rightbottom form .fieldgroup input,
#rightbottom form .fieldgroup select {
width: auto; width: auto;
} }
@ -482,9 +204,7 @@ border : 1px solid #808080;
bottom: 32px; bottom: 32px;
right: 11px; right: 11px;
width: 300px; width: 300px;
z-index: 200; z-index: 200;
margin: 0; margin: 0;
padding: 10px; padding: 10px;
@ -541,111 +261,37 @@ border : 1px solid #808080;
width: 214px; width: 214px;
} }
div.TreeDropdownField {
width: 35em;
padding: 0;
}
html>body div.TreeDropdownField {
position:relative;
}
div.TreeDropdownField span.items {
display: block;
height: 100%;
border: 1px #7f9db9 solid;
cursor: pointer;
width: 33em;
float: left;
padding-top: 2px;
padding-bottom: 2px;
background-color: white;
}
div.TreeDropdownField div.tree_holder {
clear: left;
cursor: default;
border: 1px black solid;
margin: 0;
height: 200px;
overflow: auto;
background-color: white;
/**
* HACK IE6, see http://www.hedgerwow.com/360/bugs/css-select-free.html
*/
position:absolute;
z-index:10;
width:33em;/*must have for any value*/;
}
html>body div.TreeDropdownField div.tree_holder {
top: 20px;
left: 0px;
z-index: 1000;
}
/** /**
* HACK IE6, see http://www.hedgerwow.com/360/bugs/css-select-free.html * Autocomplete
*/ */
div.TreeDropdownField div.tree_holder iframe {
display:none;/* IE5*/
display/**/:block;/* IE5*/
position:absolute;
top:0;
left:0;
z-index:-1;
filter:mask();
width:31em;/*must have for any big value*/
height:200px/*must have for any big value*/;
}
div.TreeDropdownField a.editLink {
border-width: 1px 1px 1px 0;
background: url(../../sapphire/images/TreeDropdownField_button.gif) left top no-repeat;
width: 19px;
height: 21px;
margin: 0;
padding: 0;
float: left;
clear: right;
z-index: 0;
overflow: hidden;
}
.autocomplete { .autocomplete {
background-color: #EEEEEE; background-color: #EEEEEE;
margin : 0px; margin : 0px;
padding : 0px; padding : 0px;
}
.autocomplete ul {
border: 1px #AAA solid;
margin : 0px;
padding : 0px;
}
.autocomplete li {
list-style-type: none;
cursor: pointer;
margin: 0px;
font-size : 12px;
padding : 3px;
white-space : nowrap;
}
.autocomplete .data {
display: none;
}
.autocomplete .informal {
font-style: italic;
} }
.autocomplete ul {
border: 1px #AAA solid;
margin : 0px;
padding : 0px;
}
.autocomplete li {
list-style-type: none;
cursor: pointer;
margin: 0px;
font-size : 12px;
padding : 3px;
white-space : nowrap;
}
.autocomplete .data {
display: none;
}
.autocomplete .informal {
font-style: italic;
}
/* /*
* Status * Status
*/ */
#statusMessage { #statusMessage {
position: absolute; position: absolute;
z-index: 500; z-index: 500;
@ -653,106 +299,37 @@ div.TreeDropdownField a.editLink {
left: 3px; left: 3px;
text-align: left; text-align: left;
padding: 1px 1px 1px 40px; padding: 1px 1px 1px 40px;
font-size: 16px; font-size: 16px;
font-weight: bold; font-weight: bold;
/* border: 1px solid #cc9; */
color: #660; color: #660;
/* background-color: #F9F9E3; */
margin: 2px; margin: 2px;
} }
#statusMessage.good { #statusMessage.good {
border-color: #9c9; border-color: #9c9;
color: #060; color: #060;
background: url(../images/alert-good.gif) /*#E2F9E3*/ 7px no-repeat; background: url(../images/alert-good.gif) /*#E2F9E3*/ 7px no-repeat;
}
#statusMessage.bad {
border-color: #c99;
color: #c00;
background: url(../images/alert-bad.gif) #fff 7px no-repeat;
max-height: 300px;
overflow: auto;
}
.pageStatusMessage {
position: absolute;
top: 0;
right: 0;
background-color: #F9F9E3;
font-weight: bold;
font-size: 1.2em;
padding: 5px;
border: 1px solid #cc9;
}
#right ins * {
background-color: green;
}
#right del *{
background-color: red;
}
div#ImportFile iframe {
width: 80%;
height: auto;
border: none;
}
table.ReportField {
position: relative;
border: solid 1px #82C0FF;
border-collapse: collapse;
}
table.ReportField thead th {
background-color: #82C0FF;
} }
#statusMessage.bad {
table.ReportField td, table.ReportField { border-color: #c99;
border: solid 1px #82C0FF; color: #c00;
background: url(../images/alert-bad.gif) #fff 7px no-repeat;
max-height: 300px;
overflow: auto;
} }
.pageStatusMessage {
table.ReportField tr { position: absolute;
border-bottom: solid 1px #82C0FF; top: 0;
right: 0;
background-color: #F9F9E3;
font-weight: bold;
font-size: 1.2em;
padding: 5px;
border: 1px solid #cc9;
} }
div.ProgressBar { /**
text-align: center; * TableField Subclasses
display: none; */
}
div.ProgressBar p.text {
text-align: center;
margin-left: auto;
margin-right: auto;
}
div.ProgressBar div.BarHolder {
width: 100%;
border: solid 1px #777;
background-color: #FFF;
padding: 2px;
text-align: left;
}
div.ProgressBar div.BarHolder div.Bar {
width: 0%;
background-color: #0074C6;
}
div.MemberListFilter, div.MemberListFilter,
div.MemberFilter, div.MemberFilter,
div.CommentFilter { div.CommentFilter {
@ -788,44 +365,20 @@ div.CommentFilter {
width: auto; width: auto;
} }
#right iframe.AWStatsReport {
width: 98%; /* Makes room for AJAX Action buttons */
height: 85%; #right {
padding-bottom: 20px;
/* HACK: any IE */
padding-bottom: expression('35px');
} }
#sitetree a.contents {
font-style: italic;
}
/**
* AssetAdmin
*/
#right form .inlineformaction {
margin-left: 0;
}
.dragfile, .dragfile img {
float: left;
cursor: move;
}
.NumFilesIndicator {
text-align: left;
padding: 1px 1px 1px 10px;
font-size: 16px;
font-weight: bold;
border: 1px solid #cc9;
color: #660;
background-color: #F9F9E3;
margin: 2px;
}
.DraggedHandle {
width: 30em !important;
}
/** /**
* Original lang fields * i18n
*/ */
div.originallang_holder.field.CompositeField.nolabel { div.originallang_holder.field.CompositeField.nolabel {
border: 1px dashed #AAAAAA; border: 1px dashed #AAAAAA;
margin-bottom: 10px; margin-bottom: 10px;
@ -844,7 +397,6 @@ div.originallang_holder.field.CompositeField.nolabel {
font-size: 0.9em; font-size: 0.9em;
} }
/* Hack */
#Form_EditForm_URLSegment_original { #Form_EditForm_URLSegment_original {
color: #666666; color: #666666;
font-style: italic; font-style: italic;
@ -870,63 +422,4 @@ div.originallang_holder.field.CompositeField.nolabel {
.nonTranslating { .nonTranslating {
display: none; display: none;
}
/**
* SecurityAdmin
*/
#Form_EditForm_Permissions .Arg,
#Form_EditForm_Permissions .Enabled {
width: 6em;
}
#Form_EditForm_Permissions .Arg input {
text-align: right;
}
#Pagination {
margin-top: 10px;
margin-left: auto;
margin-right: auto;
}
#Pagination a {
font-size: 14px;
width: 1px;
heigth: 1px;
margin: 1px;
}
#Pagination span {
display: inline;
color: red;
font-size: 14px;
}
#Pagination div {
display: inline;
}
#Pagination_Next a {
text-decoration: none;
}
#Pagination_Next a div {
position: relative;
left: -20px;
}
#Pagination_Next a img {
position: relative;
top: -15px;
left: 5px;
}
#Pagination_Previous a {
text-decoration: none;
}
#Pagination_Previous a img {
position: relative;
top: -15px;
left: 35px;
}
/* Makes room for AJAX Action buttons */
#right {
padding-bottom: 20px;
/* HACK: any IE */
padding-bottom: expression('35px');
} }

View File

@ -16,25 +16,21 @@ body {
background-color: #d4d0c8; background-color: #d4d0c8;
} }
#top, #left, #bottom, div.title, div.mceToolbarExternal, ul.tabstrip, div.field label, #separator { #top,
#left,
/*-moz-user-select: none;*/ /*need to explicitly allow input box selection becuase of this */ #bottom,
div.title,
div.mceToolbarExternal,
ul.tabstrip,
div.field label,
#separator {
/*-moz-user-select: none;*/ /*need to explicitly allow input box selection becuase of this */
} }
form fieldset {
margin: 0;
padding: 0;
border-style: none;
}
form#Form_EditForm fieldset { form#Form_EditForm fieldset {
height: 100%; height: 100%;
} }
body.stillLoading select { body.stillLoading select {
display: none; display: none;
} }
@ -425,25 +421,12 @@ div.spacer, li.spacer {
margin-right: 4px; margin-right: 4px;
} }
.indicator.inline {
display: inline;
margin-left: 5px;
vertical-align: middle;
}
p.Actions {
vertical-align: middle;
}
.indicator.block {
display: inline;
}
/* CMS specific icons for the tree */ /* CMS specific icons for the tree */
ul.tree li.Root span.Root span.c a { ul.tree li.Root span.Root span.c a {
background-image : url(../../cms/images/treeicons/root.png) !important; background-image : url(../../cms/images/treeicons/root.png) !important;
} }
/* Misc Styling */
iframe {
border : none;
}