Author: Jonathan.Wage
Date: 2010-01-14 05:00:12 +0100 (Thu, 14 Jan 2010)
New Revision: 26606
Modified:
plugins/sfSympalPlugin/trunk/config/app.yml
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/lib/form/doctrine/PluginsfSympalMenuItemForm.class.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/lib/menu/sfSympalMenuSite.class.php
plugins/sfSympalPlugin/trunk/lib/util/sfSympalFormToolkit.class.php
plugins/sfSympalPlugin/trunk/web/css/default.css
plugins/sfSympalPlugin/trunk/web/css/sympal.css
plugins/sfSympalPlugin/trunk/web/css/wordpress.css
Log:
[1.4][sfSympalPlugin][1.0] Fixing breadcrumbs generation
Modified: plugins/sfSympalPlugin/trunk/config/app.yml
===================================================================
--- plugins/sfSympalPlugin/trunk/config/app.yml 2010-01-14 03:29:32 UTC (rev
26605)
+++ plugins/sfSympalPlugin/trunk/config/app.yml 2010-01-14 04:00:12 UTC (rev
26606)
@@ -1,5 +1,7 @@
all:
sympal_config:
+ # Configure the modules which are Sympal admin modules. This allows us to
+ # automatically load the admin theme for these modules.
admin_modules:
- sympal_admin
- sympal_config
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/lib/form/doctrine/PluginsfSympalMenuItemForm.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/lib/form/doctrine/PluginsfSympalMenuItemForm.class.php
2010-01-14 03:29:32 UTC (rev 26605)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/lib/form/doctrine/PluginsfSympalMenuItemForm.class.php
2010-01-14 04:00:12 UTC (rev 26606)
@@ -30,6 +30,8 @@
$q->leftJoin('m.Translation mt');
}
+ $q->andWhere('m.site_id = ?',
sfSympalContext::getInstance()->getSite()->getId());
+
$this->widgetSchema['parent_id'] = new sfWidgetFormDoctrineChoice(array(
'model' => 'sfSympalMenuItem',
'add_empty' => '~ (object is at root level)',
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/lib/menu/sfSympalMenuSite.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/lib/menu/sfSympalMenuSite.class.php
2010-01-14 03:29:32 UTC (rev 26605)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/lib/menu/sfSympalMenuSite.class.php
2010-01-14 04:00:12 UTC (rev 26606)
@@ -40,6 +40,10 @@
if ($subItem)
{
+ if ($subItem instanceof sfSympalContent && $this->_menuItem->_content_id
== $subItem->id)
+ {
+ $subItem = array();
+ }
if (!is_array($subItem))
{
$subItem = array((string) $subItem => null);
Modified: plugins/sfSympalPlugin/trunk/lib/util/sfSympalFormToolkit.class.php
===================================================================
--- plugins/sfSympalPlugin/trunk/lib/util/sfSympalFormToolkit.class.php
2010-01-14 03:29:32 UTC (rev 26605)
+++ plugins/sfSympalPlugin/trunk/lib/util/sfSympalFormToolkit.class.php
2010-01-14 04:00:12 UTC (rev 26606)
@@ -25,6 +25,7 @@
->createQuery('c')
->leftJoin('c.Type t')
->leftJoin('c.MenuItem m')
+ ->where('c.site_id = ?',
sfSympalContext::getInstance()->getSite()->getId())
->orderBy('m.root_id, m.lft');
$widgetSchema = $form->getWidgetSchema();
$widgetSchema['content_id']->setOption('query', $q);
Modified: plugins/sfSympalPlugin/trunk/web/css/default.css
===================================================================
--- plugins/sfSympalPlugin/trunk/web/css/default.css 2010-01-14 03:29:32 UTC
(rev 26605)
+++ plugins/sfSympalPlugin/trunk/web/css/default.css 2010-01-14 04:00:12 UTC
(rev 26606)
@@ -113,36 +113,39 @@
padding-left: 10px;
}
-#sympal_breadcrumbs li a
-{
- height: 30px;
- display: block;
- background-image: url('../images/bc_separator.png');
- background-repeat: no-repeat;
- background-position: right;
- padding-right: 15px;
- text-decoration: none;
- color: #454545;
-}
-
#sympal_breadcrumbs li a:hover
{
color: #35acc5;
}
-#sympal_breadcrumbs li#breadcrumbs-home
+#sympal_breadcrumbs li.first
{
background: url('../images/home.png') no-repeat;
background-position: center;
+ text-indent: -9999;
+ font-size: 0;
+ width: 30px;
}
-#sympal_breadcrumbs li#breadcrumbs-home a
+#sympal_breadcrumbs li.first a
{
text-indent: -9999;
font-size: 0;
width: 20px;
}
+#sympal_breadcrumbs li a
+{
+ height: 30px;
+ display: block;
+ background-image: url('../images/bc_separator.png');
+ background-repeat: no-repeat;
+ background-position: right;
+ padding-right: 15px;
+ text-decoration: none;
+ color: #454545;
+}
+
label.required:after
{
content:'*';
Modified: plugins/sfSympalPlugin/trunk/web/css/sympal.css
===================================================================
--- plugins/sfSympalPlugin/trunk/web/css/sympal.css 2010-01-14 03:29:32 UTC
(rev 26605)
+++ plugins/sfSympalPlugin/trunk/web/css/sympal.css 2010-01-14 04:00:12 UTC
(rev 26606)
@@ -384,12 +384,6 @@
border: none;
}
-#sympal_breadcrumbs
-{
- margin-bottom: 20px;
- margin-right: -5px;
-}
-
#sympal_breadcrumbs ul
{
font: 11px Arial, Helvetica, sans-serif;
@@ -412,36 +406,39 @@
padding-left: 10px;
}
-#sympal_breadcrumbs li a
-{
- height: 30px;
- display: block;
- background-image: url('../images/bc_separator.png');
- background-repeat: no-repeat;
- background-position: right;
- padding-right: 15px;
- text-decoration: none;
- color: #454545;
-}
-
#sympal_breadcrumbs li a:hover
{
color: #35acc5;
}
-#sympal_breadcrumbs li#breadcrumbs-home
+#sympal_breadcrumbs li.first
{
background: url('../images/home.png') no-repeat;
background-position: center;
+ text-indent: -9999;
+ font-size: 0;
+ width: 30px;
}
-#sympal_breadcrumbs li#breadcrumbs-home a
+#sympal_breadcrumbs li.first a
{
text-indent: -9999;
font-size: 0;
width: 20px;
}
+#sympal_breadcrumbs li a
+{
+ height: 30px;
+ display: block;
+ background-image: url('../images/bc_separator.png');
+ background-repeat: no-repeat;
+ background-position: right;
+ padding-right: 15px;
+ text-decoration: none;
+ color: #454545;
+}
+
ul.error_list
{
margin: 0;
Modified: plugins/sfSympalPlugin/trunk/web/css/wordpress.css
===================================================================
--- plugins/sfSympalPlugin/trunk/web/css/wordpress.css 2010-01-14 03:29:32 UTC
(rev 26605)
+++ plugins/sfSympalPlugin/trunk/web/css/wordpress.css 2010-01-14 04:00:12 UTC
(rev 26606)
@@ -166,36 +166,39 @@
padding-left: 10px;
}
-#sympal_breadcrumbs li a
-{
- height: 30px;
- display: block;
- background-image: url('../images/bc_separator.png');
- background-repeat: no-repeat;
- background-position: right;
- padding-right: 15px;
- text-decoration: none;
- color: #454545;
-}
-
#sympal_breadcrumbs li a:hover
{
color: #35acc5;
}
-#sympal_breadcrumbs li#breadcrumbs-home
+#sympal_breadcrumbs li.first
{
background: url('../images/home.png') no-repeat;
background-position: center;
+ text-indent: -9999;
+ font-size: 0;
+ width: 30px;
}
-#sympal_breadcrumbs li#breadcrumbs-home a
+#sympal_breadcrumbs li.first a
{
text-indent: -9999;
font-size: 0;
width: 20px;
}
+#sympal_breadcrumbs li a
+{
+ height: 30px;
+ display: block;
+ background-image: url('../images/bc_separator.png');
+ background-repeat: no-repeat;
+ background-position: right;
+ padding-right: 15px;
+ text-decoration: none;
+ color: #454545;
+}
+
label.required:after
{
content:'*';
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/symfony-svn?hl=en.
