Skip to content

Commit

Permalink
Merge branch '31-shortcodes'
Browse files Browse the repository at this point in the history
  • Loading branch information
phpfunk committed Jan 8, 2014
2 parents bcfb923 + 4bb2a10 commit 1b4cb78
Show file tree
Hide file tree
Showing 13 changed files with 185 additions and 185 deletions.
2 changes: 1 addition & 1 deletion application/errors/error_db.php
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<ol>
<li>Rename <i>application/config/database-sample.php</i> to <i>application/config/database.php</i></li>
<li>Edit the hostname, username, password, and database name in database.php</li>
<li><a href="<?=site_url();?>install">Try again</a></li>
<li><a href="<?php echo site_url(); ?>install">Try again</a></li>
</ol>
</div>
</body>
Expand Down
8 changes: 4 additions & 4 deletions application/views/addedpop.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
<div class="row-fluid">
<div class="span4">
<h2>Your mark has been saved!</h2>
<h3><a href="<?=$url;?>"><?php if ($title != '' || strlen($title) > 0) { echo $title; } else { echo 'Untitled'; } ?></a></h3>
<p><small><?=$url?></small></p>
<h3><a href="<?php echo $url;?>"><?php if ($title != '' || strlen($title) > 0) { echo $title; } else { echo 'Untitled'; } ?></a></h3>
<p><small><?php echo $url?></small></p>
<p><a href="javascript:window.close();" class="btn btn-success">Save and close</a></p>
<hr />
<h3>Label your mark</h3>
<p><a href="#" class="btn addlabel" title="Read Later">Read Later</a> <a href="#" class="btn addlabel" title="Video">Video</a> <a href="#" class="btn addlabel" title="Recipe">Recipe</a></p>
<p><a href="#" class="btn addlabel" title="Shopping">Shopping</a> <a href="#" class="btn addlabel" title="Inspiration">Inspiration</a></p>
<p><a href="#" class="btn addlabel" title="Documentation">Documentation</a> <a href="#" class="btn addlabel" title="Research">Research</a></p>
<p><a href="#" class="btn addlabel" title=""><i class="icon-ban-circle"></i> Clear labels</a></p>
<input type="hidden" id="urlid" name="urlid" value="<?=$urlid;?>" />

<input type="hidden" id="urlid" name="urlid" value="<?php echo $urlid;?>" />
</div>

</div>
Expand Down
30 changes: 15 additions & 15 deletions application/views/editpop.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="row-fluid">
<div class="span8">
<h2><?php if (isset($markadded)) { echo 'Your link was added!'; } else { echo 'Edit your link'; } ?></h2>
<h3><a href="<?=$url;?>"><?php if ($title != '' || strlen($title) > 0) { echo $title; } else { echo 'Untitled'; }?></a></h3>
<h3><a href="<?php echo $url;?>"><?php if ($title != '' || strlen($title) > 0) { echo $title; } else { echo 'Untitled'; }?></a></h3>
<p><small>
<?php if (strlen($url) > 90) {
echo substr(str_replace('http://','',$url),0,50).'';
Expand All @@ -12,29 +12,29 @@
} ?>
</small></p>
<?php if ($addedby == $this->session->userdata('userid')) { ?>
<textarea id="note" cols="10" rows="3" placeholder="Write a small note. Perhaps a reminder of why you're saving this."><?=$note;?></textarea>
<textarea id="note" cols="10" rows="3" placeholder="Write a small note. Perhaps a reminder of why you're saving this."><?php echo $note;?></textarea>
<?php } ?>
<p><a href="<?php if (isset($markadded)) { echo 'javascript:window.close();'; } else { echo '/home'; } ?>" class="btn btn-primary">Save and close</a> <a href="/marks/delete/<?=$urlid;?>" class="btn btn-danger">Delete</a></p>
<p><a href="<?php if (isset($markadded)) { echo 'javascript:window.close();'; } else { echo '/home'; } ?>" class="btn btn-primary">Save and close</a> <a href="/marks/delete/<?php echo $urlid;?>" class="btn btn-danger">Delete</a></p>
<hr />

<div class="row-fluid">
<div class="span5">
<!--<h3><?php if (isset($labeladded) && isset($markadded)) { echo 'Smart Labeled. Change it?'; } elseif (isset($labeladded) && !isset($markadded)) { echo 'Edit your label'; } else { echo 'Label your mark'; } ?></h3> -->
<h3>Actions</h3>
<p><a href="#" class="btn addlabel<?php if ($tags == 'read') { echo ' btn-success'; } ?>" title="Read">Read</a> <a href="#" class="btn addlabel<?php if ($tags == 'watch') { echo ' btn-success'; } ?>" title="Watch">Watch</a> <a href="#" class="btn addlabel<?php if ($tags == 'listen') { echo ' btn-success'; } ?>" title="Listen">Listen</a></p>
<p><a href="#" class="btn addlabel<?php if ($tags == 'buy') { echo ' btn-success'; }?>" title="Buy">Buy</a> <a href="#" class="btn addlabel<?php if ($tags == 'eatdrink') { echo ' btn-success'; }?>" title="Eatdrink">Eat & Drink</a> <a href="#" class="btn addlabel<?php if ($tags == 'do') { echo ' btn-success'; } ?>" title="Do">Do</a></p>

<p><?php if (isset($userlabeladded)) { ?>
<a href="#" id="clearlabelbutton" class="btn addlabel<?php if ($tags == '') { echo ' disabled'; } ?>" title=""><i class="icon-ban-circle"></i> Unlabeled</a> <a href="#" id="smartlabelbutton" class="btn btn-danger">Stop using Smart Label?</a>

<?php } elseif (isset($labeladded) && !isset($userlabeladded)) { ?>
<!-- No smart label button because it matched the default smart label list -->
<a href="#" id="clearlabelbutton" class="btn addlabel" title=""><i class="icon-ban-circle"></i> Unlabeled</a>

<?php } elseif (!isset($markadded) && $tags != '') { ?>
<a href="#" id="clearlabelbutton" class="btn addlabel" title=""><i class="icon-ban-circle"></i> Unlabeled</a>
<a href="#" id="smartlabelbutton" class="btn">Add Smart Label?</a>

<?php } else { ?>
<a href="#" id="clearlabelbutton" class="btn addlabel disabled" title=""><i class="icon-ban-circle"></i> Unlabeled</a>
<a href="#" id="smartlabelbutton" class="btn disabled">Add Smart Label?</a>
Expand All @@ -43,22 +43,22 @@
<p><span id="smartlabelmessage"></span></p>
</div>
<div span="span3">

<h3>Groups</h3>
<?php if (isset($groups['belong'])) { ?>
<p><?php foreach($groups['belong'] as $gb) { ?>
<a href="#" class="btn addgroup<?php if ($groupid == $gb['id']) { echo ' btn-success'; } ?>" title="<?=$gb['name'];?>" data-group="<?=$gb['id'];?>"><?=$gb['name'];?></a>
<a href="#" class="btn addgroup<?php if ($groupid == $gb['id']) { echo ' btn-success'; } ?>" title="<?php echo $gb['name'];?>" data-group="<?php echo $gb['id'];?>"><?php echo $gb['name'];?></a>
<?php } ?>
</p> <?php } ?>
<p><a href="/groups/create" title="Create a new group" class="btn">Create a group +</a></p>
</div>
</div>
<input type="hidden" id="urlid" name="urlid" value="<?=$urlid;?>" />
<input type="hidden" id="domain" name="domain" value="<?=$urldomain;?>" />
<input type="hidden" id="label" name="label" value="<?=$tags;?>" />
<input type="hidden" id="group" name="group" value="<?=$groupid;?>" />

<input type="hidden" id="urlid" name="urlid" value="<?php echo $urlid;?>" />
<input type="hidden" id="domain" name="domain" value="<?php echo $urldomain;?>" />
<input type="hidden" id="label" name="label" value="<?php echo $tags;?>" />
<input type="hidden" id="group" name="group" value="<?php echo $groupid;?>" />

</div>

</div>
Expand Down
18 changes: 9 additions & 9 deletions application/views/groups_create.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@
<div class="row-fluid">
<div class="span7">
<h2>Create a group</h2>

<?php if ($this->session->flashdata('message')) { ?>
<div class="alert alert-success">
<a class="close" data-dismiss="alert">×</a>
<?=$this->session->flashdata('message');?>
<?php echo $this->session->flashdata('message');?>
</div>
<?php } ?>

<div class="row-fluid">
<p>Groups can be used to share links with groups of people; family, friends, coworkers. Create a group, invite some people, share some links.</p>
<form id="create_group" method="post" action="/groups/add">
<div class="span3">
<p><input type="text" size="60" class="input-large" id="name" name="name" placeholder="Name your group" /></p>
<p><textarea id="description" name="description" class="input-large" cols="100" rows="8" placeholder="What is the purpose of your group? (optional)"></textarea><br /><small><strong>Examples:</strong><br />Sharing links for our upcoming vacation.<br />Links my coworkers need.</small></p>
<?=form_submit('btn_add_group','Create this group','class="btn-primary"');?>
<?php echo form_submit('btn_add_group','Create this group','class="btn-primary"');?>
</div>
<div class="span3">
<p><input type="text" size="60" class="input-large" id="invite1" name="invite1" value="" placeholder="[email protected]" /></p>
Expand All @@ -27,17 +27,17 @@
<p><input type="text" size="60" class="input-large" id="invite5" name="invite5" value="" /></p>
<p><small>Everyone invited to this group will receive an email asking them to join Nilai (if they don't have an account already) so that they can be part of the group.</small></p>
</div>
<input type="hidden" id="uid" name="uid" value="<?=$uid;?>" />
<input type="hidden" id="uid" name="uid" value="<?php echo $uid;?>" />
</form>
</div>

</div>

<div class="well span3">

<a href="/home">Back to your marks</a>
</div>

</div>

<?php $this->load->view('footer'); ?>
32 changes: 16 additions & 16 deletions application/views/groups_edit.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,41 +3,41 @@
<div class="row-fluid">
<div class="span7">
<h2>Edit your group</h2>

<?php if ($this->session->flashdata('message')) { ?>
<div class="alert alert-success">
<a class="close" data-dismiss="alert">×</a>
<?=$this->session->flashdata('message');?>
<?php echo $this->session->flashdata('message');?>
</div>
<?php } ?>

<div class="row-fluid">
<p>The name and description of your group can be edited.</p>
<form id="edit_group" method="post" action="/groups/update">
<div class="span3">
<p><input type="text" size="60" class="input-large" id="name" name="name" value="<?=$group['name'];?>" /></p>
<p><textarea id="description" name="description" class="input-large" cols="100" rows="8"><?=$group['description'];?></textarea><br /></p>
<?=form_submit('btn_update_group','Update','class="btn-primary"');?>
<input type="hidden" id="uid" name="uid" value="<?=$group['groupuid'];?>" />
<p><input type="text" size="60" class="input-large" id="name" name="name" value="<?php echo $group['name'];?>" /></p>
<p><textarea id="description" name="description" class="input-large" cols="100" rows="8"><?php echo $group['description'];?></textarea><br /></p>
<?php echo form_submit('btn_update_group','Update','class="btn-primary"');?>
<input type="hidden" id="uid" name="uid" value="<?php echo $group['groupuid'];?>" />
</form>
</div>
<div class="span3">
<p><small>If you would like to invite more people to this group you can do that from <a href="<?=site_url().'groups/'.$group['groupuid'].'/members/';?>">the group member management page</a>.</small></p>
<p><small>If you would like to invite more people to this group you can do that from <a href="<?php echo site_url().'groups/'.$group['groupuid'].'/members/';?>">the group member management page</a>.</small></p>
<form id="delete_group" method="post" action="/groups/delete">
<?=form_submit('btn_delete_group','Delete','class="btn-danger"');?>
<input type="hidden" id="uid" name="uid" value="<?=$group['groupuid'];?>" />
<?php echo form_submit('btn_delete_group','Delete','class="btn-danger"');?>
<input type="hidden" id="uid" name="uid" value="<?php echo $group['groupuid'];?>" />
</form>
</div>

</div>

</div>

<div class="well span3">
<a href="/groups/<?=strtoupper($group['groupuid']);?>">Back to your group</a>

<a href="/groups/<?php echo strtoupper($group['groupuid']);?>">Back to your group</a>
</div>

</div>

<?php $this->load->view('footer'); ?>
38 changes: 19 additions & 19 deletions application/views/groups_members.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,53 +2,53 @@

<div class="row-fluid">
<div class="span7">
<h2>Groups : Members : <?=$group['name'];?></h2>
<h2>Groups : Members : <?php echo $group['name'];?></h2>

<?php if ($this->session->flashdata('message')) { ?>
<div class="alert alert-success">
<a class="close" data-dismiss="alert">×</a>
<?=$this->session->flashdata('message');?>
<?php echo $this->session->flashdata('message');?>
</div>
<?php } ?>

<div class="row-fluid">
<div class="span8">
<p>Add or remove members of this group.</p>
<form id="edit_group" method="post" action="/groups/<?=$group['groupuid'];?>/invite_member">
<p><input type="text" size="60" class="input-large" id="emailaddress" name="emailaddress" placeholder="[email protected]" /> <?=form_submit('btn_invite_member','Invite','class="btn-primary"');?></p>
<input type="hidden" id="groupuid" name="groupuid" value="<?=$group['groupuid'];?>" />
<input type="hidden" id="groupid" name="groupid" value="<?=$group['groupid'];?>" />

<form id="edit_group" method="post" action="/groups/<?php echo $group['groupuid'];?>/invite_member">
<p><input type="text" size="60" class="input-large" id="emailaddress" name="emailaddress" placeholder="[email protected]" /> <?php echo form_submit('btn_invite_member','Invite','class="btn-primary"');?></p>
<input type="hidden" id="groupuid" name="groupuid" value="<?php echo $group['groupuid'];?>" />
<input type="hidden" id="groupid" name="groupid" value="<?php echo $group['groupid'];?>" />
</form>

<?php if (isset($group['invites'])) { ?>
<h3>Invites</h3>
<div class="members">
<?php foreach($group['invites'] as $member) { ?>
<div class="member">
<p><?php if ($member['emailaddress'] == $this->session->userdata('emailaddress')) { ?><?php echo $member['emailaddress']. ' - This is you!'; } else { ?><!-- <a href="#" class="btn" title="Remove the invite"><i class="icon-ban-circle"></i></a> --> <strong><?=$member['emailaddress'];?></strong> <small>was invited on <?=date("d F Y",strtotime($member['dateinvited']));?></small><?php } ?></p>
<p><?php if ($member['emailaddress'] == $this->session->userdata('emailaddress')) { ?><?php echo $member['emailaddress']. ' - This is you!'; } else { ?><!-- <a href="#" class="btn" title="Remove the invite"><i class="icon-ban-circle"></i></a> --> <strong><?php echo $member['emailaddress'];?></strong> <small>was invited on <?php echo date("d F Y",strtotime($member['dateinvited']));?></small><?php } ?></p>
</div>
<?php } ?>
</div>
<?php } ?>

<h3>Members</h3>
<div class="members">
<?php foreach($group['members'] as $member) { ?>
<div class="member">
<p><?php if ($member['emailaddress'] == $this->session->userdata('emailaddress')) { ?><?php echo $member['emailaddress']. ' - This is you!'; } else { ?> <a href="<?=site_url();?>groups/<?=$group['groupuid'];?>/remove/<?=$member['id'];?>" class="btn" title="Remove this member"><i class="icon-ban-circle"></i></a> <strong><?=$member['emailaddress'];?></strong> <small>member since <?=date("d F Y",strtotime($member['datejoined']));?></small><?php } ?></p>
<p><?php if ($member['emailaddress'] == $this->session->userdata('emailaddress')) { ?><?php echo $member['emailaddress']. ' - This is you!'; } else { ?> <a href="<?php echo site_url();?>groups/<?php echo $group['groupuid'];?>/remove/<?php echo $member['id'];?>" class="btn" title="Remove this member"><i class="icon-ban-circle"></i></a> <strong><?php echo $member['emailaddress'];?></strong> <small>member since <?php echo date("d F Y",strtotime($member['datejoined']));?></small><?php } ?></p>
</div>
<?php } ?>
</div>


</div>

<div class="well span3">
<a href="/groups/<?=strtoupper($group['groupuid']);?>">Back to your group</a>

<a href="/groups/<?php echo strtoupper($group['groupuid']);?>">Back to your group</a>
</div>

</div>

<?php $this->load->view('footer'); ?>
38 changes: 19 additions & 19 deletions application/views/header.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@
<meta charset="utf-8">
<meta name="viewport" content="width=50, initial-scale=1.0, user-scalable=no">
<title>Nilai<?php if (!$this->session->userdata('userid')) { echo ': Save your links for later.'; } ?></title>

<link rel="stylesheet" href="<?=site_url();?>assets/bootstrap/compiled/css/bootstrap.min.css" />
<link rel="stylesheet" href="<?=site_url();?>assets/css/nilai.css" />

<link rel="icon" type="image/ico" href="<?=site_url();?>favicon.ico" />

<script src="<?=site_url();?>assets/jquery/jquery-1.7.1.min.js"></script>
<script src="<?=site_url();?>assets/jquery/jquery.scrollTo-1.4.2-min.js"></script>
<script src="<?=site_url();?>assets/bootstrap/compiled/js/bootstrap.min.js"></script>
<script src="<?=site_url();?>assets/js/nilai.js"></script>

<link rel="stylesheet" href="<?php echo site_url();?>assets/bootstrap/compiled/css/bootstrap.min.css" />
<link rel="stylesheet" href="<?php echo site_url();?>assets/css/nilai.css" />

<link rel="icon" type="image/ico" href="<?php echo site_url();?>favicon.ico" />

<script src="<?php echo site_url();?>assets/jquery/jquery-1.7.1.min.js"></script>
<script src="<?php echo site_url();?>assets/jquery/jquery.scrollTo-1.4.2-min.js"></script>
<script src="<?php echo site_url();?>assets/bootstrap/compiled/js/bootstrap.min.js"></script>
<script src="<?php echo site_url();?>assets/js/nilai.js"></script>

<script type="text/javascript">

var _gaq = _gaq || [];
Expand All @@ -28,29 +28,29 @@
})();

</script>

</head>
<body>
<div class="container-fluid">
<div class="row-fluid">
<div class="logo">
<h1><a href="/home"><img src="<?=site_url();?>assets/images/logo-60.png" alt="logo-60" width="60" height="60" /></a><?php if (!$this->session->userdata('userid')) { ?> Nilai<?php } ?></h1>
<h1><a href="/home"><img src="<?php echo site_url();?>assets/images/logo-60.png" alt="logo-60" width="60" height="60" /></a><?php if (!$this->session->userdata('userid')) { ?> Nilai<?php } ?></h1>
</div>

<?php if (!$this->session->userdata('userid')) { ?>
<div class="navigation">
<!--<ul class="nav nav-pills">
<li><a class="btn btn-primary" href="/sirius" title="Create Account"><i class="icon-user"></i> Create Account</a></li>
</ul> -->
<form method="post" action="users/login" class="form-inline">
<?=form_input('emailaddress','','class="input-small" placeholder="Email Address"');?>
<?=form_password('password','','class="input-small" placeholder="Password"');?>
<?php echo form_input('emailaddress','','class="input-small" placeholder="Email Address"');?>
<?php echo form_password('password','','class="input-small" placeholder="Password"');?>
<input type="submit" value="Log in" name="login" id="login" class="btn" />
</form>
</div>

<?php } ?>

<?php if (isset($when)) { if ($this->session->userdata('userid') && $when !='') { ?>
<div class="navigation">
<ul class="nav nav-pills">
Expand Down Expand Up @@ -97,12 +97,12 @@
<ul class="dropdown-menu">
<li<?php if ($group == 'create') echo ' class="active"';?>>
<a href="/groups/create">Create a group +</a>
</li>
</li>
<?php if (isset($groups['belong'])) { ?>
<li class="divider"></li>
<?php foreach($groups['belong'] as $gb) { ?>
<li<?php if ($group['groupuid'] == strtoupper($gb['uid'])) echo ' class="active"';?>>
<a href="/groups/<?=strtoupper($gb['uid']);?>"><?=$gb['name'];?></a>
<a href="/groups/<?php echo strtoupper($gb['uid']);?>"><?php echo $gb['name'];?></a>
</li>
<?php }
} ?>
Expand Down
Loading

0 comments on commit 1b4cb78

Please sign in to comment.