Merge branch '3.8'

Conflicts:
	CHANGELOG.md
	bin/developer
	lib/classes/module/console/systemUpgrade.php
	www/skins/report/jquery-ui.css

bin/console

@@ -33,8 +33,7 @@ use Alchemy\Phrasea\Command\Setup\XSendFileConfigurationDumper;
 
 require_once __DIR__ . '/../lib/autoload.php';
 
-try {
-    $cli = new CLI("
+$cli = new CLI("
   _____  _    _ _____            _____ ______          _   _ ______ _______
  |  __ \| |  | |  __ \    /\    / ____|  ____|   /\   | \ | |  ____|__   __|
  | |__) | |__| | |__) |  /  \  | (___ | |__     /  \  |  \| | |__     | |
@@ -52,60 +51,54 @@ try {
  under certain conditions; type `about:license' for details.\n\n"
             . ' KONSOLE KOMMANDER', Version::getName() . ' ' . Version::getNumber());
 
-    if (!$cli['phraseanet.configuration-tester']->isInstalled()) {
-        throw new \RuntimeException('Phraseanet is not installed, use setup command instead');
-    }
-    if (!$cli['phraseanet.configuration-tester']->isUpToDate()) {
-        throw new \RuntimeException('Phraseanet is not up-to-date, use setup command instead');
-    }
-
-    $cli->command(new \module_console_aboutAuthors('about:authors'));
-    $cli->command(new \module_console_aboutLicense('about:license'));
-
-    $cli->command(new CheckConfig('check:config'));
-    $cli->command(new \module_console_checkExtension('check:extension'));
-
-    $cli->command(new UpgradeDBDatas('system:upgrade-datas'));
-
-    $cli->command(new \module_console_sphinxGenerateSuggestion('sphinx:generate-suggestions'));
-
-    $cli->command(new \module_console_systemMailCheck('system:mail-check'));
-    $cli->command(new \module_console_systemBackupDB('system:backup-db'));
-    $cli->command(new \module_console_systemClearCache('system:clear-cache'));
-    $cli->command(new \module_console_systemExport('system:export'));
-
-    $cli->command(new \module_console_taskrun('task:run'));
-    $cli->command(new \module_console_tasklist('task:list'));
-    $cli->command(new \module_console_taskState('task:state'));
-    $cli->command(new \module_console_schedulerState('scheduler:state'));
-    $cli->command(new \module_console_schedulerStop('scheduler:stop'));
-    $cli->command(new \module_console_schedulerStart('scheduler:start'));
-
-    $cli->command(new MailTest('mail:test'));
-
-    $cli->command(new \module_console_fieldsList('fields:list'));
-    $cli->command(new \module_console_fieldsDelete('fields:delete'));
-    $cli->command(new \module_console_fieldsRename('fields:rename'));
-    $cli->command(new \module_console_fieldsMerge('fields:merge'));
-
-    $cli->command(new CreateCollection('collection:create'));
-
-    $cli->command(new RecordAdd('records:add'));
-    $cli->command(new RescanTechnicalDatas('records:rescan-technical-datas'));
-    $cli->command(new BuildMissingSubdefs('records:build-missing-subdefs'));
-
-    $cli->command(new AddPlugin());
-    $cli->command(new RemovePlugin());
-    $cli->command(new Configuration());
-    $cli->command(new XSendFileConfigurationDumper());
-    $cli->command(new XSendFileMappingGenerator());
-
-    $cli->loadPlugins();
-
-    $result_code = is_int($cli->run()) ? : 1;
-} catch (\Exception $e) {
-    $result_code = 1;
-    echo sprintf("\nAn error occured :\n\n\t\033[0;31m%s\033[0;37m\n\n", $e->getMessage());
+if (!$cli['phraseanet.configuration-tester']->isInstalled()) {
+    throw new \RuntimeException('Phraseanet is not installed, use setup command instead');
+}
+if (!$cli['phraseanet.configuration-tester']->isUpToDate()) {
+    throw new \RuntimeException('Phraseanet is not up-to-date, use setup command instead');
 }
 
-exit($result_code);
+$cli->command(new \module_console_aboutAuthors('about:authors'));
+$cli->command(new \module_console_aboutLicense('about:license'));
+
+$cli->command(new CheckConfig('check:config'));
+$cli->command(new \module_console_checkExtension('check:extension'));
+
+$cli->command(new UpgradeDBDatas('system:upgrade-datas'));
+
+$cli->command(new \module_console_sphinxGenerateSuggestion('sphinx:generate-suggestions'));
+
+$cli->command(new \module_console_systemMailCheck('system:mail-check'));
+$cli->command(new \module_console_systemBackupDB('system:backup-db'));
+$cli->command(new \module_console_systemClearCache('system:clear-cache'));
+$cli->command(new \module_console_systemExport('system:export'));
+
+$cli->command(new \module_console_taskrun('task:run'));
+$cli->command(new \module_console_tasklist('task:list'));
+$cli->command(new \module_console_taskState('task:state'));
+$cli->command(new \module_console_schedulerState('scheduler:state'));
+$cli->command(new \module_console_schedulerStop('scheduler:stop'));
+$cli->command(new \module_console_schedulerStart('scheduler:start'));
+
+$cli->command(new MailTest('mail:test'));
+
+$cli->command(new \module_console_fieldsList('fields:list'));
+$cli->command(new \module_console_fieldsDelete('fields:delete'));
+$cli->command(new \module_console_fieldsRename('fields:rename'));
+$cli->command(new \module_console_fieldsMerge('fields:merge'));
+
+$cli->command(new CreateCollection('collection:create'));
+
+$cli->command(new RecordAdd('records:add'));
+$cli->command(new RescanTechnicalDatas('records:rescan-technical-datas'));
+$cli->command(new BuildMissingSubdefs('records:build-missing-subdefs'));
+
+$cli->command(new AddPlugin());
+$cli->command(new RemovePlugin());
+$cli->command(new Configuration());
+$cli->command(new XSendFileConfigurationDumper());
+$cli->command(new XSendFileMappingGenerator());
+
+$cli->loadPlugins();
+
+exit(is_int($cli->run()) ? : 1);

bin/developer

@@ -43,8 +43,7 @@ use Doctrine\ORM\Tools\Console\Command\ValidateSchemaCommand;
 
 require_once __DIR__ . '/../lib/autoload.php';
 
-try {
-    $cli = new CLI("
+$cli = new CLI("
  ___  ___  _  _  ___  __    __  ___  ___  ___     ____  __    __  __    ___
 (   \(  _)( )( )(  _)(  )  /  \(  ,\(  _)(  ,)   (_  _)/  \  /  \(  )  / __)
  ) ) )) _) \\//  ) _) )(__( () )) _/ ) _) )  \     )( ( () )( () ))(__ \__ \
@@ -56,53 +55,48 @@ try {
  under certain conditions; type `about:license' for details.\n\n"
             . ' Phraseanet Developer Tools ', Version::getName() . ' ' . Version::getNumber());
 
-    if ($cli['phraseanet.configuration']->isSetup()) {
-        $helpers = array(
-            'db' => new ConnectionHelper($cli['EM']->getConnection()),
-            'em' => new EntityManagerHelper($cli['EM'])
-        );
+if ($cli['phraseanet.configuration']->isSetup()) {
+    $helpers = array(
+        'db' => new ConnectionHelper($cli['EM']->getConnection()),
+        'em' => new EntityManagerHelper($cli['EM'])
+    );
 
-        $helperSet = $cli['console']->getHelperSet();
-        foreach ($helpers as $name => $helper) {
-            $helperSet->set($helper, $name);
-        }
+    $helperSet = $cli['console']->getHelperSet();
+    foreach ($helpers as $name => $helper) {
+        $helperSet->set($helper, $name);
     }
-
-    $cli->command(new InstallAll());
-    $cli->command(new BowerInstall());
-    $cli->command(new ComposerInstall());
-    $cli->command(new LessCompiler());
-    $cli->command(new RegenerateSqliteDb());
-    $cli->command(new APIRoutesDumper());
-    $cli->command(new RoutesDumper());
-    $cli->command(new Behat());
-    $cli->command(new \module_console_systemTemplateGenerator('system:generate-templates'));
-
-    $cli['console']->addCommands(array(
-        // DBAL Commands
-        new RunSqlCommand(),
-        new ImportCommand(),
-        // ORM Commands
-        new MetadataCommand(),
-        new ResultCommand(),
-        new QueryCommand(),
-        new CreateCommand(),
-        new UpdateCommand(),
-        new DropCommand(),
-        new EnsureProductionSettingsCommand(),
-        new ConvertDoctrine1SchemaCommand(),
-        new GenerateRepositoriesCommand(),
-        new GenerateEntitiesCommand(),
-        new GenerateProxiesCommand(),
-        new ConvertMappingCommand(),
-        new RunDqlCommand(),
-        new ValidateSchemaCommand(),
-    ));
-
-    $cli->runCLI();
-} catch (Exception $e) {
-    echo "an error occured : " . $e->getMessage();
-    exit(1);
 }
 
-exit(0);
+$cli->command(new InstallAll());
+$cli->command(new BowerInstall());
+$cli->command(new ComposerInstall());
+$cli->command(new RegenerateSqliteDb());
+$cli->command(new APIRoutesDumper());
+$cli->command(new RoutesDumper());
+$cli->command(new Behat());
+$cli->command(new LessCompiler());
+$cli->command(new \module_console_systemTemplateGenerator('system:generate-templates'));
+
+
+$cli['console']->addCommands(array(
+    // DBAL Commands
+    new RunSqlCommand(),
+    new ImportCommand(),
+    // ORM Commands
+    new MetadataCommand(),
+    new ResultCommand(),
+    new QueryCommand(),
+    new CreateCommand(),
+    new UpdateCommand(),
+    new DropCommand(),
+    new EnsureProductionSettingsCommand(),
+    new ConvertDoctrine1SchemaCommand(),
+    new GenerateRepositoriesCommand(),
+    new GenerateEntitiesCommand(),
+    new GenerateProxiesCommand(),
+    new ConvertMappingCommand(),
+    new RunDqlCommand(),
+    new ValidateSchemaCommand(),
+));
+
+exit($cli->runCLI());

bin/setup

@@ -25,8 +25,7 @@ use Alchemy\Phrasea\Command\Setup\CheckEnvironment;
 
 require_once __DIR__ . '/../vendor/autoload.php';
 
-try {
-    $app = new CLI("
+$app = new CLI("
   _____  _    _ _____            _____ ______          _   _ ______ _______
  |  __ \| |  | |  __ \    /\    / ____|  ____|   /\   | \ | |  ____|__   __|
  | |__) | |__| | |__) |  /  \  | (___ | |__     /  \  |  \| | |__     | |
@@ -46,29 +45,23 @@ try {
  under certain conditions; type `about:license' for details.\n\n"
             . ' SETUP', Version::getName() . ' ' . Version::getNumber());
 
-    $app->command(new \module_console_aboutAuthors('about:authors'));
-    $app->command(new \module_console_aboutLicense('about:license'));
+$app->command(new \module_console_aboutAuthors('about:authors'));
+$app->command(new \module_console_aboutLicense('about:license'));
 
-    if(
-        $app['phraseanet.configuration-tester']->isMigrable()
-        || $app['phraseanet.configuration-tester']->isUpgradable()
-        || $app['phraseanet.configuration-tester']->isInstalled()
-        ) {
-        $app->command(new \module_console_systemUpgrade('system:upgrade'));
-    }
-
-    if ($app['phraseanet.configuration-tester']->isInstalled()) {
-        $app->command(new UpgradeDBDatas('system:upgrade-datas'));
-    }
-
-    $app->command(new PluginsReset());
-    $app->command(new CheckEnvironment('check:system'));
-    $app->command(new Install('system:install'));
-
-    $result_code = is_int($app->run()) ? : 1;
-} catch (\Exception $e) {
-    $result_code = 1;
-    echo sprintf("\nAn error occured :\n\n\t\033[0;31m%s\033[0;37m\n\n", $e->getMessage());
+if(
+    $app['phraseanet.configuration-tester']->isMigrable()
+    || $app['phraseanet.configuration-tester']->isUpgradable()
+    || $app['phraseanet.configuration-tester']->isInstalled()
+    ) {
+    $app->command(new \module_console_systemUpgrade('system:upgrade'));
 }
 
-exit($result_code);
+if ($app['phraseanet.configuration-tester']->isInstalled()) {
+    $app->command(new UpgradeDBDatas('system:upgrade-datas'));
+}
+
+$app->command(new PluginsReset());
+$app->command(new CheckEnvironment('check:system'));
+$app->command(new Install('system:install'));
+
+exit(is_int($app->run()) ? : 1);

lib/Alchemy/Phrasea/Controller/Report/Informations.php

@@ -380,7 +380,7 @@ class Informations implements ControllerProviderInterface
             ));
         }
 
-        if ('DASH' === $from) {
+        if ('DASH' !== $from && 'PUSHDOC' !== $from) {
             $download = new \module_report_download(
                 $app,
                 $request->request->get('dmin'),
@@ -438,7 +438,7 @@ class Informations implements ControllerProviderInterface
                 return $app->json(array('rs' => $csv));
             }
 
-            $html = $app['twig']->render('report/ajax_data_content.html.twig', array(
+            $html .= $app['twig']->render('report/ajax_data_content.html.twig', array(
                 'result'      => isset($reportArray['report']) ? $reportArray['report'] : $reportArray,
                 'is_infouser' => false,
                 'is_nav'      => false,
@@ -489,7 +489,7 @@ class Informations implements ControllerProviderInterface
                 return $app->json(array('rs' => $csv));
             }
 
-            $html = $app['twig']->render('report/ajax_data_content.html.twig', array(
+            $html .= $app['twig']->render('report/ajax_data_content.html.twig', array(
                 'result'      => isset($reportArray['report']) ? $reportArray['report'] : $reportArray,
                 'is_infouser' => false,
                 'is_nav'      => false,

lib/Alchemy/Phrasea/Controller/Root/Login.php

@@ -792,7 +792,7 @@ class Login implements ControllerProviderInterface
         return $response;
     }
 
-    private function generateAuthResponse(Application $app, \Browser $browser, $redirect)
+    public function generateAuthResponse(Application $app, \Browser $browser, $redirect)
     {
         if ($browser->isMobile()) {
             $response = $app->redirectPath('lightbox');
@@ -811,7 +811,7 @@ class Login implements ControllerProviderInterface
     }
 
     // move this in an event
-    private function postAuthProcess(PhraseaApplication $app, \User_Adapter $user)
+    public function postAuthProcess(PhraseaApplication $app, \User_Adapter $user)
     {
         $date = new \DateTime('+' . (int) $app['phraseanet.registry']->get('GV_validation_reminder') . ' days');
 
@@ -1014,7 +1014,7 @@ class Login implements ControllerProviderInterface
         $session = $this->postAuthProcess($app, $user);
 
         $response = $this->generateAuthResponse($app, $app['browser'], $request->request->get('redirect'));
-        $response->headers->setCookie(new Cookie('invite-usr-id', $user->get_id()));
+        $response->headers->clearCookie('invite-usr-id');
 
         $user->ACL()->inject_rights();
 

lib/Alchemy/Phrasea/Media/Subdef/Video.php

@@ -31,7 +31,7 @@ class Video extends Audio
     {
         parent::__construct();
 
-        $this->registerOption(new OptionType\Range(_('Bitrate'), self::OPTION_BITRATE, 100, 4000, 800));
+        $this->registerOption(new OptionType\Range(_('Bitrate'), self::OPTION_BITRATE, 100, 12000, 800));
         $this->registerOption(new OptionType\Range(_('GOP size'), self::OPTION_GOPSIZE, 1, 300, 10));
         $this->registerOption(new OptionType\Range(_('Dimension'), self::OPTION_SIZE, 64, 2000, 600, 16));
         $this->registerOption(new OptionType\Range(_('Frame Rate'), self::OPTION_FRAMERATE, 1, 200, 20));

lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngine.php

@@ -622,7 +622,7 @@ class PhraseaEngine implements SearchEngineInterface
             return array();
         }
 
-        $sxe = simplexml_load_string($res['xml']);
+        $sxe = @simplexml_load_string($res['xml']);
 
         foreach ($fields as $name => $field) {
             if ($sxe && $sxe->description && $sxe->description->$name) {

lib/Alchemy/Phrasea/Setup/Installer.php

@@ -52,9 +52,6 @@ class Installer
 
     private function populateRegistryData($serverName, $dataPath)
     {
-        $this->app['phraseanet.registry']->set('GV_base_datapath_noweb', $dataPath, \registry::TYPE_STRING);
-        $this->app['phraseanet.registry']->set('GV_ServerName', $serverName, \registry::TYPE_STRING);
-
         // required to load GV template
         $app = $this->app;
         $GV = require __DIR__ . '/../../../../lib/conf.d/_GV_template.inc';
@@ -66,6 +63,15 @@ class Installer
                 }
             }
         }
+
+        if (null === realpath($dataPath)) {
+            throw new \InvalidArgumentException(sprintf('Path %s does not exist.', $dataPath));
+        }
+
+        $dataPath = realpath($dataPath) . DIRECTORY_SEPARATOR;
+
+        $this->app['phraseanet.registry']->set('GV_base_datapath_noweb', $dataPath, \registry::TYPE_STRING);
+        $this->app['phraseanet.registry']->set('GV_ServerName', $serverName, \registry::TYPE_STRING);
     }
 
     private function createDB(\connection_interface $dbConn = null, $template)

lib/classes/User/Adapter.php

@@ -1326,6 +1326,10 @@ class User_Adapter implements User_Interface, cache_cacheableInterface
             throw new \InvalidArgumentException('Invalid username');
         }
 
+        if (strlen($login) > 100) {
+            throw new \InvalidArgumentException('Username is too long');
+        }
+
         if (trim($password) == '') {
             throw new \InvalidArgumentException('Invalid password');
         }

lib/classes/databox/field.php

@@ -496,7 +496,7 @@ class databox_field implements cache_cacheableInterface
             throw new InvalidArgumentException(sprintf('Code %s is not defined', $code));
         }
 
-        return isset($this->labels[$code]) ? $this->labels[$code] : $this->name;
+        return isset($this->labels[$code]) && '' !== $this->labels[$code] ? $this->labels[$code] : $this->name;
     }
 
     /**

lib/classes/module/console/systemUpgrade.php

@@ -64,43 +64,38 @@ class module_console_systemUpgrade extends Command
         }
 
         if ($continue == 'y') {
-            try {
-                $output->write('<info>Upgrading...</info>', true);
+            $output->write('<info>Upgrading...</info>', true);
 
-                try {
-                    $upgrader = new Setup_Upgrade($this->container, $input->getOption('force'));
-                } catch (\Exception_Setup_FixBadEmailAddresses $e) {
-                    return $output->writeln(sprintf('<error>You have to fix your database before upgrade with the system:mailCheck command </error>'));
-                }
+            if (count(User_Adapter::get_wrong_email_users($this->container)) > 0) {
+                return $output->writeln(sprintf('<error>You have to fix your database before upgrade with the system:mailCheck command </error>'));
+            }
 
-                $queries = $this->getService('phraseanet.appbox')->forceUpgrade($upgrader, $this->container);
+            $upgrader = new Setup_Upgrade($this->container, $input->getOption('force'));
 
-                if ($input->getOption('dump')) {
-                    if (0 < count($queries)) {
-                        $output->writeln("Some SQL queries can be executed to optimize\n");
+            $queries = $this->getService('phraseanet.appbox')->forceUpgrade($upgrader, $this->container);
 
-                        foreach ($queries as $query) {
-                            $output->writeln(" ".$query['sql']);
-                        }
+            if ($input->getOption('dump')) {
+                if (0 < count($queries)) {
+                    $output->writeln("Some SQL queries can be executed to optimize\n");
 
-                        $output->writeln("\n");
-                    } else {
-                        $output->writeln("No SQL queries to execute to optimize\n");
+                    foreach ($queries as $query) {
+                        $output->writeln(" ".$query['sql']);
                     }
+
+                    $output->writeln("\n");
+                } else {
+                    $output->writeln("No SQL queries to execute to optimize\n");
                 }
+            }
 
-                foreach ($upgrader->getRecommendations() as $recommendation) {
-                    list($message, $command) = $recommendation;
+            foreach ($upgrader->getRecommendations() as $recommendation) {
+                list($message, $command) = $recommendation;
 
-                    $output->writeln(sprintf('<info>%s</info>', $message));
-                    $output->writeln("");
-                    $output->writeln(sprintf("\t\t%s", $command));
-                    $output->writeln("");
-                    $output->writeln("");
-                }
-            } catch (\Exception $e) {
-
-                $output->writeln(sprintf('<error>An error occured while upgrading : %s </error>', $e->getMessage()));
+                $output->writeln(sprintf('<info>%s</info>', $message));
+                $output->writeln("");
+                $output->writeln(sprintf("\t\t%s", $command));
+                $output->writeln("");
+                $output->writeln("");
             }
         } else {
             $output->write('<info>Canceled</info>', true);

lib/classes/task/abstract.php

@@ -26,8 +26,10 @@ abstract class task_abstract
     const MINRECS = 10;
     const MAXRECS = 100;
     // default min/max values for the 'overflow memory (Mo)' setting on tasks
-    const MINMEGS = 20;
+    const MINMEGS = 64;
     const MAXMEGS = 256;
+    // default memory value
+    const DEFMEGS = 92;
     // default min/max values for the 'period (seconds)' setting on tasks
     const MINPERIOD = 10;
     const MAXPERIOD = 3600;
@@ -775,7 +777,7 @@ abstract class task_abstract
 
         $this->maxmegs = (integer) $sx_task_settings->maxmegs;
         if ($sx_task_settings->maxmegs < self::MINMEGS || $sx_task_settings->maxmegs > self::MAXMEGS) {
-            $this->maxmegs = self::MINMEGS;
+            $this->maxmegs = self::DEFMEGS;
         }
 
         $this->record_buffer_size = (integer) $sx_task_settings->flush;

lib/classes/task/period/subdef.php

@@ -14,11 +14,7 @@ use MediaAlchemyst\Transmuter\Image2Image;
 
 class task_period_subdef extends task_databoxAbstract
 {
-    const MINMEGS = 20;
-    const MAXMEGS = 64;
-
     const MINFLUSH = 10;
-    const MAXFLUSH = 100;
 
     /**
      * Record buffer for writing meta datas after building subdefs
@@ -357,7 +353,7 @@ class task_period_subdef extends task_databoxAbstract
         $period = isset($params['period']) ? $params['period'] : self::MINPERIOD;
         $flush = isset($params['flush']) ? $params['flush'] : self::MINFLUSH;
         $maxrecs = isset($params['maxrecs']) ? $params['maxrecs'] : self::MINRECS;
-        $maxmegs = isset($params['maxmegs']) ? $params['maxmegs'] : self::MINMEGS;
+        $maxmegs = isset($params['maxmegs']) ? $params['maxmegs'] : self::DEFMEGS;
 
         return sprintf('<?xml version="1.0" encoding="UTF-8"?>
             <tasksettings>

lib/classes/task/period/writemeta.php

@@ -342,7 +342,7 @@ class task_period_writemeta extends task_databoxAbstract
     {
         $period = isset($params['period']) ? $params['period'] : self::MINPERIOD;
         $maxrecs = isset($params['maxrecs']) ? $params['maxrecs'] : self::MINRECS;
-        $maxmegs = isset($params['maxmegs']) ? $params['maxmegs'] : self::MINMEGS;
+        $maxmegs = isset($params['maxmegs']) ? $params['maxmegs'] : self::DEFMEGS;
 
         return sprintf('<?xml version="1.0" encoding="UTF-8"?>
             <tasksettings>

lib/conf.d/bases_structure.xml

@@ -2658,7 +2658,7 @@
           <field>
 
             <name>usr_login</name>
-            <type>varchar(50)</type>
+            <type>varchar(128)</type>
             <null></null>
             <extra></extra>
 

templates/web/account/authorized_apps.html.twig

@@ -17,8 +17,8 @@
                             <li id="app_{{ application.get_id() }}">
                                 <div>
                                     {% set account = application.get_user_account(app["authentication"].getUser()) %}
-                                    <a href="{{ path("grant_app_access", {"application_id" : application.get_id()}) }}" class="revoke app-btn btn btn-small pull-right {% if account.is_revoked() is empty %}hidden{% endif %}" value="{{application.get_id()}}">{% trans "Revoquer l\'access" %}</a>
-                                    <a href="{{ path("grant_app_access", {"application_id" : application.get_id()}) }}"  class="authorize app-btn btn btn-small pull-right {% if account.is_revoked() is not empty %}hidden{% endif %}" value="{{application.get_id()}}">{% trans "Authoriser l\'access" %}</a>
+                                    <a href="{{ path("grant_app_access", {"application_id" : application.get_id()}) }}" class="revoke app-btn btn btn-small pull-right {% if account.is_revoked() %}hidden{% endif %}" value="{{application.get_id()}}">{% trans "Revoquer l\'access" %}</a>
+                                    <a href="{{ path("grant_app_access", {"application_id" : application.get_id()}) }}"  class="authorize app-btn btn btn-small pull-right {% if not account.is_revoked() %}hidden{% endif %}" value="{{application.get_id()}}">{% trans "Authoriser l\'access" %}</a>
                                     <p class="app-row">
                                         <a href="{{ application.get_website() }}" target="_blank">
                                             <strong>{{ application.get_name() }}</strong>
@@ -33,8 +33,8 @@
                                         {% endif%}
                                     </p>
                                     <p class="app-row">
-                                        <span class="status text-error {% if account.is_revoked() is not empty %}hidden{% endif %}">{% trans "Not Allowed"%}</span>
-                                        <span class="status text-success {% if account.is_revoked() is empty %}hidden{% endif %}">{% trans "Allowed"%}</span>
+                                        <span class="status text-error {% if account.is_revoked() == false %}hidden{% endif %}">{% trans "Not Allowed"%}</span>
+                                        <span class="status text-success {% if account.is_revoked() == true %}hidden{% endif %}">{% trans "Allowed"%}</span>
                                     </p>
                                     <p class="app-row">{{ application.get_description()|truncate(120, true, "...") }}</p>
                                 </div>

templates/web/prod/actions/Property/index.html.twig

@@ -115,7 +115,14 @@
                     <tfoot>
                         {% if nbStories > 0 %}
                             <tr>
-                                <td colspan="6"><input type="checkbox" name="apply_to_children[{{ sbasId }}]"/></td>
+                                <td colspan="6">
+                                    <input type="checkbox" name="apply_to_children[{{ sbasId }}]"/>
+                                    {% if nbStories == 1 %}
+                                        {% trans %}Apply status on stories children. {% endtrans %}
+                                    {% elseif nbStories > 0 %}
+                                        {% trans %}Apply status on story children.{% endtrans %}
+                                    {% endif %}
+                                </td>
                             </tr>
                         {% endif %}
                     </tfoot>

templates/web/report/all_content.html.twig

@@ -1,7 +1,7 @@
 {% extends "common/index_bootstrap.html.twig" %}
 
 {% block stylesheet %}
-    <link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'skins/common/main.css,skins/report/jquery-ui.css,skins/report/jquery-ui-2.css,skins/report/report-table.css,skins/report/jquery.cluetip.css,include/jslibs/jquery.contextmenu.css' }) }}" media="screen" />
+    <link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'skins/common/main.css,skins/report/jquery-ui-theme/report-base/jquery-ui-1.10.3.custom.css,skins/report/jquery-ui-theme/report-detailed/jquery-ui-1.10.3.custom.css,skins/report/report-table.css,skins/report/jquery.cluetip.css,include/jslibs/jquery.contextmenu.css' }) }}" media="screen" />
     <link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'skins/report/print.css' }) }}" media="print" />
 {% endblock stylesheet %}
 

tests/Alchemy/Tests/Phrasea/Setup/InstallerTest.php

@@ -66,6 +66,11 @@ class InstallerTest extends \PHPUnit_Framework_TestCase
 
         $this->assertTrue($app['phraseanet.configuration']->isSetup());
         $this->assertTrue($app['phraseanet.configuration-tester']->isUpToDate());
+
+        $databoxes = $app['phraseanet.appbox']->get_databoxes();
+        $databox = array_pop($databoxes);
+        $this->assertContains('<path>'.realpath($dataPath).'/db_unitTests/subdefs</path>', $databox->get_structure());
+
         $conf = $app['phraseanet.configuration']->getConfig();
         $this->assertArrayHasKey('main', $conf);
         $this->assertArrayHasKey('key', $conf['main']);

tests/classes/databox/databox_fieldTest.php

@@ -348,6 +348,9 @@ class databox_fieldTest extends PhraseanetPHPUnitAbstract
 
         $this->object_mono->set_label($code, null)->save();
         $this->assertEquals($this->object_mono->get_name(), $this->object_mono->get_label($code));
+        
+        $this->object_mono->set_label($code, '')->save();
+        $this->assertEquals($this->object_mono->get_name(), $this->object_mono->get_label($code));
     }
 
     public function provideLanguageCodes()

www/scripts/apps/admin/fields/views/edit.js

@@ -84,7 +84,6 @@ define([
             return this;
         },
         events: {
-            "click": "focusAction",
             "click .delete-field": "deleteAction",
             "blur input#tbranch": "fieldChangedAction",
             "blur input#separator": "fieldChangedAction",
@@ -94,14 +93,6 @@ define([
             "change select": "selectionChangedAction",
             "click .lng-label a": "_toggleLabels"
         },
-        focusAction: function() {
-            var index = AdminFieldApp.fieldListView.collection.indexOf(this.model);
-            if (index >= 0) {
-                AdminFieldApp.fieldListView.itemViews[index].animate();
-            }
-
-            return this;
-        },
         selectionChangedAction: function(e) {
             var field = $(e.target);
             var data = {};

www/scripts/apps/admin/fields/views/list.js

@@ -27,6 +27,13 @@ define([
             // store all single rendered views
             this.itemViews = [];
 
+            // force base 1 indexed
+            if (this.collection.first().get("sorter") === 0) {
+                this.collection.each(function (model) {
+                    model.set({'sorter': model.get("sorter") + 1}, {silent: true});
+                });
+            }
+
             // rerender whenever there is a change on the collection
             this.collection.bind("reset", this.render, this);
             this.collection.bind("add", this.render, this);

www/skins/report/jquery-ui-2.css

@@ -1,286 +0,0 @@
-/*
-* jQuery UI CSS Framework
-* Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
-* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
-*/
-
-/* Layout helpers
-----------------------------------*/
-.answers .ui-helper-hidden { display: none; }
-.answers .ui-helper-hidden-accessible { position: absolute; left: -99999999px; }
-.answers .ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
-.answers .ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
-.answers .ui-helper-clearfix { display: inline-block; }
-/* required comment for clearfix to work in Opera \*/
-* html .answers .ui-helper-clearfix { height:1%; }
-.answers .ui-helper-clearfix { display:block; }
-/* end clearfix */
-.answers .ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
-
-
-/* Interaction Cues
-----------------------------------*/
-.answers .ui-state-disabled { cursor: default !important; }
-
-
-/* Icons
-----------------------------------*/
-
-/* states and images */
-.answers .ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; }
-
-
-/* Misc visuals
-----------------------------------*/
-
-/* Overlays */
-.answers .ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
-
-
-/*
-* jQuery UI CSS Framework
-* Copyright (c) 2010 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=bold&fsDefault=1.1em&cornerRadius=12px&bgColorHeader=f6f2f1&bgTextureHeader=01_flat.png&bgImgOpacityHeader=75&borderColorHeader=f6f2f1&fcHeader=222222&iconColorHeader=222222&bgColorContent=f6f2f1&bgTextureContent=01_flat.png&bgImgOpacityContent=75&borderColorContent=f6f2f1&fcContent=222222&iconColorContent=222222&bgColorDefault=d2d1cf&bgTextureDefault=01_flat.png&bgImgOpacityDefault=75&borderColorDefault=f6f2f1&fcDefault=9c9b99&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=02_glass.png&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ff9000&bgTextureActive=01_flat.png&bgImgOpacityActive=65&borderColorActive=f6f2f1&fcActive=ffffff&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=02_glass.png&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=05_inset_soft.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
-----------------------------------*/
-.answers .ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1.1em; }
-.answers .ui-widget .ui-widget { font-size: 1em; }
-.answers .ui-widget input, .answers .ui-widget select, .answers .ui-widget textarea, .answers .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; }
-.answers .ui-widget-content { border: 1px solid #f6f2f1; background: #f6f2f1 url(images2/ui-bg_flat_75_f6f2f1_40x100.png) 50% 50% repeat-x; color: #222222; }
-.answers .ui-widget-content a { color: #222222; }
-.answers .ui-widget-header { border: 1px solid #f6f2f1; background: #f6f2f1 url(images2/ui-bg_flat_75_f6f2f1_40x100.png) 50% 50% repeat-x; color: #222222; font-weight: bold; }
-.answers .ui-widget-header a { color: #222222; }
-
-/* Interaction states
-----------------------------------*/
-.answers .ui-state-default, .answers .ui-widget-content .ui-state-default, .answers .ui-widget-header .ui-state-default { border: 1px solid #f6f2f1; background: #d2d1cf url(images2/ui-bg_flat_75_d2d1cf_40x100.png) 50% 50% repeat-x; font-weight: bold; color: #9c9b99; }
-.answers .ui-state-default a, .answers .ui-state-default a:link, .answers .ui-state-default a:visited { color: #9c9b99; text-decoration: none; }
-.answers .ui-state-hover, .answers .ui-widget-content .ui-state-hover, .answers .ui-widget-header .ui-state-hover, .answers .ui-state-focus, .answers .ui-widget-content .ui-state-focus, .answers .ui-widget-header .ui-state-focus { border: 1px solid #999999; background: #dadada url(images2/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #212121; }
-.answers .ui-state-hover a, .answers .ui-state-hover a:hover { color: #212121; text-decoration: none; }
-.answers .ui-state-active, .answers .ui-widget-content .ui-state-active, .answers .ui-widget-header .ui-state-active { border: 1px solid #f6f2f1; background: #ff9000 url(images2/ui-bg_flat_65_ff9000_40x100.png) 50% 50% repeat-x; font-weight: bold; color: #ffffff; }
-.answers .ui-state-active a, .answers .ui-state-active a:link, .answers .ui-state-active a:visited { color: #ffffff; text-decoration: none; }
-.answers .ui-widget :active { outline: none; }
-
-/* Interaction Cues
-----------------------------------*/
-.answers .ui-state-highlight, .answers .ui-widget-content .ui-state-highlight, .answers .ui-widget-header .ui-state-highlight  {border: 1px solid #fcefa1; background: #fbf9ee url(images2/ui-bg_glass_55_fbf9ee_1x400.png) 50% 50% repeat-x; color: #363636; }
-.answers .ui-state-highlight a, .answers .ui-widget-content .ui-state-highlight a,.answers .ui-widget-header .ui-state-highlight a { color: #363636; }
-.answers .ui-state-error, .answers .ui-widget-content .ui-state-error, .answers .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #fef1ec url(images2/ui-bg_inset-soft_95_fef1ec_1x100.png) 50% bottom repeat-x; color: #cd0a0a; }
-.answers .ui-state-error a, .answers .ui-widget-content .ui-state-error a, .answers .ui-widget-header .ui-state-error a { color: #cd0a0a; }
-.answers .ui-state-error-text, .answers .ui-widget-content .ui-state-error-text, .answers .ui-widget-header .ui-state-error-text { color: #cd0a0a; }
-.answers .ui-priority-primary, .answers .ui-widget-content .ui-priority-primary, .answers .ui-widget-header .ui-priority-primary { font-weight: bold; }
-.answers .ui-priority-secondary, .answers .ui-widget-content .ui-priority-secondary,  .answers .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
-.answers .ui-state-disabled, .answers .ui-widget-content .ui-state-disabled, .answers .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
-
-/* Icons
-----------------------------------*/
-
-/* states and images2 */
-.answers .ui-icon { width: 16px; height: 16px; background-image: url(images2/ui-icons_222222_256x240.png); }
-.answers .ui-widget-content .ui-icon {background-image: url(images2/ui-icons_222222_256x240.png); }
-.answers .ui-widget-header .ui-icon {background-image: url(images2/ui-icons_222222_256x240.png); }
-.answers .ui-state-default .ui-icon { background-image: url(images2/ui-icons_888888_256x240.png); }
-.answers .ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images2/ui-icons_454545_256x240.png); }
-.answers .ui-state-active .ui-icon {background-image: url(images2/ui-icons_454545_256x240.png); }
-.answers .ui-state-highlight .ui-icon {background-image: url(images2/ui-icons_2e83ff_256x240.png); }
-.answers .ui-state-error .ui-icon,.answers  .ui-state-error-text .ui-icon {background-image: url(images2/ui-icons_cd0a0a_256x240.png); }
-
-/* positioning */
-.answers .ui-icon-carat-1-n { background-position: 0 0; }
-.answers .ui-icon-carat-1-ne { background-position: -16px 0; }
-.answers .ui-icon-carat-1-e { background-position: -32px 0; }
-.answers .ui-icon-carat-1-se { background-position: -48px 0; }
-.answers .ui-icon-carat-1-s { background-position: -64px 0; }
-.answers .ui-icon-carat-1-sw { background-position: -80px 0; }
-.answers .ui-icon-carat-1-w { background-position: -96px 0; }
-.answers .ui-icon-carat-1-nw { background-position: -112px 0; }
-.answers .ui-icon-carat-2-n-s { background-position: -128px 0; }
-.answers .ui-icon-carat-2-e-w { background-position: -144px 0; }
-.answers .ui-icon-triangle-1-n { background-position: 0 -16px; }
-.answers .ui-icon-triangle-1-ne { background-position: -16px -16px; }
-.answers  .ui-icon-triangle-1-e { background-position: -32px -16px; }
-.answers  .ui-icon-triangle-1-se { background-position: -48px -16px; }
-.answers  .ui-icon-triangle-1-s { background-position: -64px -16px; }
-.answers .ui-icon-triangle-1-sw { background-position: -80px -16px; }
-.answers .ui-icon-triangle-1-w { background-position: -96px -16px; }
-.answers .ui-icon-triangle-1-nw { background-position: -112px -16px; }
-.answers .ui-icon-triangle-2-n-s { background-position: -128px -16px; }
-.answers .ui-icon-triangle-2-e-w { background-position: -144px -16px; }
-.answers .ui-icon-arrow-1-n { background-position: 0 -32px; }
-.answers .ui-icon-arrow-1-ne { background-position: -16px -32px; }
-.answers .ui-icon-arrow-1-e { background-position: -32px -32px; }
-.answers .ui-icon-arrow-1-se { background-position: -48px -32px; }
-.answers .ui-icon-arrow-1-s { background-position: -64px -32px; }
-.answers .ui-icon-arrow-1-sw { background-position: -80px -32px; }
-.answers .ui-icon-arrow-1-w { background-position: -96px -32px; }
-.answers .ui-icon-arrow-1-nw { background-position: -112px -32px; }
-.answers .ui-icon-arrow-2-n-s { background-position: -128px -32px; }
-.answers .ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
-.answers .ui-icon-arrow-2-e-w { background-position: -160px -32px; }
-.answers .ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
-.answers .ui-icon-arrowstop-1-n { background-position: -192px -32px; }
-.answers .ui-icon-arrowstop-1-e { background-position: -208px -32px; }
-.answers .ui-icon-arrowstop-1-s { background-position: -224px -32px; }
-.answers .ui-icon-arrowstop-1-w { background-position: -240px -32px; }
-.answers .ui-icon-arrowthick-1-n { background-position: 0 -48px; }
-.answers .ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
-.answers .ui-icon-arrowthick-1-e { background-position: -32px -48px; }
-.answers .ui-icon-arrowthick-1-se { background-position: -48px -48px; }
-.answers .ui-icon-arrowthick-1-s { background-position: -64px -48px; }
-.answers .ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
-.answers .ui-icon-arrowthick-1-w { background-position: -96px -48px; }
-.answers .ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
-.answers .ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
-.answers .ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
-.answers .ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
-.answers .ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
-.answers .ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
-.answers .ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
-.answers .ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
-.answers .ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
-.answers .ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
-.answers .ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
-.answers .ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
-.answers .ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
-.answers .ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
-.answers .ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
-.answers .ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
-.answers .ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
-.answers .ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
-.answers .ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
-.answers .ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
-.answers .ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
-.answers .ui-icon-arrow-4 { background-position: 0 -80px; }
-.answers .ui-icon-arrow-4-diag { background-position: -16px -80px; }
-.answers .ui-icon-extlink { background-position: -32px -80px; }
-.answers .ui-icon-newwin { background-position: -48px -80px; }
-.answers .ui-icon-refresh { background-position: -64px -80px; }
-.answers .ui-icon-shuffle { background-position: -80px -80px; }
-.answers .ui-icon-transfer-e-w { background-position: -96px -80px; }
-.answers .ui-icon-transferthick-e-w { background-position: -112px -80px; }
-.answers .ui-icon-folder-collapsed { background-position: 0 -96px; }
-.answers .ui-icon-folder-open { background-position: -16px -96px; }
-.answers .ui-icon-document { background-position: -32px -96px; }
-.answers .ui-icon-document-b { background-position: -48px -96px; }
-.answers .ui-icon-note { background-position: -64px -96px; }
-.answers .ui-icon-mail-closed { background-position: -80px -96px; }
-.answers .ui-icon-mail-open { background-position: -96px -96px; }
-.answers .ui-icon-suitcase { background-position: -112px -96px; }
-.answers .ui-icon-comment { background-position: -128px -96px; }
-.answers .ui-icon-person { background-position: -144px -96px; }
-.answers .ui-icon-print { background-position: -160px -96px; }
-.answers .ui-icon-trash { background-position: -176px -96px; }
-.answers .ui-icon-locked { background-position: -192px -96px; }
-.answers .ui-icon-unlocked { background-position: -208px -96px; }
-.answers .ui-icon-bookmark { background-position: -224px -96px; }
-.answers .ui-icon-tag { background-position: -240px -96px; }
-.answers .ui-icon-home { background-position: 0 -112px; }
-.answers .ui-icon-flag { background-position: -16px -112px; }
-.answers .ui-icon-calendar { background-position: -32px -112px; }
-.answers .ui-icon-cart { background-position: -48px -112px; }
-.answers .ui-icon-pencil { background-position: -64px -112px; }
-.answers .ui-icon-clock { background-position: -80px -112px; }
-.answers .ui-icon-disk { background-position: -96px -112px; }
-.answers .ui-icon-calculator { background-position: -112px -112px; }
-.answers .ui-icon-zoomin { background-position: -128px -112px; }
-.answers .ui-icon-zoomout { background-position: -144px -112px; }
-.answers .ui-icon-search { background-position: -160px -112px; }
-.answers .ui-icon-wrench { background-position: -176px -112px; }
-.answers .ui-icon-gear { background-position: -192px -112px; }
-.answers .ui-icon-heart { background-position: -208px -112px; }
-.answers .ui-icon-star { background-position: -224px -112px; }
-.answers .ui-icon-link { background-position: -240px -112px; }
-.answers .ui-icon-cancel { background-position: 0 -128px; }
-.answers .ui-icon-plus { background-position: -16px -128px; }
-.answers .ui-icon-plusthick { background-position: -32px -128px; }
-.answers .ui-icon-minus { background-position: -48px -128px; }
-.answers .ui-icon-minusthick { background-position: -64px -128px; }
-.answers .ui-icon-close { background-position: -80px -128px; }
-.answers .ui-icon-closethick { background-position: -96px -128px; }
-.answers .ui-icon-key { background-position: -112px -128px; }
-.answers .ui-icon-lightbulb { background-position: -128px -128px; }
-.answers .ui-icon-scissors { background-position: -144px -128px; }
-.answers .ui-icon-clipboard { background-position: -160px -128px; }
-.answers .ui-icon-copy { background-position: -176px -128px; }
-.answers .ui-icon-contact { background-position: -192px -128px; }
-.answers .ui-icon-image { background-position: -208px -128px; }
-.answers .ui-icon-video { background-position: -224px -128px; }
-.answers .ui-icon-script { background-position: -240px -128px; }
-.answers .ui-icon-alert { background-position: 0 -144px; }
-.answers .ui-icon-info { background-position: -16px -144px; }
-.answers .ui-icon-notice { background-position: -32px -144px; }
-.answers .ui-icon-help { background-position: -48px -144px; }
-.answers .ui-icon-check { background-position: -64px -144px; }
-.answers .ui-icon-bullet { background-position: -80px -144px; }
-.answers .ui-icon-radio-off { background-position: -96px -144px; }
-.answers .ui-icon-radio-on { background-position: -112px -144px; }
-.answers .ui-icon-pin-w { background-position: -128px -144px; }
-.answers .ui-icon-pin-s { background-position: -144px -144px; }
-.answers .ui-icon-play { background-position: 0 -160px; }
-.answers .ui-icon-pause { background-position: -16px -160px; }
-.answers .ui-icon-seek-next { background-position: -32px -160px; }
-.answers .ui-icon-seek-prev { background-position: -48px -160px; }
-.answers .ui-icon-seek-end { background-position: -64px -160px; }
-.answers .ui-icon-seek-start { background-position: -80px -160px; }
-/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
-.answers .ui-icon-seek-first { background-position: -80px -160px; }
-.answers .ui-icon-stop { background-position: -96px -160px; }
-.answers .ui-icon-eject { background-position: -112px -160px; }
-.answers .ui-icon-volume-off { background-position: -128px -160px; }
-.answers .ui-icon-volume-on { background-position: -144px -160px; }
-.answers .ui-icon-power { background-position: 0 -176px; }
-.answers .ui-icon-signal-diag { background-position: -16px -176px; }
-.answers .ui-icon-signal { background-position: -32px -176px; }
-.answers .ui-icon-battery-0 { background-position: -48px -176px; }
-.answers .ui-icon-battery-1 { background-position: -64px -176px; }
-.answers .ui-icon-battery-2 { background-position: -80px -176px; }
-.answers .ui-icon-battery-3 { background-position: -96px -176px; }
-.answers .ui-icon-circle-plus { background-position: 0 -192px; }
-.answers .ui-icon-circle-minus { background-position: -16px -192px; }
-.answers .ui-icon-circle-close { background-position: -32px -192px; }
-.answers .ui-icon-circle-triangle-e { background-position: -48px -192px; }
-.answers .ui-icon-circle-triangle-s { background-position: -64px -192px; }
-.answers .ui-icon-circle-triangle-w { background-position: -80px -192px; }
-.answers .ui-icon-circle-triangle-n { background-position: -96px -192px; }
-.answers .ui-icon-circle-arrow-e { background-position: -112px -192px; }
-.answers .ui-icon-circle-arrow-s { background-position: -128px -192px; }
-.answers .ui-icon-circle-arrow-w { background-position: -144px -192px; }
-.answers .ui-icon-circle-arrow-n { background-position: -160px -192px; }
-.answers .ui-icon-circle-zoomin { background-position: -176px -192px; }
-.answers .ui-icon-circle-zoomout { background-position: -192px -192px; }
-.answers .ui-icon-circle-check { background-position: -208px -192px; }
-.answers .ui-icon-circlesmall-plus { background-position: 0 -208px; }
-.answers .ui-icon-circlesmall-minus { background-position: -16px -208px; }
-.answers .ui-icon-circlesmall-close { background-position: -32px -208px; }
-.answers .ui-icon-squaresmall-plus { background-position: -48px -208px; }
-.answers .ui-icon-squaresmall-minus { background-position: -64px -208px; }
-.answers .ui-icon-squaresmall-close { background-position: -80px -208px; }
-.answers .ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
-.answers .ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
-.answers .ui-icon-grip-solid-vertical { background-position: -32px -224px; }
-.answers .ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
-.answers .ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
-.answers .ui-icon-grip-diagonal-se { background-position: -80px -224px; }
-
-
-/* Misc visuals
-----------------------------------*/
-
-/* Corner radius */
-.answers .ui-corner-tl { -moz-border-radius-topleft: 12px; -webkit-border-top-left-radius: 12px; border-top-left-radius: 12px; }
-.answers .ui-corner-tr { -moz-border-radius-topright: 12px; -webkit-border-top-right-radius: 12px; border-top-right-radius: 12px; }
-.answers .ui-corner-bl { -moz-border-radius-bottomleft: 12px; -webkit-border-bottom-left-radius: 12px; border-bottom-left-radius: 12px; }
-.answers .ui-corner-br { -moz-border-radius-bottomright: 12px; -webkit-border-bottom-right-radius: 12px; border-bottom-right-radius: 12px; }
-.answers .ui-corner-top { -moz-border-radius-topleft: 12px; -webkit-border-top-left-radius: 12px; border-top-left-radius: 12px; -moz-border-radius-topright: 12px; -webkit-border-top-right-radius: 12px; border-top-right-radius: 12px; }
-.answers .ui-corner-bottom { -moz-border-radius-bottomleft: 12px; -webkit-border-bottom-left-radius: 12px; border-bottom-left-radius: 12px; -moz-border-radius-bottomright: 12px; -webkit-border-bottom-right-radius: 12px; border-bottom-right-radius: 12px; }
-.answers .ui-corner-right {  -moz-border-radius-topright: 12px; -webkit-border-top-right-radius: 12px; border-top-right-radius: 12px; -moz-border-radius-bottomright: 12px; -webkit-border-bottom-right-radius: 12px; border-bottom-right-radius: 12px; }
-.answers .ui-corner-left { -moz-border-radius-topleft: 12px; -webkit-border-top-left-radius: 12px; border-top-left-radius: 12px; -moz-border-radius-bottomleft: 12px; -webkit-border-bottom-left-radius: 12px; border-bottom-left-radius: 12px; }
-.answers .ui-corner-all { -moz-border-radius: 12px; -webkit-border-radius: 12px; border-radius: 12px; }
-
-/* Overlays */
-.answers .ui-widget-overlay { background: #aaaaaa url(images2/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); }
-.answers .ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images2/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; border-radius: 8px; }

www/skins/report/jquery-ui.css

@@ -1,443 +0,0 @@
-/*
-* jQuery UI CSS Framework
-* Copyright (c) 2010 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) 2010 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=bold&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=202020&bgTextureHeader=01_flat.png&bgImgOpacityHeader=75&borderColorHeader=202020&fcHeader=222222&iconColorHeader=222222&bgColorContent=555555&bgTextureContent=01_flat.png&bgImgOpacityContent=75&borderColorContent=202020&fcContent=ff9000&iconColorContent=222222&bgColorDefault=313131&bgTextureDefault=01_flat.png&bgImgOpacityDefault=75&borderColorDefault=202020&fcDefault=ffffff&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=02_glass.png&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=555555&bgTextureActive=01_flat.png&bgImgOpacityActive=65&borderColorActive=202020&fcActive=ff9000&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=02_glass.png&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=05_inset_soft.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 .ui-widget { font-size: 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 #202020; background: #555555 url(images/ui-bg_flat_75_555555_40x100.png) 50% 50% repeat-x; color: #ff9000; }
-.ui-widget-content a { color: #ff9000; }
-.ui-widget-header { border: 1px solid #202020; background: #ffffff url(images/ui-bg_flat_75_f6f2f1_40x100.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, .ui-widget-header .ui-state-default { border: 1px solid #202020; background: #313131 url(images/ui-bg_flat_75_313131_40x100.png) 50% 50% repeat-x; font-weight: bold; color: #ffffff; }
-.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #ffffff; text-decoration: none; }
-.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #999999; background: #dadada url(images/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #212121; }
-.ui-state-hover a, .ui-state-hover a:hover { color: #212121; text-decoration: none; }
-.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #202020; background: #555555 url(images/ui-bg_flat_65_555555_40x100.png) 50% 50% repeat-x; font-weight: bold; color: #ff9000; }
-.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #ff9000; text-decoration: none; }
-.ui-widget :active { outline: none; }
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .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,.ui-widget-header .ui-state-highlight a { color: #363636; }
-.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #fef1ec url(images/ui-bg_inset-soft_95_fef1ec_1x100.png) 50% bottom repeat-x; color: #cd0a0a; }
-.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #cd0a0a; }
-.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #cd0a0a; }
-.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
-.ui-priority-secondary, .ui-widget-content .ui-priority-secondary,  .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
-.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
-
-/* 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-start { background-position: -80px -160px; }
-/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
-.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; border-top-left-radius: 4px; }
-.ui-corner-tr { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; border-top-right-radius: 4px; }
-.ui-corner-bl { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; }
-.ui-corner-br { -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
-.ui-corner-top { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; border-top-left-radius: 4px; -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; border-top-right-radius: 4px; }
-.ui-corner-bottom { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
-.ui-corner-right {  -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; border-top-right-radius: 4px; -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
-.ui-corner-left { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; border-top-left-radius: 4px; -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; }
-.ui-corner-all { -moz-border-radius: 4px; -webkit-border-radius: 4px; 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; border-radius: 8px; }
-
-
-/* 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; }
-
-/* Datepicker
-----------------------------------*/
-.ui-datepicker { width: 17em; padding: .2em .2em 0; border:thin solid #212121; }
-.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0;color:#202020; }
-.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%; color:#FF900;}
-.ui-datepicker select.ui-datepicker-month,
-.ui-datepicker select.ui-datepicker-year { width: 49%; color:#FF900;}
-.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*/
-}/* 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; }
-/* Progressbar
-----------------------------------*/
-.ui-progressbar { height:2em; text-align: left; }
-.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }/* 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;}/* 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; }
-/* Multiselect
-----------------------------------*/
-
-.ui-multiselect { font-weight:normal !important; display:-moz-inline-block; display:inline-block; cursor:default; text-decoration:none !important; padding:0 }
-.ui-multiselect input { float:left; padding:3px 0 3px 0; margin:0; border:none !important /* important fixes bug when inside ui-widget-content */; cursor:default; background:transparent; color:#ff9000;}
-.ui-multiselect input:hover { float:left; padding:3px 0 3px 0; margin:0; border:none !important /* important fixes bug when inside ui-widget-content */; cursor:default; background:transparent; }
-.ui-multiselect span { float:right; margin-top:-18px; }
-
-.ui-multiselect-header { margin-bottom:3px; padding:3px 0 3px 6px }
-.ui-multiselect-header ul { font-size:0.9em }
-.ui-multiselect-header ul li { float:left; padding:0 10px 0 0 }
-.ui-multiselect-header a { text-decoration:none }
-.ui-multiselect-header a:hover { text-decoration:underline; }
-.ui-multiselect-header .ui-icon { float:left }
-.ui-multiselect-header li.ui-multiselect-close { float:right; text-align:right; padding-right:0 }
-
-.ui-multiselect-options { display:none; padding:3px; position:relative; z-index:10000 }
-.ui-multiselect-checkboxes { position:relative /* fixes bug in IE6/7 */; overflow-y:scroll }
-.ui-multiselect-checkboxes label { cursor:default; display:block; border:1px solid transparent; padding:3px }
-.ui-multiselect-checkboxes label input { position:relative; top:1px }
-.ui-multiselect-checkboxes li { clear:both; font-size:0.9em; padding-right:3px }
-.ui-multiselect-checkboxes li.ui-multiselect-optgroup-label { text-align:center; font-weight:bold; border-bottom:1px solid }
-.ui-multiselect-checkboxes li.ui-multiselect-optgroup-label a { display:block; padding:3px; margin:1px 0; text-decoration:none }
-
-/* remove label borders in IE6 because IE6 does not support transparency */
-* html .ui-multiselect-checkboxes label { border:none }
-
-/* shadow effect */
-.ui-multiselect-shadow { box-shadow:0 0 10px #777; -moz-box-shadow:0 0 10px #777; -webkit-box-shadow:0 0 10px #777; -ms-filter: "progid:DXImageTransform.Microsoft.Glow(color=#666666,strength=3) progid:DXImageTransform.Microsoft.Shadow(color=#777777,direction=135,strength=3)"; filter: progid:DXImageTransform.Microsoft.Glow(color=#666666,strength=3) progid:DXImageTransform.Microsoft.Shadow(color=#777777,direction=135,strength=3); }