Skip to content

Added handles to move rows instead of whole rows #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Andreyco wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Added handles to move rows instead of whole rows #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0394585
Added empty 'temp' directory
Andreyco Nov 30, 2013
482dcac
Added missing 'position' column
Andreyco Nov 30, 2013
7625beb
Added handles to move rows instead of whole rows
Andreyco Nov 30, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
.idea/*
.DS_Store
/app/config/config.live.neon
/app/config/config.live.neon
/temp/*
!.gitkeep
21 changes: 13 additions & 8 deletions app/templates/Code/default.latte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{block content}
<div class="row-fluid">
<div class="span2 parser">
<div class="row-fluid">
<div class="span2 parser">
<div class="span12">
{control parser}
</div>
</div>
<div class="span10">
</div>
<div class="span10">
<div class="row-fluid text-center">
<div class="btn-group" style="padding-bottom: 6px;">
<a href="{link addNewPool!}" class="ajax edit btn btn-success btn-small"><i class="icon-plus"></i> Add new pool</a>
Expand All @@ -31,12 +31,14 @@
{if $pool->tasks}
{foreach $pool->tasks as $task}
<div class="item" data-task-id="{$task->id}">
<span class="move"><i class="icon-reorder"></i></span>
{if $pool->isDone == 1}
<input class="check change leftbtn" checked="checked" type="checkbox" data-pool-id="{$active->id}">
{else}
<input class="check change leftbtn" type="checkbox" data-pool-id="{$done->id}">
{/if}
{$task->text}

<a href="#" class="delete change rightbtn" data-pool-id="{$deleted->id}"><i class="icon-trash"></i></a>
</div>
{/foreach}
Expand All @@ -62,7 +64,7 @@
<div class="span6">
<ul class="nav nav-tabs" id="right-tab">
{foreach $userPools as $pool}
<li class="poolHolder{$pool->id}"><a href="#{$pool->webalized_name}" class="poolName{$pool->id}">{$pool->name}</a></li>
<li class="poolHolder{$pool->id}"><a href="#{$pool->webalized_name}" class="poolName{$pool->id}">{$pool->name}{$pool->position}</a></li>
{/foreach}
</ul>

Expand All @@ -81,6 +83,7 @@
<input class="check change leftbtn" type="checkbox" data-pool-id="{$done->id}">
{/if}
{$task->text}
<span class="move"><i class="icon-reorder"></i></span>
<a href="#" class="delete change rightbtn" data-pool-id="{$deleted->id}"><i class="icon-trash"></i></a>
</div>
{/foreach}
Expand Down Expand Up @@ -109,7 +112,7 @@
<ul class="unstyled sortablePools row-fluid">
{foreach $userPools as $pool}
<li class="row-fluid modal-item poolHolder{$pool->id}" data-name="{$pool->name}" data-pool-id="{$pool->id}">
<span class="span1 order hidden-phone">
<span class="move span1 order hidden-phone">
<i class="icon-reorder"></i>
</span>
<span class="span9 text poolName{$pool->id}">
Expand Down Expand Up @@ -144,8 +147,8 @@
{/if}
</div>
{/snippet}
</div>
</div>
</div>
</div>
{snippet script}
<script type="text/javascript" n:syntax="double">
var isDragging = false;
Expand Down Expand Up @@ -253,6 +256,7 @@
function activeSortable()
{
$( '.sortable' ).sortable({
handle: 'span.move',
connectWith: '.sortable',
start: function(){
isDragging = true;
Expand All @@ -264,6 +268,7 @@
}).disableSelection();

$( '.sortablePools' ).sortable({
handle: 'span.move',
connectWith: '.sortablePools',
start: function(){
isDragging = true;
Expand Down
1 change: 1 addition & 0 deletions db/pastenotes_2013-05-31.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ CREATE TABLE `pools` (
`isDeleted` tinyint(4) DEFAULT '0',
`isDone` tinyint(4) DEFAULT '0',
`isActive` tinyint(4) DEFAULT '0',
`position` INT UNSIGNED NULL,
PRIMARY KEY (`id`),
KEY `note_id` (`note_id`),
CONSTRAINT `pools_ibfk_1` FOREIGN KEY (`note_id`) REFERENCES `notes` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
Expand Down
Empty file added temp/.gitkeep
View file
Open in desktop
Empty file.
60 changes: 32 additions & 28 deletions www/css/screen.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,48 +1,48 @@
body {
font-size: 15px;
line-height: 1.6;
color: #333;
background: white;
font-size: 15px;
line-height: 1.6;
color: #333;
background: white;
}

h1 {
color: #3484D2;
color: #3484D2;
}

#ajax-spinner {
margin: 15px 0 0 15px;
padding: 13px;
background: white url('../images/spinner.gif') no-repeat 50% 50%;
font-size: 0;
z-index: 123456;
display: none;
margin: 15px 0 0 15px;
padding: 13px;
background: white url('../images/spinner.gif') no-repeat 50% 50%;
font-size: 0;
z-index: 123456;
display: none;
}

div.flash {
color: black;
background: #FFF9D7;
border: 1px solid #E2C822;
padding: 1em;
margin: 1em 0;
color: black;
background: #FFF9D7;
border: 1px solid #E2C822;
padding: 1em;
margin: 1em 0;
}

a[href^="error:"] {
background: red;
color: white;
background: red;
color: white;
}

form tr, form td {
vertical-align: top;
font-weight: normal;
vertical-align: top;
font-weight: normal;
}

form .required label {
font-weight: bold;
font-weight: bold;
}

form .error {
color: #D00;
font-weight: bold;
color: #D00;
font-weight: bold;
}


Expand Down Expand Up @@ -143,9 +143,13 @@ input[type="checkbox"] {
display: block;
font-size: 13px;
font-weight: 600;
padding: 7px 25px;
padding: 7px 25px 7px 50px;
position: relative;
font-weight: normal;
}
.item .move {
position: absolute;
left: 0;
cursor: move;
}
.modal-item {
Expand All @@ -156,22 +160,22 @@ input[type="checkbox"] {
font-weight: 600;
position: relative;
font-weight: normal;
cursor: move;
padding-top: 10px;
}
.modal-item .move {
cursor: move;
}

.item:first-child, .modal-item:first-child {
border-top: 0 none;
}

.icon-reorder {
color: #D9E4EE;
font-size: 18px;
margin-right: 13px;
}

.leftbtn {
left: 0px;
left: 20px;
position: absolute;
top: 7px;
}
Expand Down