Skip to content

Commit

Permalink
Dev: Dev: Tokens display, action buttons, add some space for other bu…
Browse files Browse the repository at this point in the history
…ttons to be at the same place
  • Loading branch information
LouisGac committed May 27, 2016
1 parent ead6829 commit 1621cb3
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 7 deletions.
11 changes: 5 additions & 6 deletions application/models/TokenDynamic.php
Expand Up @@ -719,8 +719,7 @@ public function getbuttons()
}
else
{
$button .= "<span class='blank_button'></span>";
// TODO: Add some space for other buttons to be at the same place
$button .= '<span class="btn btn-default btn-xs disabled blank_button" href="#"><span class="fa-fw fa" ></span></span>';
}

// Launch the survey with this token
Expand All @@ -730,7 +729,7 @@ public function getbuttons()
}
else
{
// TODO: Add some space for other buttons to be at the same place
$button .= '<span class="btn btn-default btn-xs disabled blank_button" href="#"><span class="fa-fw fa" ></span></span>';
}

// Invite or Remind
Expand All @@ -749,13 +748,13 @@ public function getbuttons()
}
else
{
//TODO: Add some space for other buttons to be at the same place
$button .= '<span class="btn btn-default btn-xs disabled blank_button" href="#"><span class="fa-fw fa" ></span></span>';
}

}
else
{
// TODO: Add some space for other buttons to be at the same place
$button .= '<span class="btn btn-default btn-xs disabled blank_button" href="#"><span class="fa-fw fa" ></span></span>';
}

// TODO: permission check
Expand All @@ -769,7 +768,7 @@ public function getbuttons()
}
else
{
// TODO: Add some space for other buttons to be at the same place
$button .= '<span class="btn btn-default btn-xs disabled blank_button" href="#"><span class="fa-fw fa" ></span></span>';
}
return $button;
}
Expand Down
21 changes: 20 additions & 1 deletion styles/Sea_Green/css/lime-admin-common.css
Expand Up @@ -1934,9 +1934,28 @@ h3,.h3 {
}

#token-grid table thead tr #action {
min-width: 115px;
min-width: 160px;
}

#token-grid table thead tr th {
white-space: nowrap;
}

#token-grid table tr.odd .blank_button
{
border-color: #f9f9f9;
background-color: #f9f9f9;
}

#token-grid table tr .blank_button
{
border-color: white;
background-color: white;
}

#token-grid table tr.selected .blank_button
{

border-color: #eee; /* from yiistrap.css*/
background-color: #eee;
}

0 comments on commit 1621cb3

Please sign in to comment.