Skip to content

Commit

Permalink
New design using Bootstrap
Browse files Browse the repository at this point in the history
  • Loading branch information
iamluc committed Nov 7, 2012
1 parent 9b4ef72 commit 6ee69cd
Show file tree
Hide file tree
Showing 65 changed files with 34,555 additions and 1,803 deletions.
15 changes: 12 additions & 3 deletions Crud/Crud.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ class Crud

protected $_route;

protected $_title;

public function __construct(
$request, $router, $doctrine, $templating, $translator, $session,
$datagridService, $form, $entity, $entityType = null, $config = array())
Expand Down Expand Up @@ -117,8 +119,15 @@ public function getView()
}
}

public function getTitle()
{
return $this->_title;
}

public function setTitle($title)
{
$this->_title = $title;

if (!is_null($this->getDatagrid())) {
$this->getDatagrid()->setTitle($title);
}
Expand Down Expand Up @@ -197,13 +206,13 @@ protected function prepareListView()
));

if ($this->getConfig('canAdd')) {
$this->_datagrid->addAction(new Action($this->trans('Add'), $this->_request->get('_route'), array_merge($this->getConfig('addToURL'), array($this->getConfig('viewVar') => 'add')), null, 'bundles/gloomypager/images/add.png'), 'add', 'toolbar');
$this->_datagrid->addAction(new Action($this->trans('Add'), $this->_request->get('_route'), array_merge($this->getConfig('addToURL'), array($this->getConfig('viewVar') => 'add')), null, '#icon-plus'), 'add', 'toolbar');
}
if ($this->getConfig('canEdit')) {
$this->_datagrid->addAction(new Action($this->trans('Edit'), $this->_request->get('_route'), array_merge($this->getConfig('addToURL'), array($this->getConfig('viewVar') => 'edit')), null, 'bundles/gloomypager/images/edit.png'), 'edit');
$this->_datagrid->addAction(new Action($this->trans('Edit'), $this->_request->get('_route'), array_merge($this->getConfig('addToURL'), array($this->getConfig('viewVar') => 'edit')), null, '#icon-pencil'), 'edit');
}
if ($this->getConfig('canDelete')) {
$this->_datagrid->addAction(new Action($this->trans('Delete'), $this->_request->get('_route'), array_merge($this->getConfig('addToURL'), array($this->getConfig('viewVar') => 'delete')), $this->trans('Confirm delete ?'), 'bundles/gloomypager/images/delete.png'), 'delete');
$this->_datagrid->addAction(new Action($this->trans('Delete'), $this->_request->get('_route'), array_merge($this->getConfig('addToURL'), array($this->getConfig('viewVar') => 'delete')), $this->trans('Confirm delete ?'), '#icon-remove'), 'delete');
}

if ($this->_session->hasFlash('crud_success')) {
Expand Down
2 changes: 1 addition & 1 deletion DataGrid/Action.php
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,4 @@ public function getImage()
{
return $this->_image;
}
}
}
49 changes: 49 additions & 0 deletions Resources/public/css/gloomy-filters.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
.gloomy-filters {
width: 100%;
display: inline;
border: 1px solid #C9C9C9;

height: 30px !important;
margin: 0 !important;

-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
}

.gloomy-filters.textFilter {
border: 1px solid #FF9A07;
}

.gloomy-filters.notNullFilter {
border: 1px solid red;
}

.gloomy-filtersContainer {
display: none;
background-image: url( ../img/transparent.gif ); /* Transparent image to prevent IE from launching "onmouseout" */
position: absolute;
padding: 0px 10px 160px 10px; /* Large padding-bottom to block mouseout */
text-align: center;
}

.gloomy-filtersOptions {
padding: 10px;
margin: 0px;
position: relative;
background-color: white;
border: 1px solid #DDDDDD;
-webkit-border-radius: 0px 0px 20px 20px;
-moz-border-radius: 0px 0px 20px 20px;
border-radius: 0px 0px 20px 20px;

/* opacity: 0.8; */
/* filter: alpha(opacity=80); */
/* -ms-filter: "alpha(opacity=80)"; */
}

.gloomy-clearFilters {
position: relative;
left: -23px;
top: 1px;
}
163 changes: 0 additions & 163 deletions Resources/public/css/gloomy-pager.css

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed Resources/public/images/add.png
Binary file not shown.
Binary file removed Resources/public/images/clear_input.png
Binary file not shown.
Binary file removed Resources/public/images/date.png
Binary file not shown.
Binary file removed Resources/public/images/delete.png
Binary file not shown.
Binary file removed Resources/public/images/edit.png
Binary file not shown.
Binary file removed Resources/public/images/loading.gif
Binary file not shown.
Binary file removed Resources/public/images/refresh.png
Binary file not shown.
Binary file removed Resources/public/images/sort-asc.png
Binary file not shown.
Binary file removed Resources/public/images/sort-desc.png
Binary file not shown.
File renamed without changes
Loading

0 comments on commit 6ee69cd

Please sign in to comment.