diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..4522ba0
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,339 @@
+GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ {{description}}
+ Copyright (C) {{year}} {{fullname}}
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ {signature of Ty Coon}, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/_config/config.yml b/_config/config.yml
index 853dbda..5f45ce1 100644
--- a/_config/config.yml
+++ b/_config/config.yml
@@ -2,9 +2,12 @@
Name: dashboard
---
Member:
- extensions:
+ extensions:
[DashboardMember]
SiteConfig:
- extensions:
- [DashboardSiteConfig]
\ No newline at end of file
+ extensions:
+ [DashboardSiteConfig]
+GridFieldDetailForm_ItemRequest:
+ extensions:
+ [DashboardItemEditForm]
\ No newline at end of file
diff --git a/code/Dashboard.php b/code/Dashboard.php
index c008f01..b47b331 100755
--- a/code/Dashboard.php
+++ b/code/Dashboard.php
@@ -28,6 +28,10 @@ class Dashboard extends LeftAndMain implements PermissionProvider {
private static $menu_icon = "dashboard/images/dashboard.png";
+
+
+
+ private static $tree_class = 'DashboardPanel';
diff --git a/code/DashboardChart.php b/code/DashboardChart.php
index abdf9ac..cebf317 100644
--- a/code/DashboardChart.php
+++ b/code/DashboardChart.php
@@ -51,7 +51,7 @@ class DashboardChart extends ViewableData {
public $FontSize = 10;
-
+
/**
* @var string The position of the text on the chart
@@ -84,7 +84,7 @@ public static function create($title = null, $x_label = null, $y_label = null, $
* @param string The title of the chart
* @param string The label of the X axis
* @param string The label for the Y axis
- * @param array The chart data, in x/y pairs
+ * @param array The chart data, in x/y pairs
*/
public function __construct($title = null, $x_label = null, $y_label = null, $chartData = array ()) {
if(!is_array($chartData)) {
@@ -162,11 +162,10 @@ public function setData($data) {
* @return SSViewer
*/
public function forTemplate() {
- Requirements::javascript("https://www.google.com/jsapi");
- Requirements::javascript("https://www.google.com/uds/api/visualization/1.0/31f9974bf1146091ae320c1219fdf695/format+en,default,corechart.I.js");
+ Requirements::javascript("dashboard/javascript/thirdparty/google_jsapi_visualization.js");
Requirements::javascript("dashboard/javascript/dashboard-chart.js");
return $this->renderWith('DashboardChart');
}
-
+
}
\ No newline at end of file
diff --git a/code/extensions/DashboardItemEditForm.php b/code/extensions/DashboardItemEditForm.php
new file mode 100644
index 0000000..6b4afbd
--- /dev/null
+++ b/code/extensions/DashboardItemEditForm.php
@@ -0,0 +1,14 @@
+owner->request->getVar('ID')) {
+ Injector::inst()->get("CMSMain")->setCurrentPageID($id);
+ $form->Fields()->push(new HiddenField('ID','', $id));
+ }
+ }
+}
\ No newline at end of file
diff --git a/code/panels/DashboardGridFieldPanel.php b/code/panels/DashboardGridFieldPanel.php
index b9492fd..20697a4 100644
--- a/code/panels/DashboardGridFieldPanel.php
+++ b/code/panels/DashboardGridFieldPanel.php
@@ -10,11 +10,11 @@
* @package Dashboard
*/
class DashboardGridFieldPanel extends DashboardPanel {
-
+
private static $db = array (
- 'Count' => 'Int',
+ 'Count' => 'Int',
'GridFieldName' => 'Varchar'
);
@@ -33,7 +33,7 @@ class DashboardGridFieldPanel extends DashboardPanel {
private static $configure_on_create = true;
-
+
@@ -66,9 +66,9 @@ public function getDescription() {
*/
public function getPrimaryActions() {
if(!$this->SubjectPageID || !$this->GridFieldName) return false;
- $actions = parent::getPrimaryActions();
+ $actions = parent::getPrimaryActions();
$actions->push(DashboardPanelAction::create(
- $this->CreateModelLink(),
+ $this->CreateModelLink(),
_t('Dashboard.CREATENEWGRIDFIELD','Create new'),
"good"
));
@@ -85,9 +85,9 @@ public function getPrimaryActions() {
*/
public function getSecondaryActions() {
if(!$this->SubjectPageID || !$this->GridFieldName) return false;
- $actions = parent::getPrimaryActions();
+ $actions = parent::getPrimaryActions();
$actions->push(DashboardPanelAction::create(
- $this->ViewAllLink(),
+ $this->ViewAllLink(),
_t('Dashboard.VIEWALLGRIDFIELD','View all')
));
return $actions;
@@ -114,6 +114,7 @@ public function getConfiguration() {
->addExtraClass('no-chzn')
->setAttribute('data-lookupurl', $this->Link("gridsforpage"))
->setEmptyString("--- "._t('Dashboard.PLEASESELECT','Please select')." ---")
+ ->setTemplate("DashboardDropdownField")
);
$fields->push(DropdownField::create("GridFieldName", _t('Dashboard.GRIDFIELDNAME','GridField name'), $grids)
->addExtraClass('no-chzn')
@@ -141,7 +142,7 @@ protected function getHierarchy($parentID, $level = 0) {
if($children->exists()) {
foreach($children as $child) {
$indent="";
- for($i=0;$i<$level;$i++) $indent .= " ";
+ for($i=0;$i<$level;$i++) $indent .= " ";
$text = $child->Title;
$options[$child->ID] = empty($text) ? "$indent Untitled" : $indent.$text;
$options += $this->getHierarchy($child->ID, $level+1);
@@ -227,7 +228,7 @@ public function getGridFieldsFor(SiteTree $page) {
*/
protected function getGrid() {
if($this->SubjectPage()->exists() && $this->GridFieldName) {
- if($grid = $this->SubjectPage()->getCMSFields()->dataFieldByName($this->GridFieldName)) {
+ if($grid = $this->SubjectPage()->getCMSFields()->dataFieldByName($this->GridFieldName)) {
$grid->setForm($this->Form());
return $grid;
}
@@ -268,10 +269,10 @@ protected function getTabForGrid() {
* @return ArrayList
*/
public function GridFieldItems() {
- if($grid = $this->getGrid()) {
+ if($grid = $this->getGrid()) {
$list = $grid->getList()
->limit($this->Count)
- ->sort("LastEdited DESC");
+ ->sort("LastEdited DESC");
$ret = ArrayList::create(array());
foreach($list as $record) {
$ret->push(ArrayData::create(array(
@@ -288,7 +289,7 @@ public function GridFieldItems() {
'Title' => $record->getTitle()
)));
}
- return $ret;
+ return $ret;
}
}
@@ -319,7 +320,7 @@ public function PanelHolder() {
* @package Dashbaord
*/
class DashboardGridField_PanelRequest extends Dashboard_PanelRequest {
-
+
private static $allowed_actions = array(
"gridsforpage"
);
@@ -336,6 +337,6 @@ public function gridsforpage(SS_HTTPRequest $r) {
return Convert::array2json($this->panel->getGridFieldsFor(SiteTree::get()->byID($pageid)));
}
-
+
}
\ No newline at end of file
diff --git a/code/panels/DashboardModelAdminPanel.php b/code/panels/DashboardModelAdminPanel.php
index 64ba968..4502f6a 100644
--- a/code/panels/DashboardModelAdminPanel.php
+++ b/code/panels/DashboardModelAdminPanel.php
@@ -216,6 +216,10 @@ public function PluralModelName() {
*/
public function ModelAdminItems() {
if($this->ModelAdminModel) {
+ $SNG= Injector::inst()->get($this->ModelAdminModel);
+ if($SNG->hasExtension("Versioned")) {
+ Versioned::reading_stage("Stage");
+ }
$records = DataList::create($this->ModelAdminModel)
->limit($this->Count)
->sort("LastEdited DESC");
diff --git a/code/panels/DashboardSectionEditorPanel.php b/code/panels/DashboardSectionEditorPanel.php
index 3f34d19..350c768 100644
--- a/code/panels/DashboardSectionEditorPanel.php
+++ b/code/panels/DashboardSectionEditorPanel.php
@@ -7,7 +7,7 @@
* @author Uncle Cheese
*/
class DashboardSectionEditorPanel extends DashboardPanel {
-
+
private static $db = array (
'ParentID' => 'Int',
@@ -24,8 +24,8 @@ class DashboardSectionEditorPanel extends DashboardPanel {
private static $configure_on_create = true;
-
-
+
+
public function getLabel() {
@@ -78,7 +78,7 @@ protected function getHierarchy($parentID, $level = 0) {
if($children->exists()) {
foreach($children as $child) {
$indent="";
- for($i=0;$i<$level;$i++) $indent .= " ";
+ for($i=0;$i<$level;$i++) $indent .= " ";
if($child->AllChildren()->exists()) {
$text = $child->Title;
$options[$child->ID] = empty($text) ? "$indent Untitled" : $indent.$text;
@@ -110,13 +110,15 @@ protected function getPageTypes() {
public function getConfiguration() {
$fields = parent::getConfiguration();
- $fields->push(DropdownField::create("ParentID","Section", $this->getHierarchy(0))
- ->addExtraClass("no-chzn")
+ $fields->push(TreeDropdownField::create("ParentID","Section","SiteTree")
+ ->setFilterFunction(function($node){
+ return SiteTree::get()->filter("ParentID", $node->ID)->exists();
+ })
);
$fields->push(DropdownField::create("Subject", "Page type", $this->getPageTypes())
->addExtraClass("no-chzn")
);
- $fields->push(TextField::create("Count",_t('DashboardRecentEdits.COUNT','Number of pages to display')));
+ $fields->push(TextField::create("Count",_t('DashboardRecentEdits.COUNT','Number of pages to display')));
return $fields;
}
@@ -124,10 +126,10 @@ public function getConfiguration() {
public function getPrimaryActions() {
if(!$this->Subject || !$this->ParentID) return false;
- $actions = parent::getPrimaryActions();
+ $actions = parent::getPrimaryActions();
$actions->push(DashboardPanelAction::create(
- $this->CreatePageLink(),
- sprintf(_t('Dashboard.CREATENEW','Create new %s'),$this->SubjectSingularName()),
+ $this->CreatePageLink(),
+ sprintf(_t('Dashboard.CREATENEW','Create new %s'),$this->SubjectSingularName()),
"good"
));
return $actions;
@@ -140,10 +142,10 @@ public function getSecondaryActions() {
$actions = parent::getSecondaryActions();
$actions->push(DashboardPanelAction::create(
$this->ViewAllLink(),
- sprintf(_t('Dashboard.VIEWALL','View all %s'),$this->SubjectPluralName())
+ sprintf(_t('Dashboard.VIEWALL','View all %s'),$this->SubjectPluralName())
));
return $actions;
-
+
}
@@ -155,7 +157,7 @@ public function SectionItems() {
'ClassName' => $this->Subject
))
->limit($this->Count)
- ->sort("LastEdited DESC");
+ ->sort("LastEdited DESC");
$ret = ArrayList::create(array());
foreach($set as $r) {
$ret->push(ArrayData::create(array(
@@ -163,7 +165,7 @@ public function SectionItems() {
'EditLink' => Injector::inst()->get("CMSPagesController")->Link("edit/show/{$r->ID}")
)));
}
- return $ret;
+ return $ret;
}
@@ -174,7 +176,7 @@ public function SubjectSingularName() {
public function SubjectPluralName() {
- return Injector::inst()->get($this->Subject)->i18n_plural_name();
+ return Injector::inst()->get($this->Subject)->i18n_plural_name();
}
diff --git a/composer.json b/composer.json
index ee60c3f..9bdb674 100644
--- a/composer.json
+++ b/composer.json
@@ -12,8 +12,8 @@
],
"require":
{
- "silverstripe/framework": ">=3.1.x-dev,<4.0",
- "silverstripe/cms": ">=3.1.x-dev,<4.0"
+ "silverstripe/framework": "~3.1",
+ "silverstripe/cms": "~3.1"
},
"replace": {"silverstripe/dashboard": "*"},
diff --git a/css/dashboard.css b/css/dashboard.css
index 5438b13..ee77ede 100644
--- a/css/dashboard.css
+++ b/css/dashboard.css
@@ -20,14 +20,10 @@
background: #f9f9f9;
}
-.dashboard-panel {
+.dashboard-panel-inner {
background: #f9f9f9;
- width: 45%;
- max-width: 500px;
- float: left;
border: 1px solid #c7c7c7;
height: 312px;
- margin: 20px 20px 0 0;
position: relative;
}
@@ -35,28 +31,44 @@
padding-top: 0;
}
+.dashboard-panel-list {
+ margin-left: -20px;
+ list-style: none;
+ margin-bottom: 0;
+}
+
+.dashboard-panel {
+ display: inline-block;
+ width: 50%;
+ max-width: 500px;
+ padding-top: 20px;
+ padding-left: 20px;
+ vertical-align: top;
+ box-sizing: border-box;
+}
+
.dashboard-panel.large {
width: 100%;
max-width: 1000px;
}
.dashboard-panel.small {
- width: 23%;
- max-width: 300px;
+ width: 25%;
+ max-width: 250px;
}
-.dashboard-panel.loading {
+.dashboard-panel-inner.loading {
opacity: 0.5;
}
-.dashboard-panel .dashboard-panel-icon {
+.dashboard-panel-inner .dashboard-panel-icon {
position: absolute;
top: 10px;
left: 10px;
z-index: 999;
}
-.dashboard-panel .dashboard-panel-header {
+.dashboard-panel-inner .dashboard-panel-header {
padding: 13px 0 13px 40px;
background-image: -webkit-gradient(linear,0% 0,0% 100%,from(#f8f8f8),to(#f1eaea));
background-image: -moz-linear-gradient(0% 100% 90deg,#f8f8f8,#f1eaea);
@@ -113,17 +125,17 @@
text-align: center;
}
-.dashboard-panel .dashboard-panel-configure {
+.dashboard-panel-inner .dashboard-panel-configure {
display: none;
}
-.dashboard-panel .dashboard-panel-configure-fields {
+.dashboard-panel-inner .dashboard-panel-configure-fields {
height: 237px;
overflow: auto;
padding: 10px;
}
-.dashboard-panel .dashboard-panel-configure-actions {
+.dashboard-panel-inner .dashboard-panel-configure-actions {
height: 40px;
position: relative;
text-align: center;
@@ -137,11 +149,11 @@
padding: 8px 0;
}
-.dashboard-panel .middleColumn {
+.dashboard-panel-inner .middleColumn {
margin: 0;
}
-.dashboard-panel form .field input[type=text] {
+.dashboard-panel-inner form .field input[type=text] {
width: 100%;
display: block;
background-color: #fafafa;
@@ -156,17 +168,17 @@
padding: 4px;
}
-.dashboard-panel form .field label.left {
+.dashboard-panel-inner form .field label.left {
float: none;
text-transform: uppercase;
width: 100%;
}
-.dashboard-panel form .field.checkbox {
+.dashboard-panel-inner form .field.checkbox {
padding-left: 0;
}
-.dashboard-panel form .field.dashboardbuttonoptions {
+.dashboard-panel-inner form .field.dashboardbuttonoptions {
float: right;
box-shadow: none;
-webkit-box-shadow: none;
@@ -174,16 +186,16 @@
border-bottom: 0;
}
-.dashboard-panel form .field.dashboardbuttonoptions label.left {
+.dashboard-panel-inner form .field.dashboardbuttonoptions label.left {
float: left;
width: auto;
}
-.dashboard-panel form .field.dashboardbuttonoptions .middleColumn {
+.dashboard-panel-inner form .field.dashboardbuttonoptions .middleColumn {
min-width: 80px;
}
-.dashboard-panel ul.optionset li {
+.dashboard-panel-inner ul.optionset li {
float: none;
width: auto;
}
@@ -194,20 +206,20 @@
text-align: center;
}
-.dashboard-panel ul li {
+.dashboard-panel-inner ul li {
border-bottom: 1px solid #ddd;
}
-.dashboard-panel ul li:last-child {
+.dashboard-panel-inner ul li:last-child {
border: 0;
}
-.dashboard-panel ul li a {
+.dashboard-panel-inner ul li a {
padding: 4px;
display: block;
}
-.dashboard-panel ul li a:hover {
+.dashboard-panel-inner ul li a:hover {
background: #ddd;
text-decoration: none;
}
@@ -295,7 +307,7 @@
height: 0;
}
-.dashboard-panel .dashboard-has-many-list li a:hover {
+.dashboard-panel-inner .dashboard-has-many-list li a:hover {
background: transparent;
}
@@ -348,7 +360,7 @@
padding: 0.1em 0.5em;
}
-.dashboard-panel .dashboard-panel-quick-links-list li {
+.dashboard-panel-inner .dashboard-panel-quick-links-list li {
border: 0;
}
diff --git a/javascript/dashboard.js b/javascript/dashboard.js
index b5e3a5d..d978975 100644
--- a/javascript/dashboard.js
+++ b/javascript/dashboard.js
@@ -14,12 +14,11 @@
})
},
- showConfigure: function() {
- console.log("show");
+ showConfigure: function() {
var $t = this;
- this.flip({
+ this.find('.dashboard-panel-inner').flip({
direction: "rl",
- content: $(this).find('.dashboard-panel-configure').html(),
+ content: $($t).find('.dashboard-panel-configure').html(),
color: "#dfdfdf",
onEnd: function() {
if($t.hasClass("refreshable")) {
@@ -31,14 +30,18 @@
$(this).html(""+text+"");
}
});
+ $t.find(".TreeDropdownField").each(function() {
+ while($(this).find(".treedropdownfield-title").length > 1) {
+ $(this).find(".treedropdownfield-title:last, .treedropdownfield-toggle-panel-link:last, .treedropdownfield-panel:last").remove()
+ }
+ })
}
});
- console.log("done");
},
hideConfigure: function() {
- this.revertFlip();
+ this.find('.dashboard-panel-inner').revertFlip();
},
@@ -67,6 +70,9 @@
},
getConfigurationActions: function() {
return this.getPanel().find('.dashboard-panel-configure-actions:first');
+ },
+ getPanelInner: function() {
+ return this.getPanel().find('.dashboard-panel-inner:first');
}
})
@@ -189,7 +195,7 @@
type: "POST",
success: function(data) {
$form.getPanel().addClass("refreshable");
- $form.getPanel().revertFlip();
+ $form.getPanelInner().revertFlip();
}
})
}
@@ -420,7 +426,6 @@
$('.configure-form .dashboard-button-options-btn-group > a').entwine({
onclick: function(e) {
- console.log(this.getButtonGroup().getValue());
this.closest(".dashboard-panel")
.removeClass(this.getButtonGroup().getValue())
.addClass(this.data('value'));
diff --git a/javascript/thirdparty/google_jsapi_visualization.js b/javascript/thirdparty/google_jsapi_visualization.js
new file mode 100644
index 0000000..f4013d7
--- /dev/null
+++ b/javascript/thirdparty/google_jsapi_visualization.js
@@ -0,0 +1,1294 @@
+if(!window['googleLT_']){window['googleLT_']=(new Date()).getTime();}if (!window['google']) {
+window['google'] = {};
+}
+if (!window['google']['loader']) {
+window['google']['loader'] = {};
+google.loader.ServiceBase = 'https://www.google.com/uds';
+google.loader.GoogleApisBase = 'https://ajax.googleapis.com/ajax';
+google.loader.ApiKey = 'notsupplied';
+google.loader.KeyVerified = true;
+google.loader.LoadFailure = false;
+google.loader.Secure = true;
+google.loader.GoogleLocale = 'www.google.com';
+google.loader.ClientLocation = null;
+google.loader.AdditionalParams = '';
+(function() {var d=encodeURIComponent,g=window,h=document;function l(a,b){return a.load=b}var m="push",n="replace",q="charAt",r="indexOf",t="ServiceBase",u="name",v="getTime",w="length",x="prototype",y="setTimeout",z="loader",A="substring",B="join",C="toLowerCase";function D(a){return a in E?E[a]:E[a]=-1!=navigator.userAgent[C]()[r](a)}var E={};function F(a,b){var c=function(){};c.prototype=b[x];a.U=b[x];a.prototype=new c}
+function G(a,b,c){var e=Array[x].slice.call(arguments,2)||[];return function(){var c=e.concat(Array[x].slice.call(arguments));return a.apply(b,c)}}function H(a){a=Error(a);a.toString=function(){return this.message};return a}function I(a,b){for(var c=a.split(/\./),e=g,f=0;f\x3c/script>"):(D("safari")||D("konqueror"))&&g[y](S,10)),O[m](a)):P(g,"load",a)};K("google.setOnLoadCallback",google.T);
+function P(a,b,c){if(a.addEventListener)a.addEventListener(b,c,!1);else if(a.attachEvent)a.attachEvent("on"+b,c);else{var e=a["on"+b];a["on"+b]=null!=e?aa([c,e]):c}}function aa(a){return function(){for(var b=0;b\x3c/script>'):"css"==a&&h.write('')};
+K("google.loader.writeLoadTag",google[z].d);google[z].Q=function(a){N=a};K("google.loader.rfm",google[z].Q);google[z].S=function(a){for(var b in a)"string"==typeof b&&b&&":"==b[q](0)&&!M[b]&&(M[b]=new T(b[A](1),a[b]))};K("google.loader.rpl",google[z].S);google[z].R=function(a){if((a=a.specs)&&a[w])for(var b=0;b',qe="#",
+baa="#$1$1$2$2$3$3",re="#000000",se="#808080",te="#fff",ue="#ffffff",ve="$",we="$1",xe="%",ye="&",ze="&",caa="&client=google-gviz",Ae=">",Be="<",Ce=""",De="'",Ee="''",Fe="(",Ge="(\\d*)(\\D*)",daa="(^",He=")",eaa=")([a-z])",Je="*",Ke="+",Le=",",Me=", ",Ne="-",faa="-moz-transform",gaa="-ms-transform",haa="-o-transform",iaa="-webkit-transform",Oe=".",Pe="...",jaa='.png" height="12" width="',kaa="//ajax.googleapis.com/ajax",laa="/static/modules/gviz/",maa="/util/bar_",naa="/util/format.css",
+Qe="0",Re="0.5",Se="0.6",Te="00",Ue="000",Ve="0000000000000000",We="1",Xe="1.0",Ye="1.9",Ze="10",$e="3",af="9",bf=":",cf=";",df="<",oaa="\u00a0",paa="",qaa="",raa=" ",ef=" ",saa='',uaa="