Menu
▾
▴
gemstracker-svn — Receive updates on svn commits
You can subscribe to this list here.
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(84) |
Oct
(70) |
Nov
(164) |
Dec
(71) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2012 |
Jan
(52) |
Feb
(77) |
Mar
(70) |
Apr
(58) |
May
(81) |
Jun
(74) |
Jul
(87) |
Aug
(30) |
Sep
(45) |
Oct
(37) |
Nov
(51) |
Dec
(31) |
| 2013 |
Jan
(47) |
Feb
(29) |
Mar
(40) |
Apr
(33) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <gem...@li...> - 2012-07-12 12:46:35
|
Revision: 832
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=832&view=rev
Author: michieltcs
Date: 2012-07-12 12:46:26 +0000 (Thu, 12 Jul 2012)
Log Message:
-----------
Refactor to more generic export command using sprintf
Modified Paths:
--------------
trunk/library/classes/Gems/Export/RespondentExport.php
Modified: trunk/library/classes/Gems/Export/RespondentExport.php
===================================================================
--- trunk/library/classes/Gems/Export/RespondentExport.php 2012-07-12 10:15:39 UTC (rev 831)
+++ trunk/library/classes/Gems/Export/RespondentExport.php 2012-07-12 12:46:26 UTC (rev 832)
@@ -43,7 +43,7 @@
*/
class Gems_Export_RespondentExport extends Gems_Registry_TargetAbstract
{
- public $_wkhtmltopdfLocation = "";
+ public $_pdfExportCommand = "";
protected $_reportFooter = 'Export_ReportFooterSnippet';
protected $_reportHeader = 'Export_ReportHeaderSnippet';
@@ -95,8 +95,8 @@
parent::afterRegistry();
// Load the pdf class from the project settings if available
- if (isset($this->project->export) && isset($this->project->export['wkhtmltopdf'])) {
- $this->_wkhtmltopdfLocation = $this->project->export['wkhtmltopdf'];
+ if (isset($this->project->export) && isset($this->project->export['pdfExportCommand'])) {
+ $this->_pdfExportCommand = $this->project->export['pdfExportCommand'];
}
}
@@ -117,15 +117,17 @@
if (!file_exists($tempInputFilename)) {
throw new Exception("Unable to create temporary file '{$tempInputFilename}'");
}
+
+ $command = sprintf($this->_pdfExportCommand, escapeshellarg($tempInputFilename),
+ escapeshellarg($tempOutputFilename));
- $lastLine = exec(escapeshellarg($this->_wkhtmltopdfLocation) . ' ' . escapeshellarg($tempInputFilename)
- . ' ' . escapeshellarg($tempOutputFilename), $outputLines, $return);
+ $lastLine = exec($command, $outputLines, $return);
if ($return > 0) {
@unlink($tempInputFilename);
@unlink($tempOutputFilename);
- throw new Exception(sprintf($this->_('Unable to run PDF conversion: "%s"'), $lastLine));
+ throw new Exception(sprintf($this->_('Unable to run PDF conversion (%s): "%s"'), $command, $lastLine));
}
$pdfContents = file_get_contents($tempOutputFilename);
@@ -326,7 +328,7 @@
$element = new Zend_Form_Element_Select('format');
$element->setLabel($this->_('Output format'));
$outputFormats = array('html' => 'HTML');
- if (!empty($this->_wkhtmltopdfLocation)) {
+ if (!empty($this->_pdfExportCommand)) {
$outputFormats['pdf'] = 'PDF';
$element->setValue('pdf');
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-07-12 10:15:49
|
Revision: 831
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=831&view=rev
Author: mennodekker
Date: 2012-07-12 10:15:39 +0000 (Thu, 12 Jul 2012)
Log Message:
-----------
Adding bugtraq properties
Property Changed:
----------------
/
Property changes on:
___________________________________________________________________
Added: bugtraq:url
+ http://gemstracker.org/mantis/view.php?id=%BUGID%
Added: bugtraq:logregex
+
#(\d+)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-07-12 08:30:22
|
Revision: 830
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=830&view=rev
Author: mennodekker
Date: 2012-07-12 08:30:11 +0000 (Thu, 12 Jul 2012)
Log Message:
-----------
Fixed 543: IE will not download spss export
dev: content-type set tot text/plain and some reformatting
Modified Paths:
--------------
trunk/library/classes/Gems/Export/Spss.php
Modified: trunk/library/classes/Gems/Export/Spss.php
===================================================================
--- trunk/library/classes/Gems/Export/Spss.php 2012-07-10 12:19:28 UTC (rev 829)
+++ trunk/library/classes/Gems/Export/Spss.php 2012-07-12 08:30:11 UTC (rev 830)
@@ -47,10 +47,31 @@
*/
class Gems_Export_Spss extends Gems_Export_ExportAbstract
{
+ /**
+ * Set response headers and clean output
+ *
+ * @param string $filename
+ * @return Zend_Controller_Response_Abstract
+ */
+ private function _doHeaders($filename)
+ {
+ $controller = $this->export->controller;
+ $controller->getHelper('layout')->disableLayout();
+ $controller->getHelper('viewRenderer')->setNoRender(true);
+ $response = $controller->getResponse();
+ $response->clearAllHeaders();
+ $response->setHeader('Content-Disposition', 'attachment; filename="' . $filename . '"')
+ ->setHeader('Content-type', 'text/plain; charset=UTF-8')
+ ->setHeader('Cache-Control', 'must-revalidate, post-check=0, pre-check=0')
+ ->setHeader('Pragma', 'public');
+
+ return $response;
+ }
+
public function getDefaults()
{
- return array('file'=>'data');
+ return array('file' => 'data');
}
public function getFormElements(&$form, &$data)
@@ -58,8 +79,7 @@
$element = new Zend_Form_Element_Radio('file');
$element->setLabel($this->_('Which file'));
$element->setMultiOptions(array('syntax' => $this->_('syntax'),
- 'data' => $this->_('data')));
-
+ 'data' => $this->_('data')));
$elements[] = $element;
$element = new MUtil_Form_Element_Exhibitor('help');
@@ -96,17 +116,9 @@
if (isset($options['file'])) {
if ($options['file'] == 'syntax') {
- $controller = $this->export->controller;
- $controller->getHelper('layout')->disableLayout();
- $controller->getHelper('viewRenderer')->setNoRender(true);
- $response = $controller->getResponse();
$filename = $survey->getName() . '.sps';
$filenameDat = $survey->getName() . '.dat';
- $response->clearHeaders();
- $response->setHeader('Content-Disposition', 'attachment; filename="' . $filename . '"')
- ->setHeader('Content-type', 'text/comma-separated-values; charset=UTF-8')
- ->setHeader('Cache-Control', 'must-revalidate, post-check=0, pre-check=0')
- ->setHeader('Pragma', 'public');
+ $response = $this->_doHeaders($filename);
//first output our script
$response->appendBody(
@@ -121,15 +133,15 @@
/FIRSTCASE=1
/IMPORTCASE=ALL
/VARIABLES=");
- $answerRow = reset($answers);
- $labels = array();
- $types = array();
+ $answerRow = reset($answers);
+ $labels = array();
+ $types = array();
$fixedNames = array();
- $questions = $survey->getQuestionList($language);
- foreach($answerRow as $key => $value) {
+ $questions = $survey->getQuestionList($language);
+ foreach ($answerRow as $key => $value) {
$fixedNames[$key] = $this->fixName($key);
- $options = array();
- $type = $answerModel->get($key,'type');
+ $options = array();
+ $type = $answerModel->get($key, 'type');
switch ($type) {
case MUtil_Model::TYPE_DATE:
$type = 'SDATE10';
@@ -142,74 +154,66 @@
case MUtil_Model::TYPE_NUMERIC:
$defaultSize = 5;
- $type = 'F';
+ $type = 'F';
break;
//When no type set... assume string
case MUtil_Model::TYPE_STRING:
default:
$defaultSize = 64;
- $type = 'A';
+ $type = 'A';
break;
}
$types[$key] = $type;
if ($type == 'A' || $type == 'F') {
- $size = $answerModel->get($key,'size');
+ $size = $answerModel->get($key, 'size');
if (is_null($size)) {
$size = $defaultSize;
}
if ($type == 'A') {
$type = $type . $size;
} else {
- $type = $type . $size . '.' . ($size-1); //decimal
+ $type = $type . $size . '.' . ($size - 1); //decimal
}
}
if (isset($questions[$key])) {
$labels[$key] = $questions[$key];
}
- $response->appendBody("\n " . $fixedNames[$key] . ' '. $type);
+ $response->appendBody("\n " . $fixedNames[$key] . ' ' . $type);
}
$response->appendBody(".\nCACHE.\nEXECUTE.\n");
$response->appendBody("\n*Define variable labels.\n");
- foreach($labels as $key => $label) {
+ foreach ($labels as $key => $label) {
$response->appendBody("VARIABLE LABELS " . $fixedNames[$key] . ' "' . $label . '".' . "\n");
}
$response->appendBody("\n*Define value labels.\n");
- foreach($answerRow as $key => $value) {
- if($options = $answerModel->get($key, 'multiOptions')) {
+ foreach ($answerRow as $key => $value) {
+ if ($options = $answerModel->get($key, 'multiOptions')) {
$response->appendBody('VALUE LABELS ' . $fixedNames[$key]);
- foreach($options as $option=>$label) {
- if($types[$key]=='F') {
+ foreach ($options as $option => $label) {
+ if ($types[$key] == 'F') {
//Numeric
$response->appendBody("\n" . $option . ' ' . '"' . $label . '"');
} else {
//String
- $response->appendBody("\n" . '"' .$option . '" ' . '"' . $label . '"');
+ $response->appendBody("\n" . '"' . $option . '" ' . '"' . $label . '"');
}
}
$response->appendBody(".\n\n");
}
}
} else {
- $controller = $this->export->controller;
- $controller->getHelper('layout')->disableLayout();
- $controller->getHelper('viewRenderer')->setNoRender(true);
- $response = $controller->getResponse();
- $filename = $survey->getName() . '.dat';
- $response->clearHeaders();
- $response->setHeader('Content-Disposition', 'attachment; filename="' . $filename . '"')
- ->setHeader('Content-type', 'text/comma-separated-values; charset=UTF-8')
- ->setHeader('Cache-Control', 'must-revalidate, post-check=0, pre-check=0')
- ->setHeader('Pragma', 'public');
+ $filename = $survey->getName() . '.dat';
+ $response = $this->_doHeaders($filename);
//We should create a model with the transformations we need
//think of date translations, numers and strings
$answerRow = reset($answers);
$spssModel = new Gems_Export_ExportModel();
- foreach($answerRow as $key => $value) {
+ foreach ($answerRow as $key => $value) {
$options = array();
- $type = $answerModel->get($key,'type');
+ $type = $answerModel->get($key, 'type');
switch ($type) {
case MUtil_Model::TYPE_DATE:
$options['storageFormat'] = 'yyyy-MM-dd';
@@ -232,20 +236,20 @@
//When no type set... assume string
case MUtil_Model::TYPE_STRING:
default:
- $type = MUtil_Model::TYPE_STRING;
+ $type = MUtil_Model::TYPE_STRING;
$options['formatFunction'] = $this->formatString;
break;
}
- $options['type'] = $type;
+ $options['type'] = $type;
$spssModel->set($key, $options);
}
//Now apply the model to the answers
$answers = new Gems_FormattedData($answers, $spssModel);
//And output the data
- foreach($answers as $answerRow) {
+ foreach ($answers as $answerRow) {
$resultRow = implode(',', $answerRow);
- $response->appendBody($resultRow ."\n");
+ $response->appendBody($resultRow . "\n");
}
}
}
@@ -263,7 +267,8 @@
* @param type $input
* @return string
*/
- public function formatString($input) {
+ public function formatString($input)
+ {
$output = strip_tags($input);
$output = str_replace(array("'", "\r", "\n"), array("''", ' ', ' '), $output);
$output = "'" . $output . "'";
@@ -278,11 +283,12 @@
* @param string $input
* @return string
*/
- public function fixName($input) {
- if (!preg_match ("/^([a-z]|[A-Z])+.*$/", $input)) {
- $input = "q_" . $input;
+ public function fixName($input)
+ {
+ if (!preg_match("/^([a-z]|[A-Z])+.*$/", $input)) {
+ $input = "q_" . $input;
}
- $input = str_replace(array(" ","-",":",";","!","/","\\","'"), array("_","_hyph_","_dd_","_dc_","_excl_","_fs_","_bs_",'_qu_'), $input);
+ $input = str_replace(array(" ", "-", ":", ";", "!", "/", "\\", "'"), array("_", "_hyph_", "_dd_", "_dc_", "_excl_", "_fs_", "_bs_", '_qu_'), $input);
return $input;
}
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-07-10 12:19:37
|
Revision: 829
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=829&view=rev
Author: mennodekker
Date: 2012-07-10 12:19:28 +0000 (Tue, 10 Jul 2012)
Log Message:
-----------
Fixed error due to incorrect order of statements (crash in survey maintenance - edit)
Modified Paths:
--------------
trunk/library/classes/MUtil/JQuery/Form/Element/DatePicker.php
Modified: trunk/library/classes/MUtil/JQuery/Form/Element/DatePicker.php
===================================================================
--- trunk/library/classes/MUtil/JQuery/Form/Element/DatePicker.php 2012-07-10 11:04:38 UTC (rev 828)
+++ trunk/library/classes/MUtil/JQuery/Form/Element/DatePicker.php 2012-07-10 12:19:28 UTC (rev 829)
@@ -202,6 +202,15 @@
*/
+ $element = parent::setView($view);
+
+ if (null !== $view) {
+ if (false === $view->getPluginLoader('helper')->getPaths('MUtil_JQuery_View_Helper')) {
+ $view->addHelperPath('MUtil/JQuery/View/Helper', 'MUtil_JQuery_View_Helper');
+ }
+ }
+
+
if ($locale = Zend_Registry::get('Zend_Locale')) {
$language = $locale->getLanguage();
if ($language && $language != 'en') {
@@ -218,14 +227,6 @@
}
}
- $element = parent::setView($view);
-
- if (null !== $view) {
- if (false === $view->getPluginLoader('helper')->getPaths('MUtil_JQuery_View_Helper')) {
- $view->addHelperPath('MUtil/JQuery/View/Helper', 'MUtil_JQuery_View_Helper');
- }
- }
-
return $element;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-07-10 11:04:44
|
Revision: 828
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=828&view=rev
Author: mennodekker
Date: 2012-07-10 11:04:38 +0000 (Tue, 10 Jul 2012)
Log Message:
-----------
Removed Pulse sponsoring message
Modified Paths:
--------------
trunk/library/views/scripts/index/login.phtml
Modified: trunk/library/views/scripts/index/login.phtml
===================================================================
--- trunk/library/views/scripts/index/login.phtml 2012-07-10 10:44:32 UTC (rev 827)
+++ trunk/library/views/scripts/index/login.phtml 2012-07-10 11:04:38 UTC (rev 828)
@@ -8,14 +8,4 @@
<?php
echo $this->form;
?>
- <p class="sponsoring">
- <?php echo $this->translate->_('The Pulse software was made possible thanks to support from '); ?>
- <a href="http://www.stichtingcoolsingel.nl/">Stichting Coolsingel</a>.<br/>
- <a href="http://www.stichtingcoolsingel.nl/">
- <?php
- echo MUtil_Html::create()
- ->img(array('src' => 'stichtingcoolsingel.png', 'Financed by Stichting Coolsingel'))
- ->render($this);
- ?></a>
- </p>
</div>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-07-10 10:44:38
|
Revision: 827
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=827&view=rev
Author: mennodekker
Date: 2012-07-10 10:44:32 +0000 (Tue, 10 Jul 2012)
Log Message:
-----------
Fixed incorrect css name
Modified Paths:
--------------
trunk/new_project/application/configs/project.ini
Modified: trunk/new_project/application/configs/project.ini
===================================================================
--- trunk/new_project/application/configs/project.ini 2012-07-09 13:44:35 UTC (rev 826)
+++ trunk/new_project/application/configs/project.ini 2012-07-10 10:44:32 UTC (rev 827)
@@ -29,7 +29,7 @@
imagedir = gems/images
css.local = basic/basic.css
favicon = basic/basic.ico
-jquerycss = basic/basic.jquery-basic.css
+jquerycss = basic/jquery-basic.css
contact.bugsUrl = https://sourceforge.net/apps/trac/gemstracker/wiki
contact.supportUrl = https://sourceforge.net/projects/gemstracker/support
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-07-09 13:44:44
|
Revision: 826
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=826&view=rev
Author: michieltcs
Date: 2012-07-09 13:44:35 +0000 (Mon, 09 Jul 2012)
Log Message:
-----------
Add more passwords
Modified Paths:
--------------
trunk/library/docs/password_sources/ownlist.dct
trunk/library/docs/weak-passwords.lst
Added Paths:
-----------
trunk/library/docs/password_sources/zorg.dct
Modified: trunk/library/docs/password_sources/ownlist.dct
===================================================================
--- trunk/library/docs/password_sources/ownlist.dct 2012-07-09 12:26:37 UTC (rev 825)
+++ trunk/library/docs/password_sources/ownlist.dct 2012-07-09 13:44:35 UTC (rev 826)
@@ -320,8 +320,6 @@
zzz
zzzz
zzzzz
-password
-wachtwoord
wachtwoord!
wachtwoord123
god
@@ -344,14 +342,1210 @@
123qwe
welkom
leeg
-welkom01
-welkom01!
-welcome01
welcome
-welcome01!
p4ssw0rd
password!
passwordz
passwordz!
passw0rd
p4ssword
+welcome00
+welcome00!
+welkom00
+welkom00!
+password00
+password00!
+p4ssword00
+p4ssword00!
+p4ssw0rd00
+p4ssw0rd00!
+passw0rd00
+passw0rd00!
+welcome01
+welcome01!
+welkom01
+welkom01!
+password01
+password01!
+p4ssword01
+p4ssword01!
+p4ssw0rd01
+p4ssw0rd01!
+passw0rd01
+passw0rd01!
+welcome02
+welcome02!
+welkom02
+welkom02!
+password02
+password02!
+p4ssword02
+p4ssword02!
+p4ssw0rd02
+p4ssw0rd02!
+passw0rd02
+passw0rd02!
+welcome03
+welcome03!
+welkom03
+welkom03!
+password03
+password03!
+p4ssword03
+p4ssword03!
+p4ssw0rd03
+p4ssw0rd03!
+passw0rd03
+passw0rd03!
+welcome04
+welcome04!
+welkom04
+welkom04!
+password04
+password04!
+p4ssword04
+p4ssword04!
+p4ssw0rd04
+p4ssw0rd04!
+passw0rd04
+passw0rd04!
+welcome05
+welcome05!
+welkom05
+welkom05!
+password05
+password05!
+p4ssword05
+p4ssword05!
+p4ssw0rd05
+p4ssw0rd05!
+passw0rd05
+passw0rd05!
+welcome06
+welcome06!
+welkom06
+welkom06!
+password06
+password06!
+p4ssword06
+p4ssword06!
+p4ssw0rd06
+p4ssw0rd06!
+passw0rd06
+passw0rd06!
+welcome07
+welcome07!
+welkom07
+welkom07!
+password07
+password07!
+p4ssword07
+p4ssword07!
+p4ssw0rd07
+p4ssw0rd07!
+passw0rd07
+passw0rd07!
+welcome08
+welcome08!
+welkom08
+welkom08!
+password08
+password08!
+p4ssword08
+p4ssword08!
+p4ssw0rd08
+p4ssw0rd08!
+passw0rd08
+passw0rd08!
+welcome09
+welcome09!
+welkom09
+welkom09!
+password09
+password09!
+p4ssword09
+p4ssword09!
+p4ssw0rd09
+p4ssw0rd09!
+passw0rd09
+passw0rd09!
+welcome10
+welcome10!
+welkom10
+welkom10!
+password10
+password10!
+p4ssword10
+p4ssword10!
+p4ssw0rd10
+p4ssw0rd10!
+passw0rd10
+passw0rd10!
+welcome11
+welcome11!
+welkom11
+welkom11!
+password11
+password11!
+p4ssword11
+p4ssword11!
+p4ssw0rd11
+p4ssw0rd11!
+passw0rd11
+passw0rd11!
+welcome12
+welcome12!
+welkom12
+welkom12!
+password12
+password12!
+p4ssword12
+p4ssword12!
+p4ssw0rd12
+p4ssw0rd12!
+passw0rd12
+passw0rd12!
+welcome13
+welcome13!
+welkom13
+welkom13!
+password13
+password13!
+p4ssword13
+p4ssword13!
+p4ssw0rd13
+p4ssw0rd13!
+passw0rd13
+passw0rd13!
+welcome14
+welcome14!
+welkom14
+welkom14!
+password14
+password14!
+p4ssword14
+p4ssword14!
+p4ssw0rd14
+p4ssw0rd14!
+passw0rd14
+passw0rd14!
+welcome15
+welcome15!
+welkom15
+welkom15!
+password15
+password15!
+p4ssword15
+p4ssword15!
+p4ssw0rd15
+p4ssw0rd15!
+passw0rd15
+passw0rd15!
+welcome16
+welcome16!
+welkom16
+welkom16!
+password16
+password16!
+p4ssword16
+p4ssword16!
+p4ssw0rd16
+p4ssw0rd16!
+passw0rd16
+passw0rd16!
+welcome17
+welcome17!
+welkom17
+welkom17!
+password17
+password17!
+p4ssword17
+p4ssword17!
+p4ssw0rd17
+p4ssw0rd17!
+passw0rd17
+passw0rd17!
+welcome18
+welcome18!
+welkom18
+welkom18!
+password18
+password18!
+p4ssword18
+p4ssword18!
+p4ssw0rd18
+p4ssw0rd18!
+passw0rd18
+passw0rd18!
+welcome19
+welcome19!
+welkom19
+welkom19!
+password19
+password19!
+p4ssword19
+p4ssword19!
+p4ssw0rd19
+p4ssw0rd19!
+passw0rd19
+passw0rd19!
+welcome20
+welcome20!
+welkom20
+welkom20!
+password20
+password20!
+p4ssword20
+p4ssword20!
+p4ssw0rd20
+p4ssw0rd20!
+passw0rd20
+passw0rd20!
+welcome21
+welcome21!
+welkom21
+welkom21!
+password21
+password21!
+p4ssword21
+p4ssword21!
+p4ssw0rd21
+p4ssw0rd21!
+passw0rd21
+passw0rd21!
+welcome22
+welcome22!
+welkom22
+welkom22!
+password22
+password22!
+p4ssword22
+p4ssword22!
+p4ssw0rd22
+p4ssw0rd22!
+passw0rd22
+passw0rd22!
+welcome23
+welcome23!
+welkom23
+welkom23!
+password23
+password23!
+p4ssword23
+p4ssword23!
+p4ssw0rd23
+p4ssw0rd23!
+passw0rd23
+passw0rd23!
+welcome24
+welcome24!
+welkom24
+welkom24!
+password24
+password24!
+p4ssword24
+p4ssword24!
+p4ssw0rd24
+p4ssw0rd24!
+passw0rd24
+passw0rd24!
+welcome25
+welcome25!
+welkom25
+welkom25!
+password25
+password25!
+p4ssword25
+p4ssword25!
+p4ssw0rd25
+p4ssw0rd25!
+passw0rd25
+passw0rd25!
+welcome26
+welcome26!
+welkom26
+welkom26!
+password26
+password26!
+p4ssword26
+p4ssword26!
+p4ssw0rd26
+p4ssw0rd26!
+passw0rd26
+passw0rd26!
+welcome27
+welcome27!
+welkom27
+welkom27!
+password27
+password27!
+p4ssword27
+p4ssword27!
+p4ssw0rd27
+p4ssw0rd27!
+passw0rd27
+passw0rd27!
+welcome28
+welcome28!
+welkom28
+welkom28!
+password28
+password28!
+p4ssword28
+p4ssword28!
+p4ssw0rd28
+p4ssw0rd28!
+passw0rd28
+passw0rd28!
+welcome29
+welcome29!
+welkom29
+welkom29!
+password29
+password29!
+p4ssword29
+p4ssword29!
+p4ssw0rd29
+p4ssw0rd29!
+passw0rd29
+passw0rd29!
+welcome30
+welcome30!
+welkom30
+welkom30!
+password30
+password30!
+p4ssword30
+p4ssword30!
+p4ssw0rd30
+p4ssw0rd30!
+passw0rd30
+passw0rd30!
+welcome31
+welcome31!
+welkom31
+welkom31!
+password31
+password31!
+p4ssword31
+p4ssword31!
+p4ssw0rd31
+p4ssw0rd31!
+passw0rd31
+passw0rd31!
+welcome32
+welcome32!
+welkom32
+welkom32!
+password32
+password32!
+p4ssword32
+p4ssword32!
+p4ssw0rd32
+p4ssw0rd32!
+passw0rd32
+passw0rd32!
+welcome33
+welcome33!
+welkom33
+welkom33!
+password33
+password33!
+p4ssword33
+p4ssword33!
+p4ssw0rd33
+p4ssw0rd33!
+passw0rd33
+passw0rd33!
+welcome34
+welcome34!
+welkom34
+welkom34!
+password34
+password34!
+p4ssword34
+p4ssword34!
+p4ssw0rd34
+p4ssw0rd34!
+passw0rd34
+passw0rd34!
+welcome35
+welcome35!
+welkom35
+welkom35!
+password35
+password35!
+p4ssword35
+p4ssword35!
+p4ssw0rd35
+p4ssw0rd35!
+passw0rd35
+passw0rd35!
+welcome36
+welcome36!
+welkom36
+welkom36!
+password36
+password36!
+p4ssword36
+p4ssword36!
+p4ssw0rd36
+p4ssw0rd36!
+passw0rd36
+passw0rd36!
+welcome37
+welcome37!
+welkom37
+welkom37!
+password37
+password37!
+p4ssword37
+p4ssword37!
+p4ssw0rd37
+p4ssw0rd37!
+passw0rd37
+passw0rd37!
+welcome38
+welcome38!
+welkom38
+welkom38!
+password38
+password38!
+p4ssword38
+p4ssword38!
+p4ssw0rd38
+p4ssw0rd38!
+passw0rd38
+passw0rd38!
+welcome39
+welcome39!
+welkom39
+welkom39!
+password39
+password39!
+p4ssword39
+p4ssword39!
+p4ssw0rd39
+p4ssw0rd39!
+passw0rd39
+passw0rd39!
+welcome40
+welcome40!
+welkom40
+welkom40!
+password40
+password40!
+p4ssword40
+p4ssword40!
+p4ssw0rd40
+p4ssw0rd40!
+passw0rd40
+passw0rd40!
+welcome41
+welcome41!
+welkom41
+welkom41!
+password41
+password41!
+p4ssword41
+p4ssword41!
+p4ssw0rd41
+p4ssw0rd41!
+passw0rd41
+passw0rd41!
+welcome42
+welcome42!
+welkom42
+welkom42!
+password42
+password42!
+p4ssword42
+p4ssword42!
+p4ssw0rd42
+p4ssw0rd42!
+passw0rd42
+passw0rd42!
+welcome43
+welcome43!
+welkom43
+welkom43!
+password43
+password43!
+p4ssword43
+p4ssword43!
+p4ssw0rd43
+p4ssw0rd43!
+passw0rd43
+passw0rd43!
+welcome44
+welcome44!
+welkom44
+welkom44!
+password44
+password44!
+p4ssword44
+p4ssword44!
+p4ssw0rd44
+p4ssw0rd44!
+passw0rd44
+passw0rd44!
+welcome45
+welcome45!
+welkom45
+welkom45!
+password45
+password45!
+p4ssword45
+p4ssword45!
+p4ssw0rd45
+p4ssw0rd45!
+passw0rd45
+passw0rd45!
+welcome46
+welcome46!
+welkom46
+welkom46!
+password46
+password46!
+p4ssword46
+p4ssword46!
+p4ssw0rd46
+p4ssw0rd46!
+passw0rd46
+passw0rd46!
+welcome47
+welcome47!
+welkom47
+welkom47!
+password47
+password47!
+p4ssword47
+p4ssword47!
+p4ssw0rd47
+p4ssw0rd47!
+passw0rd47
+passw0rd47!
+welcome48
+welcome48!
+welkom48
+welkom48!
+password48
+password48!
+p4ssword48
+p4ssword48!
+p4ssw0rd48
+p4ssw0rd48!
+passw0rd48
+passw0rd48!
+welcome49
+welcome49!
+welkom49
+welkom49!
+password49
+password49!
+p4ssword49
+p4ssword49!
+p4ssw0rd49
+p4ssw0rd49!
+passw0rd49
+passw0rd49!
+welcome50
+welcome50!
+welkom50
+welkom50!
+password50
+password50!
+p4ssword50
+p4ssword50!
+p4ssw0rd50
+p4ssw0rd50!
+passw0rd50
+passw0rd50!
+welcome51
+welcome51!
+welkom51
+welkom51!
+password51
+password51!
+p4ssword51
+p4ssword51!
+p4ssw0rd51
+p4ssw0rd51!
+passw0rd51
+passw0rd51!
+welcome52
+welcome52!
+welkom52
+welkom52!
+password52
+password52!
+p4ssword52
+p4ssword52!
+p4ssw0rd52
+p4ssw0rd52!
+passw0rd52
+passw0rd52!
+welcome53
+welcome53!
+welkom53
+welkom53!
+password53
+password53!
+p4ssword53
+p4ssword53!
+p4ssw0rd53
+p4ssw0rd53!
+passw0rd53
+passw0rd53!
+welcome54
+welcome54!
+welkom54
+welkom54!
+password54
+password54!
+p4ssword54
+p4ssword54!
+p4ssw0rd54
+p4ssw0rd54!
+passw0rd54
+passw0rd54!
+welcome55
+welcome55!
+welkom55
+welkom55!
+password55
+password55!
+p4ssword55
+p4ssword55!
+p4ssw0rd55
+p4ssw0rd55!
+passw0rd55
+passw0rd55!
+welcome56
+welcome56!
+welkom56
+welkom56!
+password56
+password56!
+p4ssword56
+p4ssword56!
+p4ssw0rd56
+p4ssw0rd56!
+passw0rd56
+passw0rd56!
+welcome57
+welcome57!
+welkom57
+welkom57!
+password57
+password57!
+p4ssword57
+p4ssword57!
+p4ssw0rd57
+p4ssw0rd57!
+passw0rd57
+passw0rd57!
+welcome58
+welcome58!
+welkom58
+welkom58!
+password58
+password58!
+p4ssword58
+p4ssword58!
+p4ssw0rd58
+p4ssw0rd58!
+passw0rd58
+passw0rd58!
+welcome59
+welcome59!
+welkom59
+welkom59!
+password59
+password59!
+p4ssword59
+p4ssword59!
+p4ssw0rd59
+p4ssw0rd59!
+passw0rd59
+passw0rd59!
+welcome60
+welcome60!
+welkom60
+welkom60!
+password60
+password60!
+p4ssword60
+p4ssword60!
+p4ssw0rd60
+p4ssw0rd60!
+passw0rd60
+passw0rd60!
+welcome61
+welcome61!
+welkom61
+welkom61!
+password61
+password61!
+p4ssword61
+p4ssword61!
+p4ssw0rd61
+p4ssw0rd61!
+passw0rd61
+passw0rd61!
+welcome62
+welcome62!
+welkom62
+welkom62!
+password62
+password62!
+p4ssword62
+p4ssword62!
+p4ssw0rd62
+p4ssw0rd62!
+passw0rd62
+passw0rd62!
+welcome63
+welcome63!
+welkom63
+welkom63!
+password63
+password63!
+p4ssword63
+p4ssword63!
+p4ssw0rd63
+p4ssw0rd63!
+passw0rd63
+passw0rd63!
+welcome64
+welcome64!
+welkom64
+welkom64!
+password64
+password64!
+p4ssword64
+p4ssword64!
+p4ssw0rd64
+p4ssw0rd64!
+passw0rd64
+passw0rd64!
+welcome65
+welcome65!
+welkom65
+welkom65!
+password65
+password65!
+p4ssword65
+p4ssword65!
+p4ssw0rd65
+p4ssw0rd65!
+passw0rd65
+passw0rd65!
+welcome66
+welcome66!
+welkom66
+welkom66!
+password66
+password66!
+p4ssword66
+p4ssword66!
+p4ssw0rd66
+p4ssw0rd66!
+passw0rd66
+passw0rd66!
+welcome67
+welcome67!
+welkom67
+welkom67!
+password67
+password67!
+p4ssword67
+p4ssword67!
+p4ssw0rd67
+p4ssw0rd67!
+passw0rd67
+passw0rd67!
+welcome68
+welcome68!
+welkom68
+welkom68!
+password68
+password68!
+p4ssword68
+p4ssword68!
+p4ssw0rd68
+p4ssw0rd68!
+passw0rd68
+passw0rd68!
+welcome69
+welcome69!
+welkom69
+welkom69!
+password69
+password69!
+p4ssword69
+p4ssword69!
+p4ssw0rd69
+p4ssw0rd69!
+passw0rd69
+passw0rd69!
+welcome70
+welcome70!
+welkom70
+welkom70!
+password70
+password70!
+p4ssword70
+p4ssword70!
+p4ssw0rd70
+p4ssw0rd70!
+passw0rd70
+passw0rd70!
+welcome71
+welcome71!
+welkom71
+welkom71!
+password71
+password71!
+p4ssword71
+p4ssword71!
+p4ssw0rd71
+p4ssw0rd71!
+passw0rd71
+passw0rd71!
+welcome72
+welcome72!
+welkom72
+welkom72!
+password72
+password72!
+p4ssword72
+p4ssword72!
+p4ssw0rd72
+p4ssw0rd72!
+passw0rd72
+passw0rd72!
+welcome73
+welcome73!
+welkom73
+welkom73!
+password73
+password73!
+p4ssword73
+p4ssword73!
+p4ssw0rd73
+p4ssw0rd73!
+passw0rd73
+passw0rd73!
+welcome74
+welcome74!
+welkom74
+welkom74!
+password74
+password74!
+p4ssword74
+p4ssword74!
+p4ssw0rd74
+p4ssw0rd74!
+passw0rd74
+passw0rd74!
+welcome75
+welcome75!
+welkom75
+welkom75!
+password75
+password75!
+p4ssword75
+p4ssword75!
+p4ssw0rd75
+p4ssw0rd75!
+passw0rd75
+passw0rd75!
+welcome76
+welcome76!
+welkom76
+welkom76!
+password76
+password76!
+p4ssword76
+p4ssword76!
+p4ssw0rd76
+p4ssw0rd76!
+passw0rd76
+passw0rd76!
+welcome77
+welcome77!
+welkom77
+welkom77!
+password77
+password77!
+p4ssword77
+p4ssword77!
+p4ssw0rd77
+p4ssw0rd77!
+passw0rd77
+passw0rd77!
+welcome78
+welcome78!
+welkom78
+welkom78!
+password78
+password78!
+p4ssword78
+p4ssword78!
+p4ssw0rd78
+p4ssw0rd78!
+passw0rd78
+passw0rd78!
+welcome79
+welcome79!
+welkom79
+welkom79!
+password79
+password79!
+p4ssword79
+p4ssword79!
+p4ssw0rd79
+p4ssw0rd79!
+passw0rd79
+passw0rd79!
+welcome80
+welcome80!
+welkom80
+welkom80!
+password80
+password80!
+p4ssword80
+p4ssword80!
+p4ssw0rd80
+p4ssw0rd80!
+passw0rd80
+passw0rd80!
+welcome81
+welcome81!
+welkom81
+welkom81!
+password81
+password81!
+p4ssword81
+p4ssword81!
+p4ssw0rd81
+p4ssw0rd81!
+passw0rd81
+passw0rd81!
+welcome82
+welcome82!
+welkom82
+welkom82!
+password82
+password82!
+p4ssword82
+p4ssword82!
+p4ssw0rd82
+p4ssw0rd82!
+passw0rd82
+passw0rd82!
+welcome83
+welcome83!
+welkom83
+welkom83!
+password83
+password83!
+p4ssword83
+p4ssword83!
+p4ssw0rd83
+p4ssw0rd83!
+passw0rd83
+passw0rd83!
+welcome84
+welcome84!
+welkom84
+welkom84!
+password84
+password84!
+p4ssword84
+p4ssword84!
+p4ssw0rd84
+p4ssw0rd84!
+passw0rd84
+passw0rd84!
+welcome85
+welcome85!
+welkom85
+welkom85!
+password85
+password85!
+p4ssword85
+p4ssword85!
+p4ssw0rd85
+p4ssw0rd85!
+passw0rd85
+passw0rd85!
+welcome86
+welcome86!
+welkom86
+welkom86!
+password86
+password86!
+p4ssword86
+p4ssword86!
+p4ssw0rd86
+p4ssw0rd86!
+passw0rd86
+passw0rd86!
+welcome87
+welcome87!
+welkom87
+welkom87!
+password87
+password87!
+p4ssword87
+p4ssword87!
+p4ssw0rd87
+p4ssw0rd87!
+passw0rd87
+passw0rd87!
+welcome88
+welcome88!
+welkom88
+welkom88!
+password88
+password88!
+p4ssword88
+p4ssword88!
+p4ssw0rd88
+p4ssw0rd88!
+passw0rd88
+passw0rd88!
+welcome89
+welcome89!
+welkom89
+welkom89!
+password89
+password89!
+p4ssword89
+p4ssword89!
+p4ssw0rd89
+p4ssw0rd89!
+passw0rd89
+passw0rd89!
+welcome90
+welcome90!
+welkom90
+welkom90!
+password90
+password90!
+p4ssword90
+p4ssword90!
+p4ssw0rd90
+p4ssw0rd90!
+passw0rd90
+passw0rd90!
+welcome91
+welcome91!
+welkom91
+welkom91!
+password91
+password91!
+p4ssword91
+p4ssword91!
+p4ssw0rd91
+p4ssw0rd91!
+passw0rd91
+passw0rd91!
+welcome92
+welcome92!
+welkom92
+welkom92!
+password92
+password92!
+p4ssword92
+p4ssword92!
+p4ssw0rd92
+p4ssw0rd92!
+passw0rd92
+passw0rd92!
+welcome93
+welcome93!
+welkom93
+welkom93!
+password93
+password93!
+p4ssword93
+p4ssword93!
+p4ssw0rd93
+p4ssw0rd93!
+passw0rd93
+passw0rd93!
+welcome94
+welcome94!
+welkom94
+welkom94!
+password94
+password94!
+p4ssword94
+p4ssword94!
+p4ssw0rd94
+p4ssw0rd94!
+passw0rd94
+passw0rd94!
+welcome95
+welcome95!
+welkom95
+welkom95!
+password95
+password95!
+p4ssword95
+p4ssword95!
+p4ssw0rd95
+p4ssw0rd95!
+passw0rd95
+passw0rd95!
+welcome96
+welcome96!
+welkom96
+welkom96!
+password96
+password96!
+p4ssword96
+p4ssword96!
+p4ssw0rd96
+p4ssw0rd96!
+passw0rd96
+passw0rd96!
+welcome97
+welcome97!
+welkom97
+welkom97!
+password97
+password97!
+p4ssword97
+p4ssword97!
+p4ssw0rd97
+p4ssw0rd97!
+passw0rd97
+passw0rd97!
+welcome98
+welcome98!
+welkom98
+welkom98!
+password98
+password98!
+p4ssword98
+p4ssword98!
+p4ssw0rd98
+p4ssw0rd98!
+passw0rd98
+passw0rd98!
+welcome99
+welcome99!
+welkom99
+welkom99!
+password99
+password99!
+p4ssword99
+p4ssword99!
+p4ssw0rd99
+p4ssw0rd99!
+passw0rd99
+passw0rd99!
Added: trunk/library/docs/password_sources/zorg.dct
===================================================================
--- trunk/library/docs/password_sources/zorg.dct (rev 0)
+++ trunk/library/docs/password_sources/zorg.dct 2012-07-09 13:44:35 UTC (rev 826)
@@ -0,0 +1,13 @@
+velthuiskliniek
+velthuis
+equipe
+equipezorgbedrijven
+erasmus
+hcu
+mgz
+diak
+helder
+helderkliniek
+xpert
+xpertclinic
+handencentrum
Modified: trunk/library/docs/weak-passwords.lst
===================================================================
--- trunk/library/docs/weak-passwords.lst 2012-07-09 12:26:37 UTC (rev 825)
+++ trunk/library/docs/weak-passwords.lst 2012-07-09 13:44:35 UTC (rev 826)
@@ -55775,6 +55775,7 @@
diagrammen
diagrams
diahann
+diak
diaken
diakenen
diakenhuis
@@ -68607,6 +68608,7 @@
equipementen
equiperen
equipes
+equipezorgbedrijven
equipmen
equipois
equipote
@@ -98263,6 +98265,7 @@
handelwijzen
handen
handenarbeid
+handencentrum
handenloos
handenloze
handenwerk
@@ -100801,6 +100804,7 @@
helderder
heldere
helderheid
+helderkliniek
helderst
helderziend
helderziende
@@ -175336,7 +175340,407 @@
p.
p3518
p4ssw0rd
+p4ssw0rd00
+p4ssw0rd00!
+p4ssw0rd01
+p4ssw0rd01!
+p4ssw0rd02
+p4ssw0rd02!
+p4ssw0rd03
+p4ssw0rd03!
+p4ssw0rd04
+p4ssw0rd04!
+p4ssw0rd05
+p4ssw0rd05!
+p4ssw0rd06
+p4ssw0rd06!
+p4ssw0rd07
+p4ssw0rd07!
+p4ssw0rd08
+p4ssw0rd08!
+p4ssw0rd09
+p4ssw0rd09!
+p4ssw0rd10
+p4ssw0rd10!
+p4ssw0rd11
+p4ssw0rd11!
+p4ssw0rd12
+p4ssw0rd12!
+p4ssw0rd13
+p4ssw0rd13!
+p4ssw0rd14
+p4ssw0rd14!
+p4ssw0rd15
+p4ssw0rd15!
+p4ssw0rd16
+p4ssw0rd16!
+p4ssw0rd17
+p4ssw0rd17!
+p4ssw0rd18
+p4ssw0rd18!
+p4ssw0rd19
+p4ssw0rd19!
+p4ssw0rd20
+p4ssw0rd20!
+p4ssw0rd21
+p4ssw0rd21!
+p4ssw0rd22
+p4ssw0rd22!
+p4ssw0rd23
+p4ssw0rd23!
+p4ssw0rd24
+p4ssw0rd24!
+p4ssw0rd25
+p4ssw0rd25!
+p4ssw0rd26
+p4ssw0rd26!
+p4ssw0rd27
+p4ssw0rd27!
+p4ssw0rd28
+p4ssw0rd28!
+p4ssw0rd29
+p4ssw0rd29!
+p4ssw0rd30
+p4ssw0rd30!
+p4ssw0rd31
+p4ssw0rd31!
+p4ssw0rd32
+p4ssw0rd32!
+p4ssw0rd33
+p4ssw0rd33!
+p4ssw0rd34
+p4ssw0rd34!
+p4ssw0rd35
+p4ssw0rd35!
+p4ssw0rd36
+p4ssw0rd36!
+p4ssw0rd37
+p4ssw0rd37!
+p4ssw0rd38
+p4ssw0rd38!
+p4ssw0rd39
+p4ssw0rd39!
+p4ssw0rd40
+p4ssw0rd40!
+p4ssw0rd41
+p4ssw0rd41!
+p4ssw0rd42
+p4ssw0rd42!
+p4ssw0rd43
+p4ssw0rd43!
+p4ssw0rd44
+p4ssw0rd44!
+p4ssw0rd45
+p4ssw0rd45!
+p4ssw0rd46
+p4ssw0rd46!
+p4ssw0rd47
+p4ssw0rd47!
+p4ssw0rd48
+p4ssw0rd48!
+p4ssw0rd49
+p4ssw0rd49!
+p4ssw0rd50
+p4ssw0rd50!
+p4ssw0rd51
+p4ssw0rd51!
+p4ssw0rd52
+p4ssw0rd52!
+p4ssw0rd53
+p4ssw0rd53!
+p4ssw0rd54
+p4ssw0rd54!
+p4ssw0rd55
+p4ssw0rd55!
+p4ssw0rd56
+p4ssw0rd56!
+p4ssw0rd57
+p4ssw0rd57!
+p4ssw0rd58
+p4ssw0rd58!
+p4ssw0rd59
+p4ssw0rd59!
+p4ssw0rd60
+p4ssw0rd60!
+p4ssw0rd61
+p4ssw0rd61!
+p4ssw0rd62
+p4ssw0rd62!
+p4ssw0rd63
+p4ssw0rd63!
+p4ssw0rd64
+p4ssw0rd64!
+p4ssw0rd65
+p4ssw0rd65!
+p4ssw0rd66
+p4ssw0rd66!
+p4ssw0rd67
+p4ssw0rd67!
+p4ssw0rd68
+p4ssw0rd68!
+p4ssw0rd69
+p4ssw0rd69!
+p4ssw0rd70
+p4ssw0rd70!
+p4ssw0rd71
+p4ssw0rd71!
+p4ssw0rd72
+p4ssw0rd72!
+p4ssw0rd73
+p4ssw0rd73!
+p4ssw0rd74
+p4ssw0rd74!
+p4ssw0rd75
+p4ssw0rd75!
+p4ssw0rd76
+p4ssw0rd76!
+p4ssw0rd77
+p4ssw0rd77!
+p4ssw0rd78
+p4ssw0rd78!
+p4ssw0rd79
+p4ssw0rd79!
+p4ssw0rd80
+p4ssw0rd80!
+p4ssw0rd81
+p4ssw0rd81!
+p4ssw0rd82
+p4ssw0rd82!
+p4ssw0rd83
+p4ssw0rd83!
+p4ssw0rd84
+p4ssw0rd84!
+p4ssw0rd85
+p4ssw0rd85!
+p4ssw0rd86
+p4ssw0rd86!
+p4ssw0rd87
+p4ssw0rd87!
+p4ssw0rd88
+p4ssw0rd88!
+p4ssw0rd89
+p4ssw0rd89!
+p4ssw0rd90
+p4ssw0rd90!
+p4ssw0rd91
+p4ssw0rd91!
+p4ssw0rd92
+p4ssw0rd92!
+p4ssw0rd93
+p4ssw0rd93!
+p4ssw0rd94
+p4ssw0rd94!
+p4ssw0rd95
+p4ssw0rd95!
+p4ssw0rd96
+p4ssw0rd96!
+p4ssw0rd97
+p4ssw0rd97!
+p4ssw0rd98
+p4ssw0rd98!
+p4ssw0rd99
+p4ssw0rd99!
p4ssword
+p4ssword00
+p4ssword00!
+p4ssword01
+p4ssword01!
+p4ssword02
+p4ssword02!
+p4ssword03
+p4ssword03!
+p4ssword04
+p4ssword04!
+p4ssword05
+p4ssword05!
+p4ssword06
+p4ssword06!
+p4ssword07
+p4ssword07!
+p4ssword08
+p4ssword08!
+p4ssword09
+p4ssword09!
+p4ssword10
+p4ssword10!
+p4ssword11
+p4ssword11!
+p4ssword12
+p4ssword12!
+p4ssword13
+p4ssword13!
+p4ssword14
+p4ssword14!
+p4ssword15
+p4ssword15!
+p4ssword16
+p4ssword16!
+p4ssword17
+p4ssword17!
+p4ssword18
+p4ssword18!
+p4ssword19
+p4ssword19!
+p4ssword20
+p4ssword20!
+p4ssword21
+p4ssword21!
+p4ssword22
+p4ssword22!
+p4ssword23
+p4ssword23!
+p4ssword24
+p4ssword24!
+p4ssword25
+p4ssword25!
+p4ssword26
+p4ssword26!
+p4ssword27
+p4ssword27!
+p4ssword28
+p4ssword28!
+p4ssword29
+p4ssword29!
+p4ssword30
+p4ssword30!
+p4ssword31
+p4ssword31!
+p4ssword32
+p4ssword32!
+p4ssword33
+p4ssword33!
+p4ssword34
+p4ssword34!
+p4ssword35
+p4ssword35!
+p4ssword36
+p4ssword36!
+p4ssword37
+p4ssword37!
+p4ssword38
+p4ssword38!
+p4ssword39
+p4ssword39!
+p4ssword40
+p4ssword40!
+p4ssword41
+p4ssword41!
+p4ssword42
+p4ssword42!
+p4ssword43
+p4ssword43!
+p4ssword44
+p4ssword44!
+p4ssword45
+p4ssword45!
+p4ssword46
+p4ssword46!
+p4ssword47
+p4ssword47!
+p4ssword48
+p4ssword48!
+p4ssword49
+p4ssword49!
+p4ssword50
+p4ssword50!
+p4ssword51
+p4ssword51!
+p4ssword52
+p4ssword52!
+p4ssword53
+p4ssword53!
+p4ssword54
+p4ssword54!
+p4ssword55
+p4ssword55!
+p4ssword56
+p4ssword56!
+p4ssword57
+p4ssword57!
+p4ssword58
+p4ssword58!
+p4ssword59
+p4ssword59!
+p4ssword60
+p4ssword60!
+p4ssword61
+p4ssword61!
+p4ssword62
+p4ssword62!
+p4ssword63
+p4ssword63!
+p4ssword64
+p4ssword64!
+p4ssword65
+p4ssword65!
+p4ssword66
+p4ssword66!
+p4ssword67
+p4ssword67!
+p4ssword68
+p4ssword68!
+p4ssword69
+p4ssword69!
+p4ssword70
+p4ssword70!
+p4ssword71
+p4ssword71!
+p4ssword72
+p4ssword72!
+p4ssword73
+p4ssword73!
+p4ssword74
+p4ssword74!
+p4ssword75
+p4ssword75!
+p4ssword76
+p4ssword76!
+p4ssword77
+p4ssword77!
+p4ssword78
+p4ssword78!
+p4ssword79
+p4ssword79!
+p4ssword80
+p4ssword80!
+p4ssword81
+p4ssword81!
+p4ssword82
+p4ssword82!
+p4ssword83
+p4ssword83!
+p4ssword84
+p4ssword84!
+p4ssword85
+p4ssword85!
+p4ssword86
+p4ssword86!
+p4ssword87
+p4ssword87!
+p4ssword88
+p4ssword88!
+p4ssword89
+p4ssword89!
+p4ssword90
+p4ssword90!
+p4ssword91
+p4ssword91!
+p4ssword92
+p4ssword92!
+p4ssword93
+p4ssword93!
+p4ssword94
+p4ssword94!
+p4ssword95
+p4ssword95!
+p4ssword96
+p4ssword96!
+p4ssword97
+p4ssword97!
+p4ssword98
+p4ssword98!
+p4ssword99
+p4ssword99!
pa
paa
paadje
@@ -177630,25 +178034,424 @@
passus
passussen
passw0rd
+passw0rd00
+passw0rd00!
+passw0rd01
+passw0rd01!
+passw0rd02
+passw0rd02!
+passw0rd03
+passw0rd03!
+passw0rd04
+passw0rd04!
+passw0rd05
+passw0rd05!
+passw0rd06
+passw0rd06!
+passw0rd07
+passw0rd07!
+passw0rd08
+passw0rd08!
+passw0rd09
+passw0rd09!
+passw0rd10
+passw0rd10!
+passw0rd11
+passw0rd11!
+passw0rd12
+passw0rd12!
+passw0rd13
+passw0rd13!
+passw0rd14
+passw0rd14!
+passw0rd15
+passw0rd15!
+passw0rd16
+passw0rd16!
+passw0rd17
+passw0rd17!
+passw0rd18
+passw0rd18!
+passw0rd19
+passw0rd19!
+passw0rd20
+passw0rd20!
+passw0rd21
+passw0rd21!
+passw0rd22
+passw0rd22!
+passw0rd23
+passw0rd23!
+passw0rd24
+passw0rd24!
+passw0rd25
+passw0rd25!
+passw0rd26
+passw0rd26!
+passw0rd27
+passw0rd27!
+passw0rd28
+passw0rd28!
+passw0rd29
+passw0rd29!
+passw0rd30
+passw0rd30!
+passw0rd31
+passw0rd31!
+passw0rd32
+passw0rd32!
+passw0rd33
+passw0rd33!
+passw0rd34
+passw0rd34!
+passw0rd35
+passw0rd35!
+passw0rd36
+passw0rd36!
+passw0rd37
+passw0rd37!
+passw0rd38
+passw0rd38!
+passw0rd39
+passw0rd39!
+passw0rd40
+passw0rd40!
+passw0rd41
+passw0rd41!
+passw0rd42
+passw0rd42!
+passw0rd43
+passw0rd43!
+passw0rd44
+passw0rd44!
+passw0rd45
+passw0rd45!
+passw0rd46
+passw0rd46!
+passw0rd47
+passw0rd47!
+passw0rd48
+passw0rd48!
+passw0rd49
+passw0rd49!
+passw0rd50
+passw0rd50!
+passw0rd51
+passw0rd51!
+passw0rd52
+passw0rd52!
+passw0rd53
+passw0rd53!
+passw0rd54
+passw0rd54!
+passw0rd55
+passw0rd55!
+passw0rd56
+passw0rd56!
+passw0rd57
+passw0rd57!
+passw0rd58
+passw0rd58!
+passw0rd59
+passw0rd59!
+passw0rd60
+passw0rd60!
+passw0rd61
+passw0rd61!
+passw0rd62
+passw0rd62!
+passw0rd63
+passw0rd63!
+passw0rd64
+passw0rd64!
+passw0rd65
+passw0rd65!
+passw0rd66
+passw0rd66!
+passw0rd67
+passw0rd67!
+passw0rd68
+passw0rd68!
+passw0rd69
+passw0rd69!
+passw0rd70
+passw0rd70!
+passw0rd71
+passw0rd71!
+passw0rd72
+passw0rd72!
+passw0rd73
+passw0rd73!
+passw0rd74
+passw0rd74!
+passw0rd75
+passw0rd75!
+passw0rd76
+passw0rd76!
+passw0rd77
+passw0rd77!
+passw0rd78
+passw0rd78!
+passw0rd79
+passw0rd79!
+passw0rd80
+passw0rd80!
+passw0rd81
+passw0rd81!
+passw0rd82
+passw0rd82!
+passw0rd83
+passw0rd83!
+passw0rd84
+passw0rd84!
+passw0rd85
+passw0rd85!
+passw0rd86
+passw0rd86!
+passw0rd87
+passw0rd87!
+passw0rd88
+passw0rd88!
+passw0rd89
+passw0rd89!
+passw0rd90
+passw0rd90!
+passw0rd91
+passw0rd91!
+passw0rd92
+passw0rd92!
+passw0rd93
+passw0rd93!
+passw0rd94
+passw0rd94!
+passw0rd95
+passw0rd95!
+passw0rd96
+passw0rd96!
+passw0rd97
+passw0rd97!
+passw0rd98
+passw0rd98!
+passw0rd99
+passw0rd99!
passwd
passwo
password
password!
Password
+password00
+password00!
Password0032
+password01
+password01!
Password01!
+password02
+password02!
+password03
+password03!
+password04
+password04!
+password05
+password05!
+password06
+password06!
+password07
+password07!
+password08
+password08!
+password09
+password09!
password1
+password10
+password10!
password101
+password11
+password11!
password12
+password12!
Password12*
password122
password123
Password123
PassWord123!@#
password1234
+password13
+password13!
+password14
+password14!
+password15
+password15!
+password16
+password16!
+password17
+password17!
+password18
+password18!
+password19
+password19!
password1981
+password20
+password20!
password2009
+password21
+password21!
+password22
+password22!
+password23
+password23!
+password24
+password24!
+password25
+password25!
+password26
+password26!
+password27
+password27!
+password28
+password28!
+password29
+password29!
+password30
+password30!
+password31
+password31!
+password32
+password32!
+password33
+password33!
+password34
+password34!
+password35
+password35!
+password36
+password36!
+password37
+password37!
+password38
+password38!
+password39
+password39!
+password40
+password40!
+password41
+password41!
+password42
+password42!
+password43
+password43!
+password44
+password44!
+password45
+password45!
+password46
+password46!
+password47
+password47!
+password48
+password48!
+password49
+password49!
+password50
+password50!
+password51
+password51!
+password52
+password52!
+password53
+password53!
+password54
+password54!
+password55
+password55!
+password56
+password56!
+password57
+password57!
+password58
+password58!
+password59
+password59!
+password60
+password60!
+password61
+password61!
+password62
+password62!
+password63
+password63!
+password64
+password64!
+password65
+password65!
+password66
+password66!
+password67
+password67!
+password68
+password68!
+password69
+password69!
+password70
+password70!
+password71
+password71!
+password72
+password72!
+password73
+password73!
+password74
+password74!
+password75
+password75!
+password76
+password76!
+password77
+password77!
+password78
+password78!
+password79
+password79!
+password80
+password80!
+password81
+password81!
+password82
+password82!
+password83
+password83!
+password84
+password84!
+password85
+password85!
+password86
+password86!
+password87
+password87!
+password88
+password88!
+password89
+password89!
+password90
+password90!
+password91
+password91!
password9191
+password92
+password92!
+password93
+password93!
+password94
+password94!
+password95
+password95!
+password96
+password96!
+password97
+password97!
+password98
+password98!
+password99
+password99!
Password999.
passwordz
passwordz!
@@ -249459,6 +250262,8 @@
velouteert
velouteren
velt
+velthuis
+velthuiskliniek
veltre
velum
velums
@@ -268200,8 +269005,206 @@
welch
welchman
welcome
+welcome00
+welcome00!
welcome01
welcome01!
+welcome02
+welcome02!
+welcome03
+welcome03!
+welcome04
+welcome04!
+welcome05
+welcome05!
+welcome06
+welcome06!
+welcome07
+welcome07!
+welcome08
+welcome08!
+welcome09
+welcome09!
+welcome10
+welcome10!
+welcome11
+welcome11!
+welcome12
+welcome12!
+welcome13
+welcome13!
+welcome14
+welcome14!
+welcome15
+welcome15!
+welcome16
+welcome16!
+welcome17
+welcome17!
+welcome18
+welcome18!
+welcome19
+welcome19!
+welcome20
+welcome20!
+welcome21
+welcome21!
+welcome22
+welcome22!
+welcome23
+welcome23!
+welcome24
+welcome24!
+welcome25
+welcome25!
+welcome26
+welcome26!
+welcome27
+welcome27!
+welcome28
+welcome28!
+welcome29
+welcome29!
+welcome30
+welcome30!
+welcome31
+welcome31!
+welcome32
+welcome32!
+welcome33
+welcome33!
+welcome34
+welcome34!
+welcome35
+welcome35!
+welcome36
+welcome36!
+welcome37
+welcome37!
+welcome38
+welcome38!
+welcome39
+welcome39!
+welcome40
+welcome40!
+welcome41
+welcome41!
+welcome42
+welcome42!
+welcome43
+welcome43!
+welcome44
+welcome44!
+welcome45
+welcome45!
+welcome46
+welcome46!
+welcome47
+welcome47!
+welcome48
+welcome48!
+welcome49
+welcome49!
+welcome50
+welcome50!
+welcome51
+welcome51!
+welcome52
+welcome52!
+welcome53
+welcome53!
+welcome54
+welcome54!
+welcome55
+welcome55!
+welcome56
+welcome56!
+welcome57
+welcome57!
+welcome58
+welcome58!
+welcome59
+welcome59!
+welcome60
+welcome60!
+welcome61
+welcome61!
+welcome62
+welcome62!
+welcome63
+welcome63!
+welcome64
+welcome64!
+welcome65
+welcome65!
+welcome66
+welcome66!
+welcome67
+welcome67!
+welcome68
+welcome68!
+welcome69
+welcome69!
+welcome70
+welcome70!
+welcome71
+welcome71!
+welcome72
+welcome72!
+welcome73
+welcome73!
+welcome74
+welcome74!
+welcome75
+welcome75!
+welcome76
+welcome76!
+welcome77
+welcome77!
+welcome78
+welcome78!
+welcome79
+welcome79!
+welcome80
+welcome80!
+welcome81
+welcome81!
+welcome82
+welcome82!
+welcome83
+welcome83!
+welcome84
+welcome84!
+welcome85
+welcome85!
+welcome86
+welcome86!
+welcome87
+welcome87!
+welcome88
+welcome88!
+welcome89
+welcome89!
+welcome90
+welcome90!
+welcome91
+welcome91!
+welcome92
+welcome92!
+welcome93
+welcome93!
+welcome94
+welcome94!
+welcome95
+welcome95!
+welcome96
+welcome96!
+welcome97
+welcome97!
+welcome98
+welcome98!
+welcome99
+welcome99!
welcomed
welcomes
welcomin
@@ -268335,8 +269338,206 @@
welke
welken
welkom
+welkom00
+welkom00!
welkom01
welkom01!
+welkom02
+welkom02!
+welkom03
+welkom03!
+welkom04
+welkom04!
+welkom05
+welkom05!
+welkom06
+welkom06!
+welkom07
+welkom07!
+welkom08
+welkom08!
+welkom09
+welkom09!
+welkom10
+welkom10!
+welkom11
+welkom11!
+welkom12
+welkom12!
+welkom13
+welkom13!
+welkom14
+welkom14!
+welkom15
+welkom15!
+welkom16
+welkom16!
+welkom17
+welkom17!
+welkom18
+welkom18!
+welkom19
+welkom19!
+welkom20
+welkom20!
+welkom21
+welkom21!
+welkom22
+welkom22!
+welkom23
+welkom23!
+welkom24
+welkom24!
+welkom25
+welkom25!
+welkom26
+welkom26!
+welkom27
+welkom27!
+welkom28
+welkom28!
+welkom29
+welkom29!
+welkom30
+welkom30!
+welkom31
+welkom31!
+welkom32
+welkom32!
+welkom33
+welkom33!
+welkom34
+welkom34!
+welkom35
+welkom35!
+welkom36
+welkom36!
+welkom37
+welkom37!
+welkom38
+welkom38!
+welkom39
+welkom39!
+welkom40
+welkom40!
+welkom41
+welkom41!
+welkom42
+welkom42!
+welkom43
+welkom43!
+welkom44
+welkom44!
+welkom45
+welkom45!
+welkom46
+welkom46!
+welkom47
+welkom47!
+welkom48
+welkom48!
+welkom49
+welkom49!
+welkom50
+welkom50!
+welkom51
+welkom51!
+welkom52
+welkom52!
+welkom53
+welkom53!
+welkom54
+welkom54!
+welkom55
+welkom55!
+welkom56
+welkom56!
+welkom57
+welkom57!
+welkom58
+welkom58!
+welkom59
+welkom59!
+welkom60
+welkom60!
+welkom61
+welkom61!
+welkom62
+welkom62!
+welkom63
+welkom63!
+welkom64
+welkom64!
+welkom65
+welkom65!
+welkom66
+welkom66!
+welkom67
+welkom67!
+welkom68
+welkom68!
+welkom69
+welkom69!
+welkom70
+welkom70!
+welkom71
+welkom71!
+welkom72
+welkom72!
+welkom73
+welkom73!
+welkom74
+welkom74!
+welkom75
+welkom75!
+welkom76
+welkom76!
+welkom77
+welkom77!
+welkom78
+welkom78!
+welkom79
+welkom79!
+welkom80
+welkom80!
+welkom81
+welkom81!
+welkom82
+welkom82!
+welkom83
+welkom83!
+welkom84
+welkom84!
+welkom85
+welkom85!
+welkom86
+welkom86!
+welkom87
+welkom87!
+welkom88
+welkom88!
+welkom89
+welkom89!
+welkom90
+welkom90!
+welkom91
+welkom91!
+welkom92
+welkom92!
+welkom93
+welkom93!
+welkom94
+welkom94!
+welkom95
+welkom95!
+welkom96
+welkom96!
+welkom97
+welkom97!
+welkom98
+welkom98!
+welkom99
+welkom99!
welkome
welkomst
welkomstgroet
@@ -273797,6 +274998,8 @@
xpc
xpd
xpe
+xpert
+xpertclinic
xpf
xpg
xph
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-07-09 12:26:47
|
Revision: 825
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=825&view=rev
Author: michieltcs
Date: 2012-07-09 12:26:37 +0000 (Mon, 09 Jul 2012)
Log Message:
-----------
Refactor (most of) the export form to RespondentExport
Modified Paths:
--------------
trunk/library/classes/Gems/Default/RespondentAction.php
trunk/library/classes/Gems/Default/RespondentExportAction.php
trunk/library/classes/Gems/Export/RespondentExport.php
Modified: trunk/library/classes/Gems/Default/RespondentAction.php
===================================================================
--- trunk/library/classes/Gems/Default/RespondentAction.php 2012-07-09 08:10:13 UTC (rev 824)
+++ trunk/library/classes/Gems/Default/RespondentAction.php 2012-07-09 12:26:37 UTC (rev 825)
@@ -62,40 +62,6 @@
public $useTabbedForms = true;
/**
- * Constructs the form
- *
- * @param Gems_Export_RespondentExport $export
- * @return Gems_Form_TableForm
- */
- protected function _getExportForm($export)
- {
- $form = new Gems_Form_TableForm();
- $form->setAttrib('target', '_blank');
-
- $element = new Zend_Form_Element_Checkbox('group');
- $element->setLabel($this->_('Group surveys'));
- $element->setValue(1);
- $form->addElement($element);
-
- $element = new Zend_Form_Element_Select('format');
- $element->setLabel($this->_('Output format'));
- $outputFormats = array('html' => 'HTML');
- if (!empty($export->_wkhtmltopdfLocation)) {
- $outputFormats['pdf'] = 'PDF';
- $element->setValue('pdf');
- }
- $element->setMultiOptions($outputFormats);
- $form->addElement($element);
-
- $element = new Zend_Form_Element_Submit('export');
- $element->setLabel($this->_('Export'))
- ->setAttrib('class', 'button');
- $form->addElement($element);
-
- return $form;
- }
-
- /**
* Adds columns from the model to the bridge that creates the browse table.
*
* Adds a button column to the model, if such a button exists in the model.
@@ -530,7 +496,7 @@
//Now show the export form
$export = $this->loader->getRespondentExport($this);
- $form = $this->_getExportForm($export);
+ $form = $export->getForm();
$this->html->h2($this->_('Export respondent'));
$div = $this->html->div(array('id' => 'mainform'));
$div[] = $form;
Modified: trunk/library/classes/Gems/Default/RespondentExportAction.php
===================================================================
--- trunk/library/classes/Gems/Default/RespondentExportAction.php 2012-07-09 08:10:13 UTC (rev 824)
+++ trunk/library/classes/Gems/Default/RespondentExportAction.php 2012-07-09 12:26:37 UTC (rev 825)
@@ -46,55 +46,17 @@
{
public $useHtmlView = true;
- /**
- * Constructs the form
- *
- * @param Gems_Export_RespondentExport $export
- * @return Gems_Form_TableForm
- */
- protected function _getForm($export)
+ public function indexAction()
{
- $form = new Gems_Form_TableForm();
- $form->setAttrib('target', '_blank');
+ $export = $this->loader->getRespondentExport($this);
$element = new Zend_Form_Element_Text('id');
$element->setLabel($this->_('Respondent number'));
-
- // only show description if we got here directly (id is empty)
- if ($this->getRequest()->getParam('id') == '') {
- $element->setDescription($this->_('Separate multiple respondents with a comma (,)'));
- }
-
+ $element->setOrder(-1);
+ $element->setDescription($this->_('Separate multiple respondents with a comma (,)'));
+ $form = $export->getForm();
$form->addElement($element);
- $element = new Zend_Form_Element_Checkbox('group');
- $element->setLabel($this->_('Group surveys'));
- $element->setValue(1);
- $form->addElement($element);
-
- $element = new Zend_Form_Element_Select('format');
- $element->setLabel($this->_('Output format'));
- $outputFormats = array('html' => 'HTML');
- if (!empty($export->_wkhtmltopdfLocation)) {
- $outputFormats['pdf'] = 'PDF';
- $element->setValue('pdf');
- }
- $element->setMultiOptions($outputFormats);
- $form->addElement($element);
-
- $element = new Zend_Form_Element_Submit('export');
- $element->setLabel($this->_('Export'))
- ->setAttrib('class', 'button');
- $form->addElement($element);
-
- return $form;
- }
-
- public function indexAction()
- {
- $export = $this->loader->getRespondentExport($this);
-
- $form = $this->_getForm($export);
$this->html->h2($this->_('Export respondent'));
$div = $this->html->div(array('id' => 'mainform'));
$div[] = $form;
Modified: trunk/library/classes/Gems/Export/RespondentExport.php
===================================================================
--- trunk/library/classes/Gems/Export/RespondentExport.php 2012-07-09 08:10:13 UTC (rev 824)
+++ trunk/library/classes/Gems/Export/RespondentExport.php 2012-07-09 12:26:37 UTC (rev 825)
@@ -307,7 +307,40 @@
$this->_exportTrack($track);
}
}
+
+ /**
+ * Constructs the form
+ *
+ * @return Gems_Form_TableForm
+ */
+ public function getForm()
+ {
+ $form = new Gems_Form_TableForm();
+ $form->setAttrib('target', '_blank');
+ $element = new Zend_Form_Element_Checkbox('group');
+ $element->setLabel($this->_('Group surveys'));
+ $element->setValue(1);
+ $form->addElement($element);
+
+ $element = new Zend_Form_Element_Select('format');
+ $element->setLabel($this->_('Output format'));
+ $outputFormats = array('html' => 'HTML');
+ if (!empty($this->_wkhtmltopdfLocation)) {
+ $outputFormats['pdf'] = 'PDF';
+ $element->setValue('pdf');
+ }
+ $element->setMultiOptions($outputFormats);
+ $form->addElement($element);
+
+ $element = new Zend_Form_Element_Submit('export');
+ $element->setLabel($this->_('Export'))
+ ->setAttrib('class', 'button');
+ $form->addElement($element);
+
+ return $form;
+ }
+
/**
* Renders the entire report (including layout)
*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-07-09 08:10:24
|
Revision: 824
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=824&view=rev
Author: mennodekker
Date: 2012-07-09 08:10:13 +0000 (Mon, 09 Jul 2012)
Log Message:
-----------
Reverting last change as it breaks existing layouts
Modified Paths:
--------------
trunk/new_project/htdocs/gems/css/gems-new.css
Modified: trunk/new_project/htdocs/gems/css/gems-new.css
===================================================================
--- trunk/new_project/htdocs/gems/css/gems-new.css 2012-07-06 16:35:15 UTC (rev 823)
+++ trunk/new_project/htdocs/gems/css/gems-new.css 2012-07-09 08:10:13 UTC (rev 824)
@@ -1,3 +1,8 @@
+/*
+ * START OF LAYOUT
+ *
+ * Be careful making changes here
+ */
/* column container */
#wrapper {
@@ -23,6 +28,35 @@
right:160px; /* menu_abs_width */
}
+#main {
+ margin: 10px 10px 10px 170px; /* margin margin margin margin + menu_abs_width */
+ position:relative;
+ right:100%;
+ overflow:hidden;
+}
+#menu {
+ margin: 10px 10px 10px 10px; /* margin margin margin margin */
+ float:left;
+ width:140px; /* menu_abs_width - margin - margin */
+ position:relative;
+ right:160px; /* menu_abs_width */
+}
+
+/* Header/footer styles */
+#footer {
+ margin-bottom: 10px;
+ height: 1.2em;
+}
+
+.fullwidth > div {
+ margin: 0px 5px; /* provide a little 'air' on full-width */
+}
+
+/*
+ * END OF LAYOUT
+ */
+
+
/* Links */
a {
text-decoration: none;
@@ -71,6 +105,18 @@
padding-right: 20px !important;
}
+.askRound {
+ margin-left: 2em;
+}
+
+.askSurvey {
+ margin: 0.1em 0 0.1em 4em;
+}
+
+.askTrack {
+ margin-top: 0.8em;
+}
+
body {
margin: 0;
padding: 0;
@@ -156,19 +202,6 @@
padding-right: 0.5em;
}
-/* Header/footer styles */
-#footer {
- margin-bottom: 10px;
-}
-
-#footer div, #header_bar div, #header_bar span {
- padding: 1px 3px 2px 3px;
-}
-
-.fullwidth > div {
- margin: 0px 5px; /* provide a little 'air' on full-width */
-}
-
h1, h2, h3 {
margin: 0.5em 0 0.25em 0;
padding: 0;
@@ -179,8 +212,8 @@
padding: 0;
}
-#header_bar {
- padding: 0px;
+#header h1 {
+ margin-top: 0;
}
#header_bar #contact .dropdownContent {
@@ -203,21 +236,9 @@
width: 100%;
}
-#header h1 {
- margin-top: 0;
-}
-
-#header_bar #organizations {
- float:left;
- height: 1.7em;
- padding-top: 2px;
- overflow: hidden;
-}
-
-#header_bar #organizations input, #header_bar #organizations select { margin: 1px; padding: 0px; font-size: 100%;}
-
#login .logout {
- margin-left: 0.5em;
+ margin-left: 1em;
+ margin-right: .5em;
}
img {
@@ -262,12 +283,9 @@
padding: 2px 0.5em;
}
+/* *padding + *ovverflow to use only in IE */
#main {
- margin: 10px 10px 10px 170px; /* margin margin margin margin + menu_abs_width */
- position:relative;
- right:100%;
- overflow:hidden;
- /* *padding + *overflow to use only in IE 6 */
+ margin-bottom: 10px;
*overflow-x: auto;
*padding-bottom: 25px;
}
@@ -310,12 +328,7 @@
}
#menu {
- margin: 10px 10px 10px 10px; /* margin margin margin margin */
- float:left;
- width:140px; /* menu_abs_width - margin - margin */
padding: 0px 0 10px 10px;
- position:relative;
- right:160px; /* menu_abs_width */
word-wrap: break-word; /* IE only feature */
}
@@ -361,6 +374,29 @@
font-weight: bold;
}
+#header_bar {
+ height: 1.9em;
+ padding: 0px;
+}
+
+#header_bar #contact, #header_bar #login {
+ position: relative;
+ padding: 5px 5px 0 5px;
+}
+
+#header_bar #languages {
+ padding: 5px;
+}
+
+#header_bar #organizations {
+ float:left;
+ height: 1.7em;
+ padding-top: 2px;
+ overflow: hidden;
+}
+
+#header_bar #organizations input, #header_bar #organizations select { margin: 1px; padding: 0px; font-size: 100%;}
+
.middleAlign {
vertical-align: middle;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-07-06 16:35:22
|
Revision: 823
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=823&view=rev
Author: matijsdejong
Date: 2012-07-06 16:35:15 +0000 (Fri, 06 Jul 2012)
Log Message:
-----------
Final step in making Role editing user friendly
Modified Paths:
--------------
trunk/library/changelog.txt
trunk/library/classes/Gems/Default/RoleAction.php
trunk/library/configs/db/tables/gems__roles.20.sql
Modified: trunk/library/changelog.txt
===================================================================
--- trunk/library/changelog.txt 2012-07-06 14:09:57 UTC (rev 822)
+++ trunk/library/changelog.txt 2012-07-06 16:35:15 UTC (rev 823)
@@ -1,8 +1,10 @@
Important changes from 1.5.4 => 1.5.5
============================================================
+Role editing has become more interactive and safer to use
Internally code no longer uses the 'Hidden Organization' but expects both an id1/patientNr plus an id2/organizationId to be specified
Externally the organization id is still left out of the url when not needed
-UPGRADE WARNING: Check all your (snippet) extensions to RespondentAction and project specific versions of ShowTrackTokenSnippet and ShowSingleSurveySnippet: you may need to specify extra parameters as the menu items need to know the organization id
+UPGRADE WARNING: Check all your (snippet) extensions to RespondentAction, TrackAction, SurveyAction and project specific versions of ShowTrackTokenSnippet and ShowSingleSurveySnippet: you may need to specify extra parameters as the menu items need to know the organization id
+New projects start with a basic css template
Important changes from 1.5.3 => 1.5.4
============================================================
Modified: trunk/library/classes/Gems/Default/RoleAction.php
===================================================================
--- trunk/library/classes/Gems/Default/RoleAction.php 2012-07-06 14:09:57 UTC (rev 822)
+++ trunk/library/classes/Gems/Default/RoleAction.php 2012-07-06 16:35:15 UTC (rev 823)
@@ -94,17 +94,23 @@
foreach ($possibleParents as $parent) {
if ($this->acl->hasRole($data['grl_name']) && $this->acl->inheritsRole($parent, $data['grl_name'])) {
$disabled[] = $parent;
+ $possibleParents[$parent] .= ' ' . MUtil_Html::create('small', $this->_('child of current role'), $this->view);
unset($currentParents[$parent]);
} else {
foreach ($currentParents as $p2) {
if ($this->acl->hasRole($p2) && $this->acl->inheritsRole($p2, $parent)) {
$disabled[] = $parent;
+ $possibleParents[$parent] .= ' ' . MUtil_Html::create(
+ 'small',
+ MUtil_Html::raw(sprintf($this->_('inherited from %s'), MUtil_Html::create('em', $p2, $this->view))),
+ $this->view);
$currentParents[$parent] = $parent;
}
}
}
}
$disabled[] = $data['grl_name'];
+ $possibleParents[$data['grl_name']] .= ' ' . MUtil_Html::create('small', $this->_('this role'), $this->view);
}
$bridge->addMultiCheckbox('grl_parents', 'multiOptions', $possibleParents,
'disable', $disabled,
Modified: trunk/library/configs/db/tables/gems__roles.20.sql
===================================================================
--- trunk/library/configs/db/tables/gems__roles.20.sql 2012-07-06 14:09:57 UTC (rev 822)
+++ trunk/library/configs/db/tables/gems__roles.20.sql 2012-07-06 16:35:15 UTC (rev 823)
@@ -31,6 +31,6 @@
('security','security','','guest', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
('staff','staff','pr.option.edit,pr.option.password,pr.plan,pr.plan.overview,pr.plan.token,pr.project,pr.project.questions,pr.respondent.create,pr.respondent.edit,pr.respondent.who,pr.setup,pr.staff,pr.survey,pr.survey.create,pr.token,pr.token.answers,pr.token.delete,pr.token.edit,pr.token.mail,pr.token.print,pr.track,pr.track.create,pr.track.delete,pr.track.edit,pr.respondent.reportdeath','guest', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
('physician','physician','','staff', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('researcher','researcher','pr.project-information.changelog,pr.contact,pr.export,pr.plan.token,pr.plan.respondent,pr.plan.overview,pr.option.password,pr.option.edit,pr.organization-switch,pr.islogin','', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
+ ('researcher','researcher','pr.project-information.changelog,pr.contact,pr.export,pr.plan.token,pr.plan.respondent,pr.plan.overview,pr.option.password,pr.option.edit,pr.organization-switch,pr.islogin','guest', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
('admin','admin','pr.consent,pr.consent.create,pr.consent.edit,pr.group,pr.role,pr.mail,pr.mail.create,pr.mail.delete,pr.mail.edit,pr.mail.log,pr.organization,pr.organization-switch,pr.plan.overview.excel,pr.plan.respondent,pr.plan.respondent.excel,pr.plan.token.excel,pr.project-information,pr.reception,pr.reception.create,pr.reception.edit,pr.respondent.choose-org,pr.respondent.delete,pr.respondent.result,pr.source,pr.staff.create,pr.staff.delete,pr.staff.edit,pr.staff.see.all,pr.survey-maintenance,pr.track-maintenance,pr.token.mail.freetext','staff,researcher,security', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
('super','super','pr.consent.delete,pr.country,pr.country.create,pr.country.delete,pr.country.edit,pr.database,pr.database.create,pr.database.delete,pr.database.edit,pr.database.execute,pr.database.patches,pr.group.create,pr.group.edit,pr.language,pr.mail.server,pr.mail.server.create,pr.mail.server.delete,pr.mail.server.edit,pr.organization.create,pr.organization.edit,pr.plan.choose-org,pr.plan.mail-as-application,pr.reception.delete,pr.role.create,pr.role.edit,pr.source.create,pr.source.edit,pr.source.synchronize,pr.source.synchronize-all,pr.staff.edit.all,pr.survey-maintenance.edit,pr.track-maintenance.create,pr.track-maintenance.edit,pr.maintenance','admin', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-07-06 14:10:08
|
Revision: 822
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=822&view=rev
Author: matijsdejong
Date: 2012-07-06 14:09:57 +0000 (Fri, 06 Jul 2012)
Log Message:
-----------
Fix in initiation script: not all required values were filled.
Modified Paths:
--------------
trunk/library/configs/db/tables/gems__organizations.20.sql
Modified: trunk/library/configs/db/tables/gems__organizations.20.sql
===================================================================
--- trunk/library/configs/db/tables/gems__organizations.20.sql 2012-07-05 16:46:14 UTC (rev 821)
+++ trunk/library/configs/db/tables/gems__organizations.20.sql 2012-07-06 14:09:57 UTC (rev 822)
@@ -40,5 +40,6 @@
AUTO_INCREMENT = 70
CHARACTER SET 'utf8' COLLATE 'utf8_general_ci';
-INSERT INTO `gems__organizations` (`gor_id_organization`, `gor_name`) VALUES
-(70, 'New organization');
+INSERT ignore INTO `gems__organizations` (`gor_id_organization`, `gor_name`, gor_changed, gor_changed_by, gor_created, gor_created_by)
+ VALUES
+ (70, 'New organization', CURRENT_TIMESTAMP, 0, CURRENT_TIMESTAMP, 0);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-07-05 16:46:20
|
Revision: 821
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=821&view=rev
Author: matijsdejong
Date: 2012-07-05 16:46:14 +0000 (Thu, 05 Jul 2012)
Log Message:
-----------
Added new default layout
Added Paths:
-----------
trunk/new_project/htdocs/gems/css/gems-fluid2.css
Added: trunk/new_project/htdocs/gems/css/gems-fluid2.css
===================================================================
--- trunk/new_project/htdocs/gems/css/gems-fluid2.css (rev 0)
+++ trunk/new_project/htdocs/gems/css/gems-fluid2.css 2012-07-05 16:46:14 UTC (rev 821)
@@ -0,0 +1,686 @@
+/* Fluid width css */
+
+/* General styles */
+#all {
+ margin:0;
+ padding:0;
+ border:0; /* This removes the border around the viewport in old versions of IE */
+ width:100%;
+ min-width:600px; /* Minimum width of layout - remove line if not required */
+ /* The min-width property does not work in old versions of Internet Explorer */
+}
+
+#header, #footer, #header_bar, .zend_echo {
+ clear: both;
+ float: left;
+ width: 100%;
+}
+
+#main {
+ width: 81%;
+}
+
+#main, #menu {
+ margin: 0.5em 0.5%; /* margin margin margin margin + menu_abs_width */
+}
+
+#menu {
+ margin-top: 1em;
+ width: 16%;
+}
+
+table.browser, table.timeTable {
+ width: 99%; /* to show shadows, 1% off */
+}
+
+/* Adapted common css: should move to one file */
+
+
+
+/* Links */
+a {
+ text-decoration: none;
+}
+
+.actionlink {
+ white-space: nowrap;
+}
+
+a.actionlink {
+ font-style: normal;
+ text-decoration: none;
+}
+
+a.actionlink + a.actionlink,
+a.actionlink + span.actionlink,
+span.actionlink + a.actionlink,
+span.actionlink + span.actionlink {
+ margin-left: 1em;
+}
+
+span.actionlink {
+ font-style: italic;
+}
+
+a:hover {
+ text-decoration: underline;
+}
+
+a[href^="mailto:"] {
+ background: transparent url(../images/mail.png) no-repeat scroll right center;
+ padding-right: 20px;
+}
+
+a:hover[href^="mailto:"] {
+ text-decoration: underline !important;
+}
+
+a.globe {
+ background: transparent url(../images/globe.png) no-repeat scroll right center;
+ padding-right: 20px;
+}
+
+a.pdf {
+ background: transparent url(../images/pdf_small.gif) no-repeat scroll right center;
+ padding-right: 20px !important;
+}
+
+body {
+ margin: 0;
+ padding: 0;
+}
+
+button.ui-datepicker-trigger {
+ margin: 0 0.25em 0 0.25em;
+ padding: 0;
+ vertical-align: middle;
+}
+
+.centerAlign {
+ text-align: center;
+}
+
+.currentRow {
+ background-color: aqua;
+ border: 3px solid darkblue !important;
+}
+
+.deleted {
+ color: #888888;
+ font-style: italic;
+ text-decoration: line-through; /* Bug in Firefox: line-through remains on for descending inline elements */
+}
+
+.icon {
+ float: right;
+ padding-right: 4px;
+}
+
+input[disabled], .disabled {
+ color: #737373;
+ font-style: italic;
+}
+
+input[disabled] {
+ color: #000000;
+ background: #EBEBE4;
+}
+
+input[readonly] {
+ background: #EBEBE4;
+}
+
+div, img, li, p, ul {
+ margin: 0;
+ padding: 0;
+}
+
+div.buttons {
+ margin: 0.5em 0;
+}
+
+.zend_echo, .errors {
+ background: #FAF8CC;
+ margin: 2px;
+ padding: 0.25em 0.5em;
+ border: 1px solid;
+}
+
+.tableSpecial,
+.zend_echo,
+.errors,
+.ui-tabs-nav-item.taberror span {
+ color: #DD0000;
+ font-weight: bold;
+}
+
+.errors {
+ border-radius: 6px;
+ -moz-border-radius: 6px;
+ -webkit-border-radius: 6px;
+ display: inline-block;
+}
+
+dd .errors {
+ display: block;
+}
+
+ul.errors {
+ padding-left: 1.5em;
+ padding-right: 0.5em;
+}
+
+/* Header/footer styles */
+#footer {
+ margin-bottom: 10px;
+}
+
+#footer div, #header_bar div, #header_bar span {
+ padding: 1px 3px 2px 3px;
+}
+
+.fullwidth > div {
+ margin: 0px 5px; /* provide a little 'air' on full-width */
+}
+
+h1, h2, h3 {
+ margin: 0.5em 0 0.25em 0;
+ padding: 0;
+}
+
+h4 {
+ margin: 0.125em 0;
+ padding: 0;
+}
+
+#header_bar {
+ padding: 0px;
+}
+
+#header_bar #contact .dropdownContent {
+ display: none;
+}
+
+#header_bar #contact:hover .dropdownContent {
+ display: block;
+ float: right;
+ left: -120%;
+ line-height: 110%;
+ list-style-type: none;
+ position: absolute;
+ text-align: right;
+ width: 200%;
+}
+
+#header_bar #contact .dropdownContent a {
+ display: inline-block;
+ width: 100%;
+}
+
+#header h1 {
+ margin-top: 0;
+}
+
+#header_bar #organizations {
+ float:left;
+ height: 1.7em;
+ padding-top: 2px;
+ overflow: hidden;
+}
+
+#header_bar #organizations input, #header_bar #organizations select { margin: 1px; padding: 0px; font-size: 100%;}
+
+#login .logout {
+ margin-left: 0.5em;
+}
+
+img {
+ border: 0 solid transparent;
+}
+
+.indent {
+ margin-left: 4em;
+ margin-right: 4em;
+}
+
+.indentLeft {
+ padding-left: 3em;
+}
+
+input.token_copy {
+ background-color: #EEEEEE;
+}
+
+label.required {
+ font-weight: bold;
+}
+
+.leftFloat {
+ float: left;
+ margin-right: 0.4em;
+}
+
+.logFile {
+ border: 2px solid #888888;
+ /* border-right: 0px transparent; */
+ padding: 1px 0 1px 3px;
+ height: 500px;
+ overflow: auto;
+ width: 99%;
+}
+
+.mailpreview {
+ background-color: #FEFEFE;
+ border: 3px groove #888888;
+ margin: 2px 1px;
+ padding: 2px 0.5em;
+}
+
+#main {
+ float: right;
+ /* *padding + *overflow to use only in IE 6 */
+ *overflow-x: auto;
+ *padding-bottom: 25px;
+}
+
+#main_full_width {
+ background: transparent;
+ margin-bottom: 10px;
+ padding: 10px 5px 0 5px;
+}
+
+#main form dd {
+ display: inline-block;
+ *display: inline;
+ margin: 0 10px;
+}
+
+#main form dt {
+ margin: 0;
+}
+
+#main form dt label {
+ clear: left;
+ float: left;
+ margin: 0 0.25em 0 0;
+}
+
+#main ul {
+ margin-bottom: 0.75em;
+ margin-top: 0.75em;
+}
+
+#main #tabContainer ul {
+ margin-bottom: 0em;
+ margin-top: 0em;
+}
+
+#main .tooldock .toolbox ul {
+ margin-bottom: 0;
+ margin-top: 0;
+}
+
+#menu {
+ float: left;
+ padding: 0 0 10px 10px;
+ word-wrap: break-word; /* IE only feature */
+}
+
+#menu .navigation {
+ margin-left: 10px;
+}
+
+#menu .navigation .active {
+ font-weight: bold;
+}
+
+#menu ul {
+ margin-bottom: 0;
+}
+
+#menu ul li ul {
+ margin: 0 0 0.25em 1em;
+}
+
+#menu ul li a {
+ display: block;
+ *height: 1%; /* IE 6 Fix */
+ margin: 0;
+ padding: 0;
+ *width: 115px; /* IE 6 Fix */
+}
+
+#menu ul li a.breakBefore {
+ border-top: 1px dotted;
+ margin: 3px 4px 0 0;
+ padding: 2px 0 0 0;
+}
+
+#menu ul li a.noParameters {
+ font-style: italic;
+}
+
+#menu .navigation .active ul li {
+ font-weight: normal;
+}
+
+#menu .navigation .active ul li.active {
+ font-weight: bold;
+}
+
+.middleAlign {
+ vertical-align: middle;
+}
+
+p.description {
+ display: inline;
+ font-size: 0.75em;
+ padding: 2px 6px;
+}
+
+p.info {
+ margin: 0.75em 0;
+}
+
+.periodSlider {
+ margin: 0.5em;
+}
+
+.print-only { display: none; }
+
+.rightAlign {
+ text-align: right;
+}
+
+.rightFloat {
+ float: right;
+ margin-left: 0.4em;
+}
+
+.search {
+ line-height: 250%;
+ margin: 0.5em 0;
+}
+
+.search input {
+ margin: 0 0.2em;
+}
+
+.search .inputgroup {
+ border: 2px solid;
+ border-bottom-radius: 6px;
+ -moz-border-radius: 6px;
+ -webkit-border-radius: 6px;
+ clear: both;
+ float: left;
+ line-height: 125%;
+ margin: 0 auto 0.25em 0;
+ padding: 0.25em 0.5em 0.25em;
+}
+
+.search select {
+ width: 16em;
+}
+
+.search select.minimal {
+ width: auto;
+}
+
+select {
+ max-width: 48em;
+}
+
+select option[value=''], select[value=''] {
+ color: #737373;
+ font-style: italic;
+}
+
+.separator {
+ color: grey;
+ font-weight: normal;
+}
+
+.smallTime {
+ font-size: 80%;
+ font-style: italic;
+}
+
+.sortAsc, .sortAscSelected, .sortDescSelected {
+ line-height: 1.3em;
+ padding-bottom: 7px;
+}
+
+.sortAsc:hover, .sortAscSelected, .sortDescSelected:hover {
+ background: transparent url(../images/sort_asc.png) no-repeat scroll center bottom;
+}
+
+a.sortAscSelected:hover, a.sortDescSelected {
+ background: transparent url(../images/sort_desc.png) no-repeat scroll center bottom;
+}
+
+span.thetooltip {
+ display: none;
+}
+
+.sponsoring {
+ font-size: 80%;
+ margin: 5em auto 0 auto;
+ padding: 2px;
+ text-align: center;
+}
+
+table, td, th {
+ empty-cells: show;
+ margin: 0;
+ overflow: visible;
+ padding: 0;
+}
+
+table.displayer, table.browser, table.timeTable {
+ border-collapse: collapse;
+ border-spacing: 0;
+ clear: both;
+ margin: 0 0 0.5em 0;
+}
+
+table.formTable td.label {
+ padding-top: 4px;
+ vertical-align: top;
+}
+
+table.formTable td[colspan="2"].label {
+ text-align: left;
+}
+
+table tr[onclick]:hover,
+table td[onclick]:hover,
+table th[onclick]:hover {
+ cursor: pointer;
+}
+
+table .question {
+ text-indent: -1em;
+ padding-left: 1em;
+}
+
+table .question_sub {
+ padding-left: 1em;
+}
+
+table td, table th {
+ padding: 2px 4px;
+ vertical-align: top;
+}
+
+table td.selectedColumn, table th.selectedColumn {
+ border-left: 2px solid;
+ border-right: 2px solid;
+}
+
+table tfoot td.selectedColumn, table tfoot th.selectedColumn {
+ border-bottom: 2px solid;
+}
+
+table td.date, table td.token {
+ white-space: pre;
+ /* width: 7em; */
+}
+
+table td.timeResult, table th.timeResult {
+ width: 5em;
+}
+
+table th {
+ text-align: left;
+}
+
+table tr.selectedRow td.selectedColumn {
+ border-bottom: 2px solid;
+ font-weight: bold;
+}
+
+table tr.selectedRow td.selectedColumn, table thead th.selectedColumn {
+ border-top: 2px solid;
+}
+
+table.timeTable th a, table.timeTable td a {
+ color: inherit;
+}
+
+.tab-displaygroup {
+ float: left;
+ margin-right: 5px;
+ /* optionally set a fixed with here for aligning */
+}
+
+.tab-displaygroup label {
+ display: inline-block; /* otherwise with won't be applied */
+ width: 5em;
+}
+
+.tab-displaygroup input,
+.tab-displaygroup select
+{
+ /* Set a default with so things will align */
+ max-width: 6em;
+}
+
+.tabrow {
+ margin: 0.5em 0 0 0;
+ *margin-top: 0;
+ padding: 0;
+ *padding-top: 0.5em;
+}
+
+.tabrow .tab {
+ border: 1px solid #000;
+ border-bottom-width: 0px;
+ float: left;
+ margin: 1px 0.5em 0 0;
+ padding: 0.2em;
+ text-align: center;
+ width: 8em;
+}
+
+.tabrow .tab.active {
+ border: 2px solid #000;
+ border-bottom-width: 0px;
+ font-weight: bold;
+ margin-top: 0;
+}
+
+.tabrow .tab a {
+ display: block;
+ margin: 0;
+ padding: 0;
+ width: 100%;
+}
+
+.toolbox {
+ display: inline;
+ margin: 0.5em 0 0 0.5em;
+ position: relative;
+}
+
+.toolbox .toolanchor {
+ display: inline-block;
+}
+
+.toolbox a.toolanchor {
+ font-weight: bold;
+}
+
+.toolbox ul {
+ display: none;
+ list-style-type: none;
+ position: absolute;
+ z-index: 100;
+}
+
+.toolbox:hover ul {
+ display: inline;
+ max-height: 18.5em;
+ left: 0;
+ overflow: auto;
+ position: absolute;
+ top: 1.2em;
+}
+
+.toolbox ul li {
+ list-style-type: none;
+ margin: 1px 3px;
+}
+
+.toolbox ul li a.add {
+ display: inline-block;
+ margin: 1px 0;
+ overflow: hidden;
+ padding: 1px 2px;
+}
+
+.toolbox ul li a.right {
+ width: 16px;
+}
+
+
+.toolbox ul li a:hover {
+ text-decoration: none;
+}
+
+
+.tooldock {
+ padding: 5px;
+}
+
+.tooltip {
+ background: #FFFFCC;
+ border: 1px solid #e8f5fd;
+ padding: 3px 5px;
+ color: black;
+ font-size: .8em;
+ z-index: 10; /* otherwise invisible */
+}
+
+td.tracksList {
+ width: 25%;
+}
+
+td .tracksList {
+ height: 10em;
+ overflow: auto;
+}
+
+.tracksList p {
+ margin-bottom: 0.25em;
+}
+
+#wrapper {
+ position:relative; /* This fixes the IE7 overflow hidden bug and stops the layout jumping out of place */
+ clear:both;
+ float:left;
+ width:100%; /* width of whole page */
+}
+
+.zend_echo {
+ font-weight: normal;
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-07-05 16:45:54
|
Revision: 820
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=820&view=rev
Author: matijsdejong
Date: 2012-07-05 16:45:48 +0000 (Thu, 05 Jul 2012)
Log Message:
-----------
Added new default layout
Modified Paths:
--------------
trunk/new_project/htdocs/basic/basic.css
Modified: trunk/new_project/htdocs/basic/basic.css
===================================================================
--- trunk/new_project/htdocs/basic/basic.css 2012-07-05 16:45:00 UTC (rev 819)
+++ trunk/new_project/htdocs/basic/basic.css 2012-07-05 16:45:48 UTC (rev 820)
@@ -85,18 +85,10 @@
font-weight: bold;
}
-#main {
- width: 83%;
-}
-
#main #crumbs {
- margin: 6px 0;
+ margin: 0.5em 0;
}
-#menu {
- width: 16%;
-}
-
#menu .navigation .active a {
color: black;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-07-05 16:45:11
|
Revision: 819
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=819&view=rev
Author: matijsdejong
Date: 2012-07-05 16:45:00 +0000 (Thu, 05 Jul 2012)
Log Message:
-----------
Made RoleAction a lot more user friendly when editing through interactifity
Added new default layout
Modified Paths:
--------------
trunk/library/classes/Gems/Default/RoleAction.php
trunk/library/classes/MUtil/Acl.php
Added Paths:
-----------
trunk/library/layouts/scripts/gems-fluid2.phtml
Modified: trunk/library/classes/Gems/Default/RoleAction.php
===================================================================
--- trunk/library/classes/Gems/Default/RoleAction.php 2012-07-05 14:51:48 UTC (rev 818)
+++ trunk/library/classes/Gems/Default/RoleAction.php 2012-07-05 16:45:00 UTC (rev 819)
@@ -47,6 +47,12 @@
class Gems_Default_RoleAction extends Gems_Controller_BrowseEditAction
{
/**
+ *
+ * @var MUtil_Acl
+ */
+ public $acl;
+
+ /**
* @var GemsEscort
*/
public $escort;
@@ -67,7 +73,7 @@
* @param MUtil_Model_FormBridge $bridge
* @param MUtil_Model_ModelAbstract $model
* @param optional boolean $new
- * @return void
+ * @return void|array When an array of new values is return, these are used to update the $data array in the calling function
*/
protected function addFormElements(MUtil_Model_FormBridge $bridge, MUtil_Model_ModelAbstract $model, array $data, $new = false)
{
@@ -76,24 +82,65 @@
$bridge->addText('grl_description', 'size', 40);
$roles = $this->acl->getRoles();
- $parents = array_combine($roles, $roles);
- // Don't allow master or nologin as parents
- unset($parents['master']);
- unset($parents['nologin']);
- $bridge->addMultiCheckbox('grl_parents', 'multiOptions', $parents, 'required', false);
+ $possibleParents = array_combine($roles, $roles);
+ $currentParents = array_combine($data['grl_parents'], $data['grl_parents']);
+ // Don't allow master, nologin or itself as parents
+ unset($possibleParents['master']);
+ unset($possibleParents['nologin']);
+ $disabled = array();
+
+ if (isset($data['grl_name'])) {
+ foreach ($possibleParents as $parent) {
+ if ($this->acl->hasRole($data['grl_name']) && $this->acl->inheritsRole($parent, $data['grl_name'])) {
+ $disabled[] = $parent;
+ unset($currentParents[$parent]);
+ } else {
+ foreach ($currentParents as $p2) {
+ if ($this->acl->hasRole($p2) && $this->acl->inheritsRole($p2, $parent)) {
+ $disabled[] = $parent;
+ $currentParents[$parent] = $parent;
+ }
+ }
+ }
+ }
+ $disabled[] = $data['grl_name'];
+ }
+ $bridge->addMultiCheckbox('grl_parents', 'multiOptions', $possibleParents,
+ 'disable', $disabled,
+ 'escape', false,
+ 'required', false,
+ 'onchange', 'this.form.submit();');
+
$allPrivileges = $this->getUsedPrivileges();
$rolePrivileges = $this->escort->acl->getRolePrivileges();
- $inheritedPrivileges = (array) $rolePrivileges[$data['grl_name']][MUtil_Acl::INHERITED][Zend_Acl::TYPE_ALLOW];
- $privileges = array_diff_key($allPrivileges, array_flip($inheritedPrivileges));
- $inheritedPrivileges = array_intersect_key($allPrivileges, array_flip($inheritedPrivileges));
+ if (isset($data['grl_parents']) && $data['grl_parents']) {
+ $inherited = array();
+ foreach ((array) $data['grl_parents'] as $parent) {
+ if (isset($rolePrivileges[$parent])) {
+ $inherited = $inherited + array_flip($rolePrivileges[$parent][Zend_Acl::TYPE_ALLOW]);
+ $inherited = $inherited + array_flip($rolePrivileges[$parent][MUtil_Acl::INHERITED][Zend_Acl::TYPE_ALLOW]);
+ }
+ }
+ // Sneaks in:
+ unset($inherited[""]);
+ $privileges = array_diff_key($allPrivileges, $inherited);
+ $inheritedPrivileges = array_intersect_key($allPrivileges, $inherited);
+ } else {
+ $privileges = $allPrivileges;
+ $inheritedPrivileges = false;
+ }
$checkbox = $bridge->addMultiCheckbox('grl_privileges', 'multiOptions', $privileges, 'required', false);
$checkbox->setAttrib('escape', false); //Don't use escaping, so the line breaks work
- $checkbox = $bridge->addMultiCheckbox('inherited', 'label', $this->_('Inherited'), 'multiOptions', $inheritedPrivileges, 'required', false, 'disabled', 'disabled');
- $checkbox->setAttrib('escape', false); //Don't use escaping, so the line breaks work
- $checkbox->setValue(array_keys($inheritedPrivileges)); //To check the boxes
+ if ($inheritedPrivileges) {
+ $checkbox = $bridge->addMultiCheckbox('inherited', 'label', $this->_('Inherited'), 'multiOptions', $inheritedPrivileges, 'required', false, 'disabled', 'disabled');
+ $checkbox->setAttrib('escape', false); //Don't use escaping, so the line breaks work
+ $checkbox->setValue(array_keys($inheritedPrivileges)); //To check the boxes
+ }
+
+ return array('grl_parents' => $currentParents);
}
/**
@@ -178,6 +225,10 @@
$model->set('grl_name', 'label', $this->_('Name'));
$model->set('grl_description', 'label', $this->_('Description'));
$model->set('grl_parents', 'label', $this->_('Parents'));
+
+ $tp = new MUtil_Model_Type_ConcatenatedRow(',', ', ');
+ $tp->apply($model, 'grl_parents');
+
$model->set('grl_privileges', 'label', $this->_('Privileges'), 'formatFunction', array($this, 'formatLongLine'));
Gems_Model::setChangeFieldsByPrefix($model, 'grl');
Modified: trunk/library/classes/MUtil/Acl.php
===================================================================
--- trunk/library/classes/MUtil/Acl.php 2012-07-05 14:51:48 UTC (rev 818)
+++ trunk/library/classes/MUtil/Acl.php 2012-07-05 16:45:00 UTC (rev 819)
@@ -125,10 +125,10 @@
*
* Sample output:
* <code>
- * [MUtil-Acl::PARENTS]=>array(parent_name=>parent_object),
+ * [MUtil_Acl::PARENTS]=>array(parent_name=>parent_object),
* [Zend_Acl::TYPE_ALLOW]=>array([index]=>privilege),
* [Zend_Acl::TYPE_DENY]=>array([index]=>privilege),
- * [MUtil-Acl::INHERITED]=>array([Zend_Acl::TYPE_ALLOW]=>array([index]=>privilege),
+ * [MUtil_Acl::INHERITED]=>array([Zend_Acl::TYPE_ALLOW]=>array([index]=>privilege),
* [Zend_Acl::TYPE_DENY]=>array([index]=>privilege))
* </code>
*
Added: trunk/library/layouts/scripts/gems-fluid2.phtml
===================================================================
--- trunk/library/layouts/scripts/gems-fluid2.phtml (rev 0)
+++ trunk/library/layouts/scripts/gems-fluid2.phtml 2012-07-05 16:45:00 UTC (rev 819)
@@ -0,0 +1,74 @@
+<?php echo $this->doctype(); ?>
+<html <?php echo 'xmlns="http://www.w3.org/1999/xhtml" xml:lang="'.$this->locale.'"' ?> lang="<?php echo $this->locale; ?>">
+<head>
+ <base href="<?php echo $this->serverUrl() . $this->baseUrl() ?>"/>
+ <?php
+ echo $this->headMeta();
+ echo $this->headTitle();
+ echo $this->headLink();
+ echo $this->headStyle();
+
+ // Check if jQuery library is needed
+ if ($this->jQuery) {
+ echo $this->jQuery();
+ //Error message for when jQuery can not be loaded
+ /*echo "<script>
+ if (typeof jQuery == 'undefined') {
+ document.writeln('<div class=\"errors\">The site requires external JavaScript from another domain, which is blocked or failed to load.</div>');
+ }
+ </script>";*/
+ }
+
+ // Check if dojo library is needed
+ if ($this->dojoTheme) {
+ // Echo out the dojo <script> tags
+ echo $this->dojo();
+ }
+ ?>
+ </head>
+<body<?php if (isset($this->dojoTheme)) { echo " class='" . $this->dojoTheme . "' "; } ?>>
+ <div id="all">
+ <div id="header"><?php if ($this->header) { echo $this->header->render($this); }?></div>
+ <div id="header_bar"><?php if ($this->header_bar) { echo $this->header_bar->render($this); } ?></div>
+<?php
+ if ($this->navigation || $this->menuHtml):
+?>
+ <div id="wrapper">
+ <div class="main">
+ <div id="main" ><?php
+ if ($this->main) {
+ echo $this->main->render($this);
+ }
+ echo $this->layout()->content; ?>
+ </div>
+ <div id="menu"><?php
+ echo $this->navigation()->menu();
+ echo $this->menuHtml;
+ ?>
+ </div>
+ </div>
+ </div><?php
+ else:
+ ?>
+ <div id="wrapper" class="main fullwidth">
+ <div><?php
+ if ($this->main) {
+ echo $this->main->render($this);
+ }
+ echo $this->layout()->content;
+ ?> </div>
+ </div><?php
+ endif;
+ ?>
+ <div id="footer"><?php
+ if ($this->footer) {
+ echo $this->footer->render($this);
+ }
+ ?>
+ </div>
+ </div><?php
+echo MUtil_Echo::out();
+echo $this->headScript();
+echo $this->inlineScript();
+?></body>
+</html>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-07-05 14:51:57
|
Revision: 818
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=818&view=rev
Author: matijsdejong
Date: 2012-07-05 14:51:48 +0000 (Thu, 05 Jul 2012)
Log Message:
-----------
More fixes for trouble when creating new role
Modified Paths:
--------------
tags/1.5.4/library/classes/Gems/Default/RoleAction.php
Modified: tags/1.5.4/library/classes/Gems/Default/RoleAction.php
===================================================================
--- tags/1.5.4/library/classes/Gems/Default/RoleAction.php 2012-07-05 14:01:32 UTC (rev 817)
+++ tags/1.5.4/library/classes/Gems/Default/RoleAction.php 2012-07-05 14:51:48 UTC (rev 818)
@@ -77,23 +77,26 @@
$roles = $this->acl->getRoles();
$parents = array_combine($roles, $roles);
- // Don't allow master or nologin as parents
+ // Don't allow master, nologin or itself as parents
unset($parents['master']);
unset($parents['nologin']);
+ unset($parents[$data['grl_name']]);
$bridge->addMultiCheckbox('grl_parents', 'multiOptions', $parents, 'required', false);
$allPrivileges = $this->getUsedPrivileges();
$rolePrivileges = $this->escort->acl->getRolePrivileges();
$inheritedPrivileges = (array) $rolePrivileges[$data['grl_name']][MUtil_Acl::INHERITED][Zend_Acl::TYPE_ALLOW];
- $privileges = array_diff_key($allPrivileges, array_flip($inheritedPrivileges));
+ $privileges = (array) array_diff_key($allPrivileges, array_flip($inheritedPrivileges));
$inheritedPrivileges = array_intersect_key($allPrivileges, array_flip($inheritedPrivileges));
$checkbox = $bridge->addMultiCheckbox('grl_privileges', 'multiOptions', $privileges, 'required', false);
$checkbox->setAttrib('escape', false); //Don't use escaping, so the line breaks work
- $checkbox = $bridge->addMultiCheckbox('inherited', 'label', $this->_('Inherited'), 'multiOptions', $inheritedPrivileges, 'required', false, 'disabled', 'disabled');
- $checkbox->setAttrib('escape', false); //Don't use escaping, so the line breaks work
- $checkbox->setValue(array_keys($inheritedPrivileges)); //To check the boxes
+ if ($inheritedPrivileges) {
+ $checkbox = $bridge->addMultiCheckbox('inherited', 'label', $this->_('Inherited'), 'multiOptions', $inheritedPrivileges, 'required', false, 'disabled', 'disabled');
+ $checkbox->setAttrib('escape', false); //Don't use escaping, so the line breaks work
+ $checkbox->setValue(array_keys($inheritedPrivileges)); //To check the boxes
+ }
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-07-05 14:01:44
|
Revision: 817
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=817&view=rev
Author: matijsdejong
Date: 2012-07-05 14:01:32 +0000 (Thu, 05 Jul 2012)
Log Message:
-----------
RoleAction dit not allow empty inheritance
GemsEscort->_layoutCrumbs() now uses html objects
Modified Paths:
--------------
trunk/library/classes/Gems/Default/RoleAction.php
trunk/library/classes/GemsEscort.php
Modified: trunk/library/classes/Gems/Default/RoleAction.php
===================================================================
--- trunk/library/classes/Gems/Default/RoleAction.php 2012-07-05 12:33:00 UTC (rev 816)
+++ trunk/library/classes/Gems/Default/RoleAction.php 2012-07-05 14:01:32 UTC (rev 817)
@@ -84,7 +84,7 @@
$allPrivileges = $this->getUsedPrivileges();
$rolePrivileges = $this->escort->acl->getRolePrivileges();
- $inheritedPrivileges = $rolePrivileges[$data['grl_name']][MUtil_Acl::INHERITED][Zend_Acl::TYPE_ALLOW];
+ $inheritedPrivileges = (array) $rolePrivileges[$data['grl_name']][MUtil_Acl::INHERITED][Zend_Acl::TYPE_ALLOW];
$privileges = array_diff_key($allPrivileges, array_flip($inheritedPrivileges));
$inheritedPrivileges = array_intersect_key($allPrivileges, array_flip($inheritedPrivileges));
Modified: trunk/library/classes/GemsEscort.php
===================================================================
--- trunk/library/classes/GemsEscort.php 2012-07-05 12:33:00 UTC (rev 816)
+++ trunk/library/classes/GemsEscort.php 2012-07-05 14:01:32 UTC (rev 817)
@@ -588,11 +588,23 @@
// Must be called after _layoutNavigation()
if ($this->menu && $this->menu->isVisible()) {
- $div = MUtil_Html::create()->div($args + array('id' => 'crumbs'));
- //$div->raw($this->view->navigation()->breadcrumbs());
- $div->raw($this->view->navigation()->breadcrumbs()->setLinkLast(false)->setMinDepth(0)->render());
+ $path = $this->menu->getActivePath($this->request);
+ $last = array_pop($path);
- return $div;
+ // Only display when there is a path of more than one step
+ if ($path) {
+ $div = MUtil_Html::create()->div($args + array('id' => 'crumbs'));
+ $content = $div->seq();
+ $content->setGlue(MUtil_Html::raw($this->_(' > ')));
+
+ foreach ($path as $menuItem) {
+ $content->a($menuItem->toHRefAttribute($this->request), $menuItem->get('label'));
+ }
+
+ $content->append($last->get('label'));
+
+ return $div;
+ }
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-07-05 12:33:11
|
Revision: 816
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=816&view=rev
Author: matijsdejong
Date: 2012-07-05 12:33:00 +0000 (Thu, 05 Jul 2012)
Log Message:
-----------
Fixed PHP error for new and top level roles
Modified Paths:
--------------
tags/1.5.4/library/classes/Gems/Default/RoleAction.php
Modified: tags/1.5.4/library/classes/Gems/Default/RoleAction.php
===================================================================
--- tags/1.5.4/library/classes/Gems/Default/RoleAction.php 2012-07-05 12:22:38 UTC (rev 815)
+++ tags/1.5.4/library/classes/Gems/Default/RoleAction.php 2012-07-05 12:33:00 UTC (rev 816)
@@ -84,7 +84,7 @@
$allPrivileges = $this->getUsedPrivileges();
$rolePrivileges = $this->escort->acl->getRolePrivileges();
- $inheritedPrivileges = $rolePrivileges[$data['grl_name']][MUtil_Acl::INHERITED][Zend_Acl::TYPE_ALLOW];
+ $inheritedPrivileges = (array) $rolePrivileges[$data['grl_name']][MUtil_Acl::INHERITED][Zend_Acl::TYPE_ALLOW];
$privileges = array_diff_key($allPrivileges, array_flip($inheritedPrivileges));
$inheritedPrivileges = array_intersect_key($allPrivileges, array_flip($inheritedPrivileges));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-07-05 12:22:48
|
Revision: 815
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=815&view=rev
Author: matijsdejong
Date: 2012-07-05 12:22:38 +0000 (Thu, 05 Jul 2012)
Log Message:
-----------
Now the basic style is fully fluid and cleaned up
Modified Paths:
--------------
trunk/new_project/application/configs/project.ini
trunk/new_project/htdocs/basic/basic.css
trunk/new_project/htdocs/gems/css/gems-new.css
Modified: trunk/new_project/application/configs/project.ini
===================================================================
--- trunk/new_project/application/configs/project.ini 2012-07-05 11:02:37 UTC (rev 814)
+++ trunk/new_project/application/configs/project.ini 2012-07-05 12:22:38 UTC (rev 815)
@@ -22,7 +22,7 @@
admin.pwd = PASSWD
;admin.ipRanges =
-css.gems = gems/css/gems-fixed.css
+css.gems = gems/css/gems-fluid.css
css.print.url = gems/css/gems_print.css
css.print.media = print
imagedir = gems/images
Modified: trunk/new_project/htdocs/basic/basic.css
===================================================================
--- trunk/new_project/htdocs/basic/basic.css 2012-07-05 11:02:37 UTC (rev 814)
+++ trunk/new_project/htdocs/basic/basic.css 2012-07-05 12:22:38 UTC (rev 815)
@@ -4,7 +4,6 @@
}
#all, #all_full_width {
- margin: 0 10px;
max-width: 10000px;
}
@@ -18,7 +17,7 @@
box-shadow: 1px 1px 2px darkgrey;
-moz-box-shadow: 1px 1px 2px darkgrey;
-webkit-box-shadow: 1px 1px 2px darkgrey;
- color: black;
+ color: black;
margin: 4px 0;
padding: 0 4px;
text-decoration: none;
@@ -44,7 +43,7 @@
box-shadow: 1px 1px 2px darkgrey;
-moz-box-shadow: 1px 1px 2px darkgrey;
-webkit-box-shadow: 1px 1px 2px darkgrey;
- color: black;
+ color: black;
font-size: 80%;
margin: 4px 0;
padding: 0 4px;
@@ -59,16 +58,9 @@
background-color: white;
font-family: Verdana,Arial,Helvetica,Sans-serif;
font-size: 14px;
+ padding: 0 10px 0 10px;
}
-#header {
- background: url(local/pulse.gif) no-repeat right bottom;
- height: 52px;
- margin: 10px auto 0 auto;
- overflow: hidden;
- padding : 0;
-}
-
#footer, #header_bar {
background-color: lightgrey;
border: 1px solid lightgrey;
@@ -78,10 +70,16 @@
box-shadow: 1px 1px 2px black;
-moz-box-shadow: 1px 1px 2px black;
-webkit-box-shadow: 1px 1px 2px black;
- padding: 1px 3px;
- /*height: 18px;*/
}
+#header {
+ background: url(local/pulse.gif) no-repeat right bottom;
+ height: 52px;
+ margin: 10px auto 0 auto;
+ overflow: hidden;
+ padding: 0;
+}
+
#header_bar #languages span {
font-style: italic;
font-weight: bold;
@@ -100,15 +98,15 @@
}
#menu .navigation .active a {
- color: black;
-}
+ color: black;
+}
#menu .navigation .active ul li a {
- color: darkblue;
-}
+ color: darkblue;
+}
#menu .navigation .active ul li.active a {
- color: black;
+ color: black;
}
.tab {
@@ -151,7 +149,7 @@
font-weight: bold;
}
-table.browser tfoot td a, table.browser thead th a, , table.timeTable tfoot td a, table.timeTable thead th a,
+table.browser tfoot td a, table.browser thead th a, , table.timeTable tfoot td a, table.timeTable thead th a,
.toolbox .toolanchor {
color: #00ffff;
text-decoration: underline;
Modified: trunk/new_project/htdocs/gems/css/gems-new.css
===================================================================
--- trunk/new_project/htdocs/gems/css/gems-new.css 2012-07-05 11:02:37 UTC (rev 814)
+++ trunk/new_project/htdocs/gems/css/gems-new.css 2012-07-05 12:22:38 UTC (rev 815)
@@ -1,8 +1,3 @@
-/*
- * START OF LAYOUT
- *
- * Be careful making changes here
- */
/* column container */
#wrapper {
@@ -28,35 +23,6 @@
right:160px; /* menu_abs_width */
}
-#main {
- margin: 10px 10px 10px 170px; /* margin margin margin margin + menu_abs_width */
- position:relative;
- right:100%;
- overflow:hidden;
-}
-#menu {
- margin: 10px 10px 10px 10px; /* margin margin margin margin */
- float:left;
- width:140px; /* menu_abs_width - margin - margin */
- position:relative;
- right:160px; /* menu_abs_width */
-}
-
-/* Header/footer styles */
-#footer {
- margin-bottom: 10px;
- height: 1.2em;
-}
-
-.fullwidth > div {
- margin: 0px 5px; /* provide a little 'air' on full-width */
-}
-
-/*
- * END OF LAYOUT
- */
-
-
/* Links */
a {
text-decoration: none;
@@ -105,18 +71,6 @@
padding-right: 20px !important;
}
-.askRound {
- margin-left: 2em;
-}
-
-.askSurvey {
- margin: 0.1em 0 0.1em 4em;
-}
-
-.askTrack {
- margin-top: 0.8em;
-}
-
body {
margin: 0;
padding: 0;
@@ -202,6 +156,19 @@
padding-right: 0.5em;
}
+/* Header/footer styles */
+#footer {
+ margin-bottom: 10px;
+}
+
+#footer div, #header_bar div, #header_bar span {
+ padding: 1px 3px 2px 3px;
+}
+
+.fullwidth > div {
+ margin: 0px 5px; /* provide a little 'air' on full-width */
+}
+
h1, h2, h3 {
margin: 0.5em 0 0.25em 0;
padding: 0;
@@ -212,8 +179,8 @@
padding: 0;
}
-#header h1 {
- margin-top: 0;
+#header_bar {
+ padding: 0px;
}
#header_bar #contact .dropdownContent {
@@ -236,9 +203,21 @@
width: 100%;
}
+#header h1 {
+ margin-top: 0;
+}
+
+#header_bar #organizations {
+ float:left;
+ height: 1.7em;
+ padding-top: 2px;
+ overflow: hidden;
+}
+
+#header_bar #organizations input, #header_bar #organizations select { margin: 1px; padding: 0px; font-size: 100%;}
+
#login .logout {
- margin-left: 1em;
- margin-right: .5em;
+ margin-left: 0.5em;
}
img {
@@ -283,9 +262,12 @@
padding: 2px 0.5em;
}
-/* *padding + *ovverflow to use only in IE */
#main {
- margin-bottom: 10px;
+ margin: 10px 10px 10px 170px; /* margin margin margin margin + menu_abs_width */
+ position:relative;
+ right:100%;
+ overflow:hidden;
+ /* *padding + *overflow to use only in IE 6 */
*overflow-x: auto;
*padding-bottom: 25px;
}
@@ -328,7 +310,12 @@
}
#menu {
+ margin: 10px 10px 10px 10px; /* margin margin margin margin */
+ float:left;
+ width:140px; /* menu_abs_width - margin - margin */
padding: 0px 0 10px 10px;
+ position:relative;
+ right:160px; /* menu_abs_width */
word-wrap: break-word; /* IE only feature */
}
@@ -374,29 +361,6 @@
font-weight: bold;
}
-#header_bar {
- height: 1.9em;
- padding: 0px;
-}
-
-#header_bar #contact, #header_bar #login {
- position: relative;
- padding: 5px 5px 0 5px;
-}
-
-#header_bar #languages {
- padding: 5px;
-}
-
-#header_bar #organizations {
- float:left;
- height: 1.7em;
- padding-top: 2px;
- overflow: hidden;
-}
-
-#header_bar #organizations input, #header_bar #organizations select { margin: 1px; padding: 0px; font-size: 100%;}
-
.middleAlign {
vertical-align: middle;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-07-05 11:02:46
|
Revision: 814
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=814&view=rev
Author: matijsdejong
Date: 2012-07-05 11:02:37 +0000 (Thu, 05 Jul 2012)
Log Message:
-----------
New project uses basic.css
cleanup of extra db.inc.php
Modified Paths:
--------------
trunk/new_project/application/configs/project.ini
trunk/new_project/var/settings/db.inc.php
Modified: trunk/new_project/application/configs/project.ini
===================================================================
--- trunk/new_project/application/configs/project.ini 2012-07-05 10:54:04 UTC (rev 813)
+++ trunk/new_project/application/configs/project.ini 2012-07-05 11:02:37 UTC (rev 814)
@@ -10,7 +10,7 @@
; Put %s somewhere within the salt to mix the value
; in the salt.
;---------------------------------------------------
-salt =
+salt =
;----------------------------------------------------------
; The non database super user
@@ -19,16 +19,17 @@
; and quoted if it contains special characters.
;----------------------------------------------------------
admin.user = superadmin
-admin.pwd =
+admin.pwd = PASSWD
;admin.ipRanges =
css.gems = gems/css/gems-fixed.css
css.print.url = gems/css/gems_print.css
css.print.media = print
-imagedir = gems/images
-css.local = "erasmusmc/css/erasmusmc.css"
-favicon = "erasmusmc/erasmusmc.ico"
-jquerycss = "erasmusmc/css/jquery-mc.css"
+imagedir = gems/images
+imagedir = gems/images
+css.local = basic/basic.css
+favicon = basic/basic.ico
+jquerycss = basic/basic.jquery-basic.css
contact.bugsUrl = https://sourceforge.net/apps/trac/gemstracker/wiki
contact.supportUrl = https://sourceforge.net/projects/gemstracker/support
Modified: trunk/new_project/var/settings/db.inc.php
===================================================================
--- trunk/new_project/var/settings/db.inc.php 2012-07-05 10:54:04 UTC (rev 813)
+++ trunk/new_project/var/settings/db.inc.php 2012-07-05 11:02:37 UTC (rev 814)
@@ -6,5 +6,3 @@
define ('USER', 'new_project');
define ('PASSWD', 'yourpassword');
define ('DATABASE', 'new_project');
-
-?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-07-05 10:54:16
|
Revision: 813
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=813&view=rev
Author: matijsdejong
Date: 2012-07-05 10:54:04 +0000 (Thu, 05 Jul 2012)
Log Message:
-----------
added default basic layout
adjusted project.ini for new menu layout
Added Paths:
-----------
trunk/new_project/htdocs/basic/
trunk/new_project/htdocs/basic/basic.css
trunk/new_project/htdocs/basic/basic.ico
trunk/new_project/htdocs/basic/images/
trunk/new_project/htdocs/basic/images/ui-bg_flat_0_aaaaaa_40x100.png
trunk/new_project/htdocs/basic/images/ui-bg_flat_75_ffffff_40x100.png
trunk/new_project/htdocs/basic/images/ui-bg_glass_55_fbf9ee_1x400.png
trunk/new_project/htdocs/basic/images/ui-bg_glass_65_ffffff_1x400.png
trunk/new_project/htdocs/basic/images/ui-bg_glass_75_dadada_1x400.png
trunk/new_project/htdocs/basic/images/ui-bg_glass_75_e6e6e6_1x400.png
trunk/new_project/htdocs/basic/images/ui-bg_glass_95_fef1ec_1x400.png
trunk/new_project/htdocs/basic/images/ui-bg_highlight-soft_75_cccccc_1x100.png
trunk/new_project/htdocs/basic/images/ui-icons_222222_256x240.png
trunk/new_project/htdocs/basic/images/ui-icons_2e83ff_256x240.png
trunk/new_project/htdocs/basic/images/ui-icons_454545_256x240.png
trunk/new_project/htdocs/basic/images/ui-icons_888888_256x240.png
trunk/new_project/htdocs/basic/images/ui-icons_cd0a0a_256x240.png
trunk/new_project/htdocs/basic/jquery-basic.css
trunk/new_project/htdocs/basic/local/
trunk/new_project/htdocs/basic/local/datepicker.png
trunk/new_project/htdocs/basic/local/dropdown.png
trunk/new_project/htdocs/basic/local/info.png
trunk/new_project/htdocs/basic/local/mail.png
trunk/new_project/htdocs/basic/local/plus.png
trunk/new_project/htdocs/basic/local/pulse.gif
Added: trunk/new_project/htdocs/basic/basic.css
===================================================================
--- trunk/new_project/htdocs/basic/basic.css (rev 0)
+++ trunk/new_project/htdocs/basic/basic.css 2012-07-05 10:54:04 UTC (rev 813)
@@ -0,0 +1,238 @@
+
+a {
+ color: darkblue;
+}
+
+#all, #all_full_width {
+ margin: 0 10px;
+ max-width: 10000px;
+}
+
+/* Set these before actionlink */
+a.actionlink, a.actionlink:link, a.actionlink:visited, a.browselink, a.browselink:link, a.browselink:visited, button.small, button.ui-datepicker-trigger, input.button.small, button, input.button {
+ background: lightgrey;
+ border: 1px solid black;
+ border-radius: 4px;
+ -moz-border-radius: 4px;
+ -webkit-border-radius: 4px;
+ box-shadow: 1px 1px 2px darkgrey;
+ -moz-box-shadow: 1px 1px 2px darkgrey;
+ -webkit-box-shadow: 1px 1px 2px darkgrey;
+ color: black;
+ margin: 4px 0;
+ padding: 0 4px;
+ text-decoration: none;
+}
+
+a.actionlink:hover, a.browselink:hover, button:hover.small, button.ui-datepicker-trigger:hover, input.button.small:hover, button:hover, input.button:hover {
+ background: black;
+ box-shadow: 2px 2px 5px darkgray;
+ -moz-box-shadow: 2px 2px 5px darkgray;
+ -webkit-box-shadow: 2px 2px 5px darkgray;
+ color: white;
+}
+
+a.actionlink, a.actionlink:link, a.actionlink:visited, a.browselink, a.browselink:link, a.browselink:visited, button.small, button.ui-datepicker-trigger, input.button.small {
+ font-size: 80%;
+}
+
+span.actionlink, span.browselink {
+ border: 1px dotted darkgrey;
+ border-radius: 4px;
+ -moz-border-radius: 4px;
+ -webkit-border-radius: 4px;
+ box-shadow: 1px 1px 2px darkgrey;
+ -moz-box-shadow: 1px 1px 2px darkgrey;
+ -webkit-box-shadow: 1px 1px 2px darkgrey;
+ color: black;
+ font-size: 80%;
+ margin: 4px 0;
+ padding: 0 4px;
+}
+
+#autofilter_target table tbody td strong.marked {
+ border-left: 1px dotted;
+ border-right: 1px dotted;
+}
+
+body {
+ background-color: white;
+ font-family: Verdana,Arial,Helvetica,Sans-serif;
+ font-size: 14px;
+}
+
+#header {
+ background: url(local/pulse.gif) no-repeat right bottom;
+ height: 52px;
+ margin: 10px auto 0 auto;
+ overflow: hidden;
+ padding : 0;
+}
+
+#footer, #header_bar {
+ background-color: lightgrey;
+ border: 1px solid lightgrey;
+ border-radius: 3px;
+ -moz-border-radius: 3px;
+ -webkit-border-radius: 3px;
+ box-shadow: 1px 1px 2px black;
+ -moz-box-shadow: 1px 1px 2px black;
+ -webkit-box-shadow: 1px 1px 2px black;
+ padding: 1px 3px;
+ /*height: 18px;*/
+}
+
+#header_bar #languages span {
+ font-style: italic;
+ font-weight: bold;
+}
+
+#main {
+ width: 83%;
+}
+
+#main #crumbs {
+ margin: 6px 0;
+}
+
+#menu {
+ width: 16%;
+}
+
+#menu .navigation .active a {
+ color: black;
+}
+
+#menu .navigation .active ul li a {
+ color: darkblue;
+}
+
+#menu .navigation .active ul li.active a {
+ color: black;
+}
+
+.tab {
+ background: lightgrey;
+ border-top-left-radius: 4px;
+ border-top-right-radius: 4px;
+ -webkit-border-top-left-radius: 4px;
+ -webkit-border-top-right-radius: 4px;
+ -moz-border-radius-topleft: 4px;
+ -moz-border-radius-topright: 4px;
+ box-shadow: 2px 0px 2px darkgrey;
+ -moz-box-shadow: 2px 0px 2px darkgrey;
+ -webkit-box-shadow: 2px 0px 2px darkgrey;
+}
+
+.tab a {
+ color: black;
+}
+
+.tab .active {
+ box-shadow: 4px 0px 4px darkgrey;
+ -moz-box-shadow: 4px 0px 4px darkgrey;
+ -webkit-box-shadow: 4px 0px 4px darkgrey;
+}
+
+table.browser[onclick]:hover, table.browser tbody tr[onclick]:hover, table.displayer tbody[onclick]:hover, table.displayer tbody[onclick]:hover td {
+ cursor: pointer;
+ background-color: lightblue;
+}
+
+table.browser tbody tr.even, table.formTable tbody tr.even, .tooldock, table.timeTable tbody tr.even {
+ background-color: #EEEEEE;
+}
+
+table.browser td, table.browser th, table.timeTable td, table.timeTable th {
+ border: 1px solid black;
+}
+
+table.browser tfoot td, table.timeTable tfoot td {
+ font-weight: bold;
+}
+
+table.browser tfoot td a, table.browser thead th a, , table.timeTable tfoot td a, table.timeTable thead th a,
+.toolbox .toolanchor {
+ color: #00ffff;
+ text-decoration: underline;
+}
+
+table.browser tfoot td .disabled, table.timeTable tfoot td .disabled {
+ color: #eeeeee;
+}
+
+table.browser thead th, table.browser tfoot td, table.displayer th, table.timeTable thead th, table.timeTable tfoot td {
+ background-color: gray;
+ color: white;
+}
+
+table.displayer caption {
+ border-left: 1px dotted gray;
+ border-right: 1px dotted gray;
+ border-top: 1px dotted gray;
+}
+
+table.displayer tbody td {
+ border: 1px dotted gray;
+}
+
+table tbody td.selectedColumn, table tfoot td.selectedColumn, table thead th.selectedColumn {
+ border-left: 2px solid black;
+ border-right: 2px solid black;
+}
+
+table tfoot td.selectedColumn, table tr.selectedRow td.selectedColumn, table.timeTable thead th.selectedColumn, table.timeTable td[onclick]:hover, table.timeTable th[onclick]:hover {
+ border-color: black;
+ background-color: black;
+ color: white;
+}
+
+.toolbox .toolanchor {
+ background: darkgray url(local/dropdown.png) no-repeat right center;
+ border-top-left-radius: 4px;
+ border-top-right-radius: 4px;
+ -moz-border-radius-topleft: 4px;
+ -moz-border-radius-topright: 4px;
+ -webkit-border-top-left-radius: 4px;
+ -webkit-border-top-right-radius: 4px;
+ padding: 2px 1em 2px 4px;
+ width: 16em;
+}
+
+.toolbox:hover ul {
+ background: lightgrey;
+ width: 16.5em;
+}
+
+.toolbox ul li {
+ width: 15em;
+}
+
+.toolbox ul li a.add {
+ height: 1.1em;
+ overflow: hidden;
+ width: 13em;
+}
+
+.toolbox ul li a.right {
+ width: 16px;
+}
+
+.toolbox ul li a:hover {
+ background: gray;
+ color: white;
+ text-decoration: none;
+}
+
+.tooldock {
+ border-top-left-radius: 4px;
+ border-top-right-radius: 4px;
+ -moz-border-radius-topleft: 4px;
+ -moz-border-radius-topright: 4px;
+ -webkit-border-top-left-radius: 4px;
+ -webkit-border-top-right-radius: 4px;
+ box-shadow: 2px 2px 4px darkgray;
+ -moz-box-shadow: 2px 2px 4px darkgray;
+ -webkit-box-shadow: 2px 2px 4px darkgray;
+}
+
Added: trunk/new_project/htdocs/basic/basic.ico
===================================================================
(Binary files differ)
Property changes on: trunk/new_project/htdocs/basic/basic.ico
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/new_project/htdocs/basic/images/ui-bg_flat_0_aaaaaa_40x100.png
===================================================================
(Binary files differ)
Property changes on: trunk/new_project/htdocs/basic/images/ui-bg_flat_0_aaaaaa_40x100.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/new_project/htdocs/basic/images/ui-bg_flat_75_ffffff_40x100.png
===================================================================
(Binary files differ)
Property changes on: trunk/new_project/htdocs/basic/images/ui-bg_flat_75_ffffff_40x100.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/new_project/htdocs/basic/images/ui-bg_glass_55_fbf9ee_1x400.png
===================================================================
(Binary files differ)
Property changes on: trunk/new_project/htdocs/basic/images/ui-bg_glass_55_fbf9ee_1x400.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/new_project/htdocs/basic/images/ui-bg_glass_65_ffffff_1x400.png
===================================================================
(Binary files differ)
Property changes on: trunk/new_project/htdocs/basic/images/ui-bg_glass_65_ffffff_1x400.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/new_project/htdocs/basic/images/ui-bg_glass_75_dadada_1x400.png
===================================================================
(Binary files differ)
Property changes on: trunk/new_project/htdocs/basic/images/ui-bg_glass_75_dadada_1x400.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/new_project/htdocs/basic/images/ui-bg_glass_75_e6e6e6_1x400.png
===================================================================
(Binary files differ)
Property changes on: trunk/new_project/htdocs/basic/images/ui-bg_glass_75_e6e6e6_1x400.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/new_project/htdocs/basic/images/ui-bg_glass_95_fef1ec_1x400.png
===================================================================
(Binary files differ)
Property changes on: trunk/new_project/htdocs/basic/images/ui-bg_glass_95_fef1ec_1x400.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/new_project/htdocs/basic/images/ui-bg_highlight-soft_75_cccccc_1x100.png
===================================================================
(Binary files differ)
Property changes on: trunk/new_project/htdocs/basic/images/ui-bg_highlight-soft_75_cccccc_1x100.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/new_project/htdocs/basic/images/ui-icons_222222_256x240.png
===================================================================
(Binary files differ)
Property changes on: trunk/new_project/htdocs/basic/images/ui-icons_222222_256x240.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/new_project/htdocs/basic/images/ui-icons_2e83ff_256x240.png
===================================================================
(Binary files differ)
Property changes on: trunk/new_project/htdocs/basic/images/ui-icons_2e83ff_256x240.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/new_project/htdocs/basic/images/ui-icons_454545_256x240.png
===================================================================
(Binary files differ)
Property changes on: trunk/new_project/htdocs/basic/images/ui-icons_454545_256x240.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/new_project/htdocs/basic/images/ui-icons_888888_256x240.png
===================================================================
(Binary files differ)
Property changes on: trunk/new_project/htdocs/basic/images/ui-icons_888888_256x240.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/new_project/htdocs/basic/images/ui-icons_cd0a0a_256x240.png
===================================================================
(Binary files differ)
Property changes on: trunk/new_project/htdocs/basic/images/ui-icons_cd0a0a_256x240.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/new_project/htdocs/basic/jquery-basic.css
===================================================================
--- trunk/new_project/htdocs/basic/jquery-basic.css (rev 0)
+++ trunk/new_project/htdocs/basic/jquery-basic.css 2012-07-05 10:54:04 UTC (rev 813)
@@ -0,0 +1,407 @@
+/*
+* jQuery UI CSS Framework
+* Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
+* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
+*/
+
+/* Layout helpers
+----------------------------------*/
+.ui-helper-hidden { display: none; }
+.ui-helper-hidden-accessible { position: absolute; left: -99999999px; }
+.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
+.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
+.ui-helper-clearfix { display: inline-block; }
+/* required comment for clearfix to work in Opera \*/
+* html .ui-helper-clearfix { height:1%; }
+.ui-helper-clearfix { display:block; }
+/* end clearfix */
+.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
+
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-disabled { cursor: default !important; }
+
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Overlays */
+.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
+
+
+
+/*
+* jQuery UI CSS Framework
+* Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
+* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
+* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana,Arial,sans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=03_highlight_soft.png&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=01_flat.png&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=02_glass.png&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=02_glass.png&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=02_glass.png&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=02_glass.png&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=02_glass.png&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=01_flat.png&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
+*/
+
+
+/* Component containers
+----------------------------------*/
+.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1.1em; }
+.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; }
+.ui-widget-content { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #222222; }
+.ui-widget-content a { color: #222222; }
+.ui-widget-header { border: 1px solid #aaaaaa; background: #cccccc url(images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x; color: #222222; font-weight: bold; }
+.ui-widget-header a { color: #222222; }
+
+/* Interaction states
+----------------------------------*/
+.ui-state-default, .ui-widget-content .ui-state-default { border: 1px solid #d3d3d3; background: #e6e6e6 url(images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #555555; outline: none; }
+.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #555555; text-decoration: none; outline: none; }
+.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus { border: 1px solid #999999; background: #dadada url(images/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; outline: none; }
+.ui-state-hover a, .ui-state-hover a:hover { color: #212121; text-decoration: none; outline: none; }
+.ui-state-active, .ui-widget-content .ui-state-active { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; outline: none; }
+.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #212121; outline: none; text-decoration: none; }
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-highlight, .ui-widget-content .ui-state-highlight {border: 1px solid #fcefa1; background: #fbf9ee url(images/ui-bg_glass_55_fbf9ee_1x400.png) 50% 50% repeat-x; color: #363636; }
+.ui-state-highlight a, .ui-widget-content .ui-state-highlight a { color: #363636; }
+.ui-state-error, .ui-widget-content .ui-state-error {border: 1px solid #cd0a0a; background: #fef1ec url(images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x; color: #cd0a0a; }
+.ui-state-error a, .ui-widget-content .ui-state-error a { color: #cd0a0a; }
+.ui-state-error-text, .ui-widget-content .ui-state-error-text { color: #cd0a0a; }
+.ui-state-disabled, .ui-widget-content .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
+.ui-priority-primary, .ui-widget-content .ui-priority-primary { font-weight: bold; }
+.ui-priority-secondary, .ui-widget-content .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_222222_256x240.png); }
+.ui-widget-content .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); }
+.ui-widget-header .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); }
+.ui-state-default .ui-icon { background-image: url(images/ui-icons_888888_256x240.png); }
+.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); }
+.ui-state-active .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); }
+.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_2e83ff_256x240.png); }
+.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_cd0a0a_256x240.png); }
+
+/* positioning */
+.ui-icon-carat-1-n { background-position: 0 0; }
+.ui-icon-carat-1-ne { background-position: -16px 0; }
+.ui-icon-carat-1-e { background-position: -32px 0; }
+.ui-icon-carat-1-se { background-position: -48px 0; }
+.ui-icon-carat-1-s { background-position: -64px 0; }
+.ui-icon-carat-1-sw { background-position: -80px 0; }
+.ui-icon-carat-1-w { background-position: -96px 0; }
+.ui-icon-carat-1-nw { background-position: -112px 0; }
+.ui-icon-carat-2-n-s { background-position: -128px 0; }
+.ui-icon-carat-2-e-w { background-position: -144px 0; }
+.ui-icon-triangle-1-n { background-position: 0 -16px; }
+.ui-icon-triangle-1-ne { background-position: -16px -16px; }
+.ui-icon-triangle-1-e { background-position: -32px -16px; }
+.ui-icon-triangle-1-se { background-position: -48px -16px; }
+.ui-icon-triangle-1-s { background-position: -64px -16px; }
+.ui-icon-triangle-1-sw { background-position: -80px -16px; }
+.ui-icon-triangle-1-w { background-position: -96px -16px; }
+.ui-icon-triangle-1-nw { background-position: -112px -16px; }
+.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
+.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
+.ui-icon-arrow-1-n { background-position: 0 -32px; }
+.ui-icon-arrow-1-ne { background-position: -16px -32px; }
+.ui-icon-arrow-1-e { background-position: -32px -32px; }
+.ui-icon-arrow-1-se { background-position: -48px -32px; }
+.ui-icon-arrow-1-s { background-position: -64px -32px; }
+.ui-icon-arrow-1-sw { background-position: -80px -32px; }
+.ui-icon-arrow-1-w { background-position: -96px -32px; }
+.ui-icon-arrow-1-nw { background-position: -112px -32px; }
+.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
+.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
+.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
+.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
+.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
+.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
+.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
+.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
+.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
+.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
+.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
+.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
+.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
+.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
+.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
+.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
+.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
+.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
+.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
+.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
+.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
+.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
+.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
+.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
+.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
+.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
+.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
+.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
+.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
+.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
+.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
+.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
+.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
+.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
+.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
+.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
+.ui-icon-arrow-4 { background-position: 0 -80px; }
+.ui-icon-arrow-4-diag { background-position: -16px -80px; }
+.ui-icon-extlink { background-position: -32px -80px; }
+.ui-icon-newwin { background-position: -48px -80px; }
+.ui-icon-refresh { background-position: -64px -80px; }
+.ui-icon-shuffle { background-position: -80px -80px; }
+.ui-icon-transfer-e-w { background-position: -96px -80px; }
+.ui-icon-transferthick-e-w { background-position: -112px -80px; }
+.ui-icon-folder-collapsed { background-position: 0 -96px; }
+.ui-icon-folder-open { background-position: -16px -96px; }
+.ui-icon-document { background-position: -32px -96px; }
+.ui-icon-document-b { background-position: -48px -96px; }
+.ui-icon-note { background-position: -64px -96px; }
+.ui-icon-mail-closed { background-position: -80px -96px; }
+.ui-icon-mail-open { background-position: -96px -96px; }
+.ui-icon-suitcase { background-position: -112px -96px; }
+.ui-icon-comment { background-position: -128px -96px; }
+.ui-icon-person { background-position: -144px -96px; }
+.ui-icon-print { background-position: -160px -96px; }
+.ui-icon-trash { background-position: -176px -96px; }
+.ui-icon-locked { background-position: -192px -96px; }
+.ui-icon-unlocked { background-position: -208px -96px; }
+.ui-icon-bookmark { background-position: -224px -96px; }
+.ui-icon-tag { background-position: -240px -96px; }
+.ui-icon-home { background-position: 0 -112px; }
+.ui-icon-flag { background-position: -16px -112px; }
+.ui-icon-calendar { background-position: -32px -112px; }
+.ui-icon-cart { background-position: -48px -112px; }
+.ui-icon-pencil { background-position: -64px -112px; }
+.ui-icon-clock { background-position: -80px -112px; }
+.ui-icon-disk { background-position: -96px -112px; }
+.ui-icon-calculator { background-position: -112px -112px; }
+.ui-icon-zoomin { background-position: -128px -112px; }
+.ui-icon-zoomout { background-position: -144px -112px; }
+.ui-icon-search { background-position: -160px -112px; }
+.ui-icon-wrench { background-position: -176px -112px; }
+.ui-icon-gear { background-position: -192px -112px; }
+.ui-icon-heart { background-position: -208px -112px; }
+.ui-icon-star { background-position: -224px -112px; }
+.ui-icon-link { background-position: -240px -112px; }
+.ui-icon-cancel { background-position: 0 -128px; }
+.ui-icon-plus { background-position: -16px -128px; }
+.ui-icon-plusthick { background-position: -32px -128px; }
+.ui-icon-minus { background-position: -48px -128px; }
+.ui-icon-minusthick { background-position: -64px -128px; }
+.ui-icon-close { background-position: -80px -128px; }
+.ui-icon-closethick { background-position: -96px -128px; }
+.ui-icon-key { background-position: -112px -128px; }
+.ui-icon-lightbulb { background-position: -128px -128px; }
+.ui-icon-scissors { background-position: -144px -128px; }
+.ui-icon-clipboard { background-position: -160px -128px; }
+.ui-icon-copy { background-position: -176px -128px; }
+.ui-icon-contact { background-position: -192px -128px; }
+.ui-icon-image { background-position: -208px -128px; }
+.ui-icon-video { background-position: -224px -128px; }
+.ui-icon-script { background-position: -240px -128px; }
+.ui-icon-alert { background-position: 0 -144px; }
+.ui-icon-info { background-position: -16px -144px; }
+.ui-icon-notice { background-position: -32px -144px; }
+.ui-icon-help { background-position: -48px -144px; }
+.ui-icon-check { background-position: -64px -144px; }
+.ui-icon-bullet { background-position: -80px -144px; }
+.ui-icon-radio-off { background-position: -96px -144px; }
+.ui-icon-radio-on { background-position: -112px -144px; }
+.ui-icon-pin-w { background-position: -128px -144px; }
+.ui-icon-pin-s { background-position: -144px -144px; }
+.ui-icon-play { background-position: 0 -160px; }
+.ui-icon-pause { background-position: -16px -160px; }
+.ui-icon-seek-next { background-position: -32px -160px; }
+.ui-icon-seek-prev { background-position: -48px -160px; }
+.ui-icon-seek-end { background-position: -64px -160px; }
+.ui-icon-seek-first { background-position: -80px -160px; }
+.ui-icon-stop { background-position: -96px -160px; }
+.ui-icon-eject { background-position: -112px -160px; }
+.ui-icon-volume-off { background-position: -128px -160px; }
+.ui-icon-volume-on { background-position: -144px -160px; }
+.ui-icon-power { background-position: 0 -176px; }
+.ui-icon-signal-diag { background-position: -16px -176px; }
+.ui-icon-signal { background-position: -32px -176px; }
+.ui-icon-battery-0 { background-position: -48px -176px; }
+.ui-icon-battery-1 { background-position: -64px -176px; }
+.ui-icon-battery-2 { background-position: -80px -176px; }
+.ui-icon-battery-3 { background-position: -96px -176px; }
+.ui-icon-circle-plus { background-position: 0 -192px; }
+.ui-icon-circle-minus { background-position: -16px -192px; }
+.ui-icon-circle-close { background-position: -32px -192px; }
+.ui-icon-circle-triangle-e { background-position: -48px -192px; }
+.ui-icon-circle-triangle-s { background-position: -64px -192px; }
+.ui-icon-circle-triangle-w { background-position: -80px -192px; }
+.ui-icon-circle-triangle-n { background-position: -96px -192px; }
+.ui-icon-circle-arrow-e { background-position: -112px -192px; }
+.ui-icon-circle-arrow-s { background-position: -128px -192px; }
+.ui-icon-circle-arrow-w { background-position: -144px -192px; }
+.ui-icon-circle-arrow-n { background-position: -160px -192px; }
+.ui-icon-circle-zoomin { background-position: -176px -192px; }
+.ui-icon-circle-zoomout { background-position: -192px -192px; }
+.ui-icon-circle-check { background-position: -208px -192px; }
+.ui-icon-circlesmall-plus { background-position: 0 -208px; }
+.ui-icon-circlesmall-minus { background-position: -16px -208px; }
+.ui-icon-circlesmall-close { background-position: -32px -208px; }
+.ui-icon-squaresmall-plus { background-position: -48px -208px; }
+.ui-icon-squaresmall-minus { background-position: -64px -208px; }
+.ui-icon-squaresmall-close { background-position: -80px -208px; }
+.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
+.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
+.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
+.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
+.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
+.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Corner radius */
+.ui-corner-tl { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; }
+.ui-corner-tr { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; }
+.ui-corner-bl { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; }
+.ui-corner-br { -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; }
+.ui-corner-top { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; }
+.ui-corner-bottom { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; }
+.ui-corner-right { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; }
+.ui-corner-left { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; }
+.ui-corner-all { -moz-border-radius: 4px; -webkit-border-radius: 4px; }
+
+/* Overlays */
+.ui-widget-overlay { background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); }
+.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -webkit-border-radius: 8px; }/* Resizable
+----------------------------------*/
+.ui-resizable { position: relative;}
+.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block;}
+.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; }
+.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0px; }
+.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0px; }
+.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0px; height: 100%; }
+.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0px; height: 100%; }
+.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; }
+.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; }
+.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; }
+.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/* Accordion
+----------------------------------*/
+.ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 1px; zoom: 1; }
+.ui-accordion .ui-accordion-li-fix { display: inline; }
+.ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; }
+.ui-accordion .ui-accordion-header a { display: block; font-size: 1em; padding: .5em .5em .5em 2.2em; }
+.ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
+.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; }
+.ui-accordion .ui-accordion-content-active { display: block; }/* Dialog
+----------------------------------*/
+.ui-dialog { position: relative; padding: .2em; width: 300px; }
+.ui-dialog .ui-dialog-titlebar { padding: .5em .3em .3em 1em; position: relative; }
+.ui-dialog .ui-dialog-title { float: left; margin: .1em 0 .2em; }
+.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
+.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
+.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
+.ui-dialog .ui-dialog-content { border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
+.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
+.ui-dialog .ui-dialog-buttonpane button { float: right; margin: .5em .4em .5em 0; cursor: pointer; padding: .2em .6em .3em .6em; line-height: 1.4em; width:auto; overflow:visible; }
+.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; }
+.ui-draggable .ui-dialog-titlebar { cursor: move; }
+/* Slider
+----------------------------------*/
+.ui-slider { position: relative; text-align: left; }
+.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; }
+.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; }
+
+.ui-slider-horizontal { height: .8em; }
+.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; }
+.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
+.ui-slider-horizontal .ui-slider-range-min { left: 0; }
+.ui-slider-horizontal .ui-slider-range-max { right: 0; }
+
+.ui-slider-vertical { width: .8em; height: 100px; }
+.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
+.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
+.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
+.ui-slider-vertical .ui-slider-range-max { top: 0; }/* Tabs
+----------------------------------*/
+.ui-tabs { padding: .2em; zoom: 1; }
+.ui-tabs .ui-tabs-nav { list-style: none; position: relative; padding: .2em .2em 0; }
+.ui-tabs .ui-tabs-nav li { position: relative; float: left; border-bottom-width: 0 !important; margin: 0 .2em -1px 0; padding: 0; }
+.ui-tabs .ui-tabs-nav li a { float: left; text-decoration: none; padding: .5em 1em; }
+.ui-tabs .ui-tabs-nav li.ui-tabs-selected { padding-bottom: 1px; border-bottom-width: 0; }
+.ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; }
+.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
+.ui-tabs .ui-tabs-panel { padding: 1em 1.4em; display: block; border-width: 0; background: none; }
+.ui-tabs .ui-tabs-hide { display: none !important; }
+/* Datepicker
+----------------------------------*/
+.ui-datepicker { width: 17em; padding: .2em .2em 0; }
+.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; }
+.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; }
+.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; }
+.ui-datepicker .ui-datepicker-prev { left:2px; }
+.ui-datepicker .ui-datepicker-next { right:2px; }
+.ui-datepicker .ui-datepicker-prev-hover { left:1px; }
+.ui-datepicker .ui-datepicker-next-hover { right:1px; }
+.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px; }
+.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; }
+.ui-datepicker .ui-datepicker-title select { float:left; font-size:1em; margin:1px 0; }
+.ui-datepicker select.ui-datepicker-month-year {width: 100%;}
+.ui-datepicker select.ui-datepicker-month,
+.ui-datepicker select.ui-datepicker-year { width: 49%;}
+.ui-datepicker .ui-datepicker-title select.ui-datepicker-year { float: right; }
+.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; }
+.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0; }
+.ui-datepicker td { border: 0; padding: 1px; }
+.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; }
+.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; }
+.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; }
+.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; }
+
+/* with multiple calendars */
+.ui-datepicker.ui-datepicker-multi { width:auto; }
+.ui-datepicker-multi .ui-datepicker-group { float:left; }
+.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; }
+.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; }
+.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; }
+.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; }
+.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; }
+.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; }
+.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; }
+.ui-datepicker-row-break { clear:both; width:100%; }
+
+/* RTL support */
+.ui-datepicker-rtl { direction: rtl; }
+.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; }
+.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; }
+.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; }
+.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; }
+.ui-datepicker-rtl .ui-datepicker-group { float:right; }
+.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+
+/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */
+.ui-datepicker-cover {
+ display: none; /*sorry for IE5*/
+ display/**/: block; /*sorry for IE5*/
+ position: absolute; /*must have*/
+ z-index: -1; /*must have*/
+ filter: mask(); /*must have*/
+ top: -4px; /*must have*/
+ left: -4px; /*must have*/
+ width: 200px; /*must have*/
+ height: 200px; /*must have*/
+}/* Progressbar
+----------------------------------*/
+.ui-progressbar { height:2em; text-align: left; }
+.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }
\ No newline at end of file
Added: trunk/new_project/htdocs/basic/local/datepicker.png
===================================================================
(Binary files differ)
Property changes on: trunk/new_project/htdocs/basic/local/datepicker.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/new_project/htdocs/basic/local/dropdown.png
===================================================================
(Binary files differ)
Property changes on: trunk/new_project/htdocs/basic/local/dropdown.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/new_project/htdocs/basic/local/info.png
===================================================================
(Binary files differ)
Property changes on: trunk/new_project/htdocs/basic/local/info.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/new_project/htdocs/basic/local/mail.png
===================================================================
(Binary files differ)
Property changes on: trunk/new_project/htdocs/basic/local/mail.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/new_project/htdocs/basic/local/plus.png
===================================================================
(Binary files differ)
Property changes on: trunk/new_project/htdocs/basic/local/plus.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/new_project/htdocs/basic/local/pulse.gif
===================================================================
(Binary files differ)
Property changes on: trunk/new_project/htdocs/basic/local/pulse.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-07-05 10:43:36
|
Revision: 812
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=812&view=rev
Author: matijsdejong
Date: 2012-07-05 10:43:30 +0000 (Thu, 05 Jul 2012)
Log Message:
-----------
Implemented new menuHtml option for gemsnew layout
Modified Paths:
--------------
trunk/library/layouts/scripts/gemsnew.phtml
Modified: trunk/library/layouts/scripts/gemsnew.phtml
===================================================================
--- trunk/library/layouts/scripts/gemsnew.phtml 2012-07-03 14:52:32 UTC (rev 811)
+++ trunk/library/layouts/scripts/gemsnew.phtml 2012-07-05 10:43:30 UTC (rev 812)
@@ -31,7 +31,7 @@
<div id="header"><?php if ($this->header) { echo $this->header->render($this); }?></div>
<div id="header_bar"><?php if ($this->header_bar) { echo $this->header_bar->render($this); } ?></div>
<?php
- if ($this->navigation):
+ if ($this->navigation || $this->menuHtml):
?>
<div id="wrapper" class="menu">
<div id="colleft" class="main">
@@ -44,7 +44,9 @@
</div>
</div>
<div id="menu"><?php
- echo $this->navigation()->menu(); ?>
+ echo $this->navigation()->menu();
+ echo $this->menuHtml;
+ ?>
</div>
</div>
</div><?php
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-07-03 12:28:51
|
Revision: 810
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=810&view=rev
Author: mennodekker
Date: 2012-07-03 12:28:45 +0000 (Tue, 03 Jul 2012)
Log Message:
-----------
Load viewhelper using plugin paths so optimised helper will find the correct one (MUtil in this case)
Modified Paths:
--------------
trunk/library/classes/MUtil/JQuery/Form/Element/DatePicker.php
Modified: trunk/library/classes/MUtil/JQuery/Form/Element/DatePicker.php
===================================================================
--- trunk/library/classes/MUtil/JQuery/Form/Element/DatePicker.php 2012-07-03 11:37:08 UTC (rev 809)
+++ trunk/library/classes/MUtil/JQuery/Form/Element/DatePicker.php 2012-07-03 12:28:45 UTC (rev 810)
@@ -124,7 +124,8 @@
public function setDateFormat($format)
{
- $this->setJQueryParam('dateFormat', ZendX_JQuery_View_Helper_DatePicker::resolveZendLocaleToDatePickerFormat($format));
+ $view = $this->getView();
+ $this->setJQueryParam('dateFormat', $view->getHelper('DatePicker')->resolveZendLocaleToDatePickerFormat($format));
$this->_dateFormat = $format;
$this->_applyDateFormat();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-07-03 11:37:19
|
Revision: 809
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=809&view=rev
Author: mennodekker
Date: 2012-07-03 11:37:08 +0000 (Tue, 03 Jul 2012)
Log Message:
-----------
Path order is now correct for tab forms
Modified Paths:
--------------
trunk/library/classes/Gems/Controller/BrowseEditAction.php
trunk/library/classes/Gems/Form/TableForm.php
trunk/library/classes/Gems/Form.php
trunk/library/classes/Gems/TabForm.php
trunk/library/classes/MUtil/Form.php
Modified: trunk/library/classes/Gems/Controller/BrowseEditAction.php
===================================================================
--- trunk/library/classes/Gems/Controller/BrowseEditAction.php 2012-07-03 07:39:56 UTC (rev 808)
+++ trunk/library/classes/Gems/Controller/BrowseEditAction.php 2012-07-03 11:37:08 UTC (rev 809)
@@ -299,12 +299,6 @@
public function beforeFormDisplay ($form, $isNew)
{
if ($this->useTabbedForms || $form instanceof Gems_Form_TableForm) {
- /* Not needed anymore @@TODO: Remove when proven, as there is a set tab
- //Create the tabs tried in $form->render() but somehow that is never reached
- if ($form instanceof Gems_TabForm) {
- Gems_TabForm::htmlElementsToTabs($form);
- }*/
-
//If needed, add a row of link buttons to the bottom of the form
if ($links = $this->createMenuLinks($isNew ? $this->menuCreateIncludeLevel : $this->menuEditIncludeLevel)) {
$element = new MUtil_Form_Element_Html('formLinks');
Modified: trunk/library/classes/Gems/Form/TableForm.php
===================================================================
--- trunk/library/classes/Gems/Form/TableForm.php 2012-07-03 07:39:56 UTC (rev 808)
+++ trunk/library/classes/Gems/Form/TableForm.php 2012-07-03 11:37:08 UTC (rev 809)
@@ -103,8 +103,8 @@
*/
public function addDisplayGroup(array $elements, $name, $options = null)
{
- //Add the group as usual
- parent::addDisplayGroup($elements, $name, $options);
+ //Add the group as usual, but skip decorator loading as we don't need that
+ parent::addDisplayGroup($elements, $name, (array) $options + array('disableLoadDefaultDecorators'=>true));
//Retrieve it and set decorators
$group = $this->getDisplayGroup($name);
Modified: trunk/library/classes/Gems/Form.php
===================================================================
--- trunk/library/classes/Gems/Form.php 2012-07-03 07:39:56 UTC (rev 808)
+++ trunk/library/classes/Gems/Form.php 2012-07-03 11:37:08 UTC (rev 809)
@@ -90,6 +90,41 @@
$this->setDisableTranslator(true);
}
+ protected function _activateJQueryView(Zend_View_Interface $view = null)
+ {
+ if ($this->_no_jquery) {
+ return;
+ }
+
+ if (null === $view) {
+ $view = $this->getView();
+ if (null === $view) {
+ return;
+ }
+ }
+
+ parent::_activateJQueryView($view);
+
+ if (false === $view->getPluginLoader('helper')->getPaths('Gems_JQuery_View_Helper')) {
+ $view->addHelperPath('Gems/JQuery/View/Helper', 'Gems_JQuery_View_Helper');
+ }
+ }
+
+ public function activateJQuery()
+ {
+ if ($this->_no_jquery) {
+ parent::activateJQuery();
+ ZendX_JQuery::enableForm($this);
+
+ $this->addPrefixPath('Gems_JQuery_Form_Decorator', 'Gems/JQuery/Form/Decorator/', Zend_Form::DECORATOR);
+ $this->addPrefixPath('Gems_JQuery_Form_Element', 'Gems/JQuery/Form/Element/', Zend_Form::ELEMENT);
+
+ $this->_activateJQueryView();
+
+ $this->_no_jquery = false;
+ }
+ }
+
/**
* Add a script to the head
*
Modified: trunk/library/classes/Gems/TabForm.php
===================================================================
--- trunk/library/classes/Gems/TabForm.php 2012-07-03 07:39:56 UTC (rev 808)
+++ trunk/library/classes/Gems/TabForm.php 2012-07-03 11:37:08 UTC (rev 809)
@@ -49,6 +49,42 @@
*/
private $currentTab = null;
+ public function __construct($options = null)
+ {
+ parent::__construct($options);
+
+ /**
+ * Make it a JQuery form
+ *
+ * NOTE: Do this for all subforms you add afterwards
+ */
+ $this->activateJQuery();
+
+ /**
+ * You must set the form id so that you can add your tabPanes to the tabContainer
+ */
+ if (is_null($this->getAttrib('id'))) $this->setAttrib('id', 'mainForm');
+
+ /**
+ * Now we add a hidden element to hold the selected tab
+ */
+ $this->addElement(new Zend_Form_Element_Hidden('tab'));
+
+ $jquery = $this->getView()->jQuery();
+ /**
+ * This script handles saving the tab to our hidden input when a new tab is showed
+ */
+ $js = sprintf('%1$s("#tabContainer").bind( "tabsshow", function(event, ui) {
+ var $tabs = %1$s("#tabContainer").tabs();
+ var selected = $tabs.tabs("option", "selected"); // => 0
+ %1$s("#%2$s input#tab").val(selected);
+ });',
+ ZendX_JQuery_View_Helper_JQuery::getJQueryHandler(),
+ $this->getAttrib('id')
+ );
+ $jquery->addOnLoad($js);
+ }
+
/**
* Add an element to the form, when a tab (subform) had been added, it will return
* the subform instead of the form, keep this in mind when chaining methods
@@ -183,144 +219,6 @@
}
/**
- * Create tabs from MUtil_Form_Element_Tab elements
- *
- * All elements following an element of type MUtil_Form_Element_Tab will be in tabs
- * For these items a subform will be created of the type Gems_Form_TabSubForm
- *
- * @param Zend_Form $form The form containting the elements
- */
- public static function htmlElementsToTabs($form) {
- foreach ($form as $element) {
- switch (get_class($element)) {
- case 'MUtil_Form_Element_Tab':
- //Start a new tab
- if (isset($tab)) {
- //First output the old data
- $tabs[$tab->getName()] = $tab;
- }
- $name = $element->getName();
- $title = $element->getValue();
- if ($title instanceof MUtil_Html_Sequence) $title = $title->render($form->getView());
- $tab = new Gems_Form_TabSubForm(array('name' => $name, 'title' => strip_tags($title)));
- $remove[] = $element->getName();
- break;
-
- case 'Zend_Form_Element_Hidden':
- //zorg dat er geen display is voor hidden fields
- $element->removeDecorator('htmlTag');
- $element->removeDecorator('Label');
- case 'Gems_Form_TabSubForm':
- case 'Zend_Form_Element_Submit':
- //Just leave this one out of the tabs
- break;
-
- default:
- if (isset($tab)) {
- if ($element instanceof Zend_Form_DisplayGroup) {
- $groupElements = $element->getElements();
- $groupName = $element->getName();
- $options = $element->getAttribs();
- $options['description'] = $element->getDescription();
-
- $elements = array();
- foreach ($groupElements as $groupElement) {
- $newElement = clone $groupElement;
- $tab->addElement($newElement);
- $elements[] = $newElement->getName();
- }
- $removeGrp[] = $groupName;
- foreach ($elements as $oldElement) {
- $remove[] = $oldElement;
- }
- $tab->addDisplayGroup($elements, $groupName, $options);
- } else {
- $tab->addElement($element);
- $remove[] = $element->getName();
- }
- } else {
- //Make sure error decorator is the last one! (not really needed inside the tabs, but just to make sure)
- $error = $element->getDecorator('Errors');
- if ($error instanceof Zend_Form_Decorator_Errors) {
- $element->removeDecorator('Errors');
- $element->addDecorator($error);
- }
- }
- break;
- }
- }
- //Get the final tab info
- if (isset($tab)) {
- $tabs[$tab->getName()] = $tab;
- }
-
- //Cleanup the form, do this now, because otherwise the loop was reset when removing items
- if (isset($remove)) {
- foreach($remove as $name) {
- $form->removeElement($name);
- }
- }
- if (isset($removeGrp)) {
- foreach($removeGrp as $name) {
- $form->removeDisplayGroup($name);
- }
- }
-
- //Now add the tabs as displaygroups
- if (isset($tabs) && is_array($tabs)) {
- $form->addSubForms($tabs);
- } else {
- //Ok no tabs defined... maybe we should do something for display here...
- }
-
- /**
- * If the form is populated... and we have a tab set... select it
- */
- $form->selectTab($form->getValue('tab'));
- }
-
- /**
- * Perfoms some actions needed to initialize the form
- */
- public function init()
- {
- /**
- * Make it a JQuery form
- *
- * NOTE: Do this for all subforms you add afterwards
- */
- ZendX_JQuery::enableForm($this);
-
- $this->addPrefixPath('Gems_JQuery_Form_Decorator', 'Gems/JQuery/Form/Decorator', 'decorator')
- ->addElementPrefixPath('Gems_JQuery_Form_Decorator', 'Gems/JQuery/Form/Decorator', 'decorator')
- ->addDisplayGroupPrefixPath('Gems_JQuery_Form_Decorator', 'Gems/JQuery/Form/Decorator', 'decorator');
-
- /**
- * You must set the form id so that you can add your tabPanes to the tabContainer
- */
- if (is_null($this->getAttrib('id'))) $this->setAttrib('id', 'mainForm');
-
- /**
- * Now we add a hidden element to hold the selected tab
- */
- $this->addElement(new Zend_Form_Element_Hidden('tab'));
-
- $jquery = $this->getView()->jQuery();
- /**
- * This script handles saving the tab to our hidden input when a new tab is showed
- */
- $js = sprintf('%1$s("#tabContainer").bind( "tabsshow", function(event, ui) {
- var $tabs = %1$s("#tabContainer").tabs();
- var selected = $tabs.tabs("option", "selected"); // => 0
- %1$s("#%2$s input#tab").val(selected);
- });',
- ZendX_JQuery_View_Helper_JQuery::getJQueryHandler(),
- $this->getAttrib('id')
- );
- $jquery->addOnLoad($js);
- }
-
- /**
* Load the default decorators
*
* @return void
Modified: trunk/library/classes/MUtil/Form.php
===================================================================
--- trunk/library/classes/MUtil/Form.php 2012-07-03 07:39:56 UTC (rev 808)
+++ trunk/library/classes/MUtil/Form.php 2012-07-03 11:37:08 UTC (rev 809)
@@ -92,7 +92,7 @@
Zend_Dojo::enableView($view);
}
- private function _activateJQueryView(Zend_View_Interface $view = null)
+ protected function _activateJQueryView(Zend_View_Interface $view = null)
{
if ($this->_no_jquery) {
return;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-07-03 07:40:07
|
Revision: 808
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=808&view=rev
Author: mennodekker
Date: 2012-07-03 07:39:56 +0000 (Tue, 03 Jul 2012)
Log Message:
-----------
Skip tokens with not ok reception code in export
Modified Paths:
--------------
trunk/library/classes/Gems/Export/RespondentExport.php
Modified: trunk/library/classes/Gems/Export/RespondentExport.php
===================================================================
--- trunk/library/classes/Gems/Export/RespondentExport.php 2012-07-02 15:17:02 UTC (rev 807)
+++ trunk/library/classes/Gems/Export/RespondentExport.php 2012-07-03 07:39:56 UTC (rev 808)
@@ -160,7 +160,12 @@
*/
protected function _isTokenInFilter(Gems_Tracker_Token $token)
{
- return true;
+ // Only if token has a success code
+ if ($token->getReceptionCode()->isSuccess()) {
+ return true;
+ }
+
+ return false;
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-07-02 15:17:12
|
Revision: 807
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=807&view=rev
Author: matijsdejong
Date: 2012-07-02 15:17:02 +0000 (Mon, 02 Jul 2012)
Log Message:
-----------
h1 up to h6 are now only rendered when they contain content
Modified Paths:
--------------
trunk/library/classes/MUtil/Html/Creator.php
trunk/library/classes/MUtil/Html/TrElement.php
Added Paths:
-----------
trunk/library/classes/MUtil/Html/HnElement.php
Modified: trunk/library/classes/MUtil/Html/Creator.php
===================================================================
--- trunk/library/classes/MUtil/Html/Creator.php 2012-07-02 14:49:06 UTC (rev 806)
+++ trunk/library/classes/MUtil/Html/Creator.php 2012-07-02 15:17:02 UTC (rev 807)
@@ -88,6 +88,12 @@
'dt' => 'MUtil_Html_DtElement::dt',
'echo' => 'MUtil_Html_TableElement::createVar',
'email' => 'MUtil_Html_AElement::email',
+ 'h1' => 'MUtil_Html_HnElement::h1',
+ 'h2' => 'MUtil_Html_HnElement::h2',
+ 'h3' => 'MUtil_Html_HnElement::h3',
+ 'h4' => 'MUtil_Html_HnElement::h4',
+ 'h5' => 'MUtil_Html_HnElement::h5',
+ 'h6' => 'MUtil_Html_HnElement::h6',
'if' => 'MUtil_Lazy::iff',
'iflink' => 'MUtil_Html_AElement::iflink',
'ifmail' => 'MUtil_Html_AElement::ifmail',
Added: trunk/library/classes/MUtil/Html/HnElement.php
===================================================================
--- trunk/library/classes/MUtil/Html/HnElement.php (rev 0)
+++ trunk/library/classes/MUtil/Html/HnElement.php 2012-07-02 15:17:02 UTC (rev 807)
@@ -0,0 +1,131 @@
+<?php
+
+/**
+ * Copyright (c) 2012, Erasmus MC
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of Erasmus MC nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * @package MUtil
+ * @subpackage Html
+ * @author Matijs de Jong <mj...@ma...>
+ * @copyright Copyright (c) 2012 Erasmus MC
+ * @license New BSD License
+ * @version $id: HnElement.php 203 2012-01-01t 12:51:32Z matijs $
+ */
+
+/**
+ *
+ *
+ * @package MUtil
+ * @subpackage Html
+ * @copyright Copyright (c) 2012 Erasmus MC
+ * @license New BSD License
+ * @since Class available since version 1.5.5
+ */
+class MUtil_Html_HnElement extends MUtil_Html_HtmlElement
+{
+ /**
+ * Most elements must be rendered even when empty, others should - according to the
+ * xhtml specifications - only be rendered when the element contains some content.
+ *
+ * $renderWithoutContent controls this rendering. By default an element tag is output
+ * but when false the tag will only be present if there is some content in it.
+ *
+ * @var boolean The element is rendered even without content when true.
+ */
+ public $renderWithoutContent = false;
+
+ /**
+ * Static helper function for creation, used by @see MUtil_Html_Creator.
+ *
+ * @param mixed $arg_array Optional MUtil_Ra::args processed settings
+ * @return MUtil_Html_TrElement
+ */
+ public static function h1($arg_array = null)
+ {
+ $args = func_get_args();
+ return new self(__FUNCTION__, $args);
+ }
+
+ /**
+ * Static helper function for creation, used by @see MUtil_Html_Creator.
+ *
+ * @param mixed $arg_array Optional MUtil_Ra::args processed settings
+ * @return MUtil_Html_TrElement
+ */
+ public static function h2($arg_array = null)
+ {
+ $args = func_get_args();
+ return new self(__FUNCTION__, $args);
+ }
+
+ /**
+ * Static helper function for creation, used by @see MUtil_Html_Creator.
+ *
+ * @param mixed $arg_array Optional MUtil_Ra::args processed settings
+ * @return MUtil_Html_TrElement
+ */
+ public static function h3($arg_array = null)
+ {
+ $args = func_get_args();
+ return new self(__FUNCTION__, $args);
+ }
+
+ /**
+ * Static helper function for creation, used by @see MUtil_Html_Creator.
+ *
+ * @param mixed $arg_array Optional MUtil_Ra::args processed settings
+ * @return MUtil_Html_TrElement
+ */
+ public static function h4($arg_array = null)
+ {
+ $args = func_get_args();
+ return new self(__FUNCTION__, $args);
+ }
+
+ /**
+ * Static helper function for creation, used by @see MUtil_Html_Creator.
+ *
+ * @param mixed $arg_array Optional MUtil_Ra::args processed settings
+ * @return MUtil_Html_TrElement
+ */
+ public static function h5($arg_array = null)
+ {
+ $args = func_get_args();
+ return new self(__FUNCTION__, $args);
+ }
+
+ /**
+ * Static helper function for creation, used by @see MUtil_Html_Creator.
+ *
+ * @param mixed $arg_array Optional MUtil_Ra::args processed settings
+ * @return MUtil_Html_TrElement
+ */
+ public static function h6($arg_array = null)
+ {
+ $args = func_get_args();
+ return new self(__FUNCTION__, $args);
+ }
+}
Modified: trunk/library/classes/MUtil/Html/TrElement.php
===================================================================
--- trunk/library/classes/MUtil/Html/TrElement.php 2012-07-02 14:49:06 UTC (rev 806)
+++ trunk/library/classes/MUtil/Html/TrElement.php 2012-07-02 15:17:02 UTC (rev 807)
@@ -1,47 +1,47 @@
<?php
-
-/**
- * Copyright (c) 2011, Erasmus MC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Erasmus MC nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
/**
- *
- * @author Matijs de Jong
- * @since 1.0
- * @version 1.1
- * @package MUtil
+ * Copyright (c) 2011, Erasmus MC
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of Erasmus MC nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package MUtil
* @subpackage Html
+ * @author Matijs de Jong <mj...@ma...>
+ * @copyright Copyright (c) 2012 Erasmus MC
+ * @license New BSD License
+ * @version $id: HnElement.php 203 2012-01-01t 12:51:32Z matijs $
*/
/**
+ *
*
- * @author Matijs de Jong
- * @package MUtil
+ * @package MUtil
* @subpackage Html
+ * @copyright Copyright (c) 2012 Erasmus MC
+ * @license New BSD License
+ * @since Class available since version 1.0
*/
class MUtil_Html_TrElement extends MUtil_Html_HtmlElement implements MUtil_Html_ColumnInterface
{
@@ -77,19 +77,19 @@
protected $_appendString = "\n";
/**
- * When repeating content using $_repeater you may want to output the content only when it has
+ * When repeating content using $_repeater you may want to output the content only when it has
* changed.
- *
+ *
* @see $_repeater
- *
+ *
* @var boolean Do not output if the output is identical to the last time the element was rendered.
*/
protected $_onlyWhenChanged = false;
-
+
/**
* @see $_onlyWhenChanged
- *
+ *
* @var string Cache for last output for comparison
*/
protected $_onlyWhenChangedValueStore = null;
@@ -97,29 +97,29 @@
/**
* Returns the cell or a MUtil_MultiWrapper containing cells that occupy the column position, taking colspan and other functions into account.
- *
+ *
* @param int $col The numeric column position, starting at 0;
* @return MUtil_Html_HtmlElement Probably an element of this type, but can also be something else, posing as an element.
*/
public function getColumn($col)
{
$results = $this->getColumnArray($col);
-
+
switch (count($results)) {
case 0:
return null;
-
+
case 1:
return reset($results);
-
+
default:
return new MUtil_MultiWrapper($results);
}
}
-
+
/**
* Returns the cells that occupies the column position, taking colspan and other functions into account, in an array.
- *
+ *
* @param int $col The numeric column position, starting at 0;
* @return array Of probably one MUtil_Html_HtmlElement
*/
@@ -127,10 +127,10 @@
{
return array($this->getColumn($col));
}
-
+
/**
* Return the number of columns, taking such niceties as colspan into account
- *
+ *
* @return int
*/
public function getColumnCount()
@@ -146,20 +146,20 @@
/**
* Returns the cell's column width. A utility function.
- *
+ *
* @param mixed $cell MUtil_Html_ColumnInterface
* @return int
*/
- public static function getCellWidth($cell)
+ public static function getCellWidth($cell)
{
if ($cell instanceof MUtil_Html_ColumnInterface) {
return $cell->getColumnCount();
- }
-
+ }
+
if (isset($cell->colspan) && is_int($cell->colspan)) {
return intval($cell->colspan);
- }
-
+ }
+
// Assume it is a single column
return 1;
}
@@ -171,9 +171,9 @@
/**
* Function to allow overloading of tag rendering only
- *
+ *
* Renders the element tag with it's content into a html string
- *
+ *
* The $view is used to correctly encode and escape the output
*
* @param Zend_View_Abstract $view
@@ -182,22 +182,22 @@
protected function renderElement(Zend_View_Abstract $view)
{
$result = parent::renderElement($view);
-
+
if ($this->_onlyWhenChanged) {
if ($result == $this->_onlyWhenChangedValueStore) {
return null;
}
$this->_onlyWhenChangedValueStore = $result;
}
-
+
return $result;
}
/**
- * When repeating content using $_repeater you may want to output the content only when it has
+ * When repeating content using $_repeater you may want to output the content only when it has
* changed.
- *
+ *
* @see $_repeater
- *
+ *
* @return MUtil_Html_HtmlElement (continuation pattern)
*/
public function setOnlyWhenChanged($value)
@@ -208,7 +208,7 @@
/**
* Static helper function for creation, used by @see MUtil_Html_Creator.
- *
+ *
* @param mixed $arg_array Optional MUtil_Ra::args processed settings
* @return MUtil_Html_TrElement
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
2 messages has been excluded from this view by a project administrator.
