From 248688ca992c8b6c0732557b321a3ee48183cc53 Mon Sep 17 00:00:00 2001 From: Jeff Johns Date: Wed, 8 Jan 2014 09:36:53 -0500 Subject: [PATCH 1/2] Updated all shortcodes to
  • Rename application/config/database-sample.php to application/config/database.php
  • Edit the hostname, username, password, and database name in database.php
    • -
  • Try again
    • +
  • Try again
    • diff --git a/application/views/addedpop.php b/application/views/addedpop.php index 57cec79d..45c8def0 100644 --- a/application/views/addedpop.php +++ b/application/views/addedpop.php @@ -3,8 +3,8 @@

    Your mark has been saved!

    -

    0) { echo $title; } else { echo 'Untitled'; } ?>

    -

    +

    0) { echo $title; } else { echo 'Untitled'; } ?>

    +

    Save and close

    Label your mark

    @@ -12,8 +12,8 @@

    Shopping Inspiration

    Documentation Research

    Clear labels

    - - + +
    diff --git a/application/views/editpop.php b/application/views/editpop.php index b22eb4bf..65275d09 100644 --- a/application/views/editpop.php +++ b/application/views/editpop.php @@ -3,7 +3,7 @@

    -

    0) { echo $title; } else { echo 'Untitled'; }?>

    +

    0) { echo $title; } else { echo 'Untitled'; }?>

    90) { echo substr(str_replace('http://','',$url),0,50).'…'; @@ -12,21 +12,21 @@ } ?>

    session->userdata('userid')) { ?> - + -

    Save and close Delete

    +

    Save and close Delete

    - +

    Actions

    Read Watch Listen

    Buy Eat & Drink Do

    - +

    Unlabeled Stop using Smart Label? - + Unlabeled @@ -34,7 +34,7 @@ Unlabeled Add Smart Label? - + Unlabeled Add Smart Label? @@ -43,22 +43,22 @@

    - +

    Groups

    - +

    Create a group +

    - - - - - - + + + + + +
    diff --git a/application/views/groups_create.php b/application/views/groups_create.php index 936a62c8..a9883e9d 100644 --- a/application/views/groups_create.php +++ b/application/views/groups_create.php @@ -3,21 +3,21 @@

    Create a group

    - + session->flashdata('message')) { ?>
    × - session->flashdata('message');?> + session->flashdata('message');?>
    - +

    Groups can be used to share links with groups of people; family, friends, coworkers. Create a group, invite some people, share some links.


    Examples:
    Sharing links for our upcoming vacation.
    Links my coworkers need.

    - +

    @@ -27,17 +27,17 @@

    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.

    - +
    - +
    - +
    - + Back to your marks
    - +
    load->view('footer'); ?> \ No newline at end of file diff --git a/application/views/groups_edit.php b/application/views/groups_edit.php index 062b3cee..ba26b729 100644 --- a/application/views/groups_edit.php +++ b/application/views/groups_edit.php @@ -3,41 +3,41 @@

    Edit your group

    - + session->flashdata('message')) { ?>
    × - session->flashdata('message');?> + session->flashdata('message');?>
    - +

    The name and description of your group can be edited.

    -

    -


    - - +

    +


    + +
    -

    If you would like to invite more people to this group you can do that from the group member management page.

    +

    If you would like to invite more people to this group you can do that from the group member management page.

    - - + +
    - +
    - +
    - +
    - - Back to your group + + Back to your group
    - +
    load->view('footer'); ?> \ No newline at end of file diff --git a/application/views/groups_members.php b/application/views/groups_members.php index 572c2bbb..a637ceb1 100644 --- a/application/views/groups_members.php +++ b/application/views/groups_members.php @@ -2,53 +2,53 @@
    -

    Groups : Members :

    - +

    Groups : Members :

    + session->flashdata('message')) { ?>
    × - session->flashdata('message');?> + session->flashdata('message');?>
    - +

    Add or remove members of this group.

    - -
    -

    - - + + +

    + +
    - +

    Invites

    -

    session->userdata('emailaddress')) { ?> was invited on

    +

    session->userdata('emailaddress')) { ?> was invited on

    - +

    Members

    -

    session->userdata('emailaddress')) { ?> member since

    +

    session->userdata('emailaddress')) { ?> member since

    - - + +
    - +
    - - Back to your group + + Back to your group
    - +
    load->view('footer'); ?> \ No newline at end of file diff --git a/application/views/header.php b/application/views/header.php index cf19e773..5b650c5d 100644 --- a/application/views/header.php +++ b/application/views/header.php @@ -4,17 +4,17 @@ Nilai<?php if (!$this->session->userdata('userid')) { echo ': Save your links for later.'; } ?> - - - - - - - - - - + + + + + + + + + + - +
    - + session->userdata('userid')) { ?>
    - - + +
    - + - + session->userdata('userid') && $when !='') { ?>
      @@ -97,12 +97,12 @@
        > Create a group + - +
      • > - + diff --git a/application/views/help_bookmarklet.php b/application/views/help_bookmarklet.php index e0d4fb01..d6b2a194 100644 --- a/application/views/help_bookmarklet.php +++ b/application/views/help_bookmarklet.php @@ -4,30 +4,30 @@

        Help with bookmarklets

        Installing bookmarklets isn't easy. Especially on mobile devices. Here is how you do it, step-by-step:

        - +

        On your computer

        In Safari, Chrome, Firefox, or Internet Explorer the installation process is nearly the same.

        1. Click and Drag the link in the sidebar into your browser's bookmarks bar
        2. That's it! Now, when you're on a page that you want to bookmark, click the bookmarklet.
        - +

        On iPad, iPhone or iPod touch

        - - - + + +
        1. Bookmark this page
        2. Copy the text in the box above
        3. Go into your bookmarks on your iOS device
        4. Edit the bookmark
        5. Paste the text as the URL
        6. Save it.
        7. You're done!

        Still confused? I understand. It is confusing. I don't know why it isn't easier to do. If you'd like personal help installing the bookmarklet you can send me an email and I'll try to help.

        - +

        Android devices

        I have no idea. If you do, please drop me a line.

        - +
        -

        Nilai+ <-- DRAG TO BOOKMARKS

        +

        Nilai+ <-- DRAG TO BOOKMARKS

        Back to your marks

        - +
    load->view('footer'); ?> \ No newline at end of file diff --git a/application/views/help_how.php b/application/views/help_how.php index a781e59d..1bc98dcb 100644 --- a/application/views/help_how.php +++ b/application/views/help_how.php @@ -4,12 +4,12 @@

    How to use Nilai

    The learning curve for using Nilai can be a bit steep for some. I hope this simple article makes it just a little bit easier for newcomers.

    - +

    Adding links to Nilai

    There are a few ways to add links to Nilai. The most direct way is using Nilai's bookmarklet. A bookmarklet is a small application that resides in your browser's bookmarks bar. Installing a bookmarklet is easy. Simply drag the button you see below into your browser's bookmarks bar.

    - -

    Add to Nilai

    - + +

    Add to Nilai

    + - +

    You can also add links to Nilai using a browser extension. As of today I've only put together a beta version of an extension for Google Chrome.

    - +

    Once you have the bookmarklet or extension installed it is very easy to add a link to Nilai. When you're on a page that you'd like to save for later or share with a group - click the bookmarklet or the extension button and that link is added to Nilai. It is that simple!

    - +

    A tip! Want to practice? Add this page to Nilai!

    - +

    Labels and Groups

    Adding a label to a link or adding a link to a group is as easy as one click or tap. But first, why add labels?

    - +

    Labels are used to separate your links based on what you'd like to do with them later. Perhaps you're reading a long article that you'd like to finish later. Adding it to the Read label means that you'll remember later what it was that you'd like to accomplish with the link. Similarly, adding the labels Watch or Listen may indicate that you'd like to Watch a video or Listen to a bit of audio later.

    - +

    Groups are used for sharing links with a group of people. Perhaps you work at a company and you spend a lot of time during the day going through many emails from coworkers sending you links all day. Or, maybe you'd like to share a recipe with your wife or a link to vacation photos with extended family. Groups make it as easy as 1 tap or click to share with as many people as you'd like.

    - +

    When you add a link to Nilai you can add a label or add the link to a group simply by clicking on the button to do so. However, if you've already added a link to Nilai you can click on the Info button to edit the links details.

    - +

    Using Nilai on the go

    If you have an Internet-enabled smartphone you can use Nilai. Simply point your phone's browser to nilai.co and sign in the same as you would on your computer.

    - +

    Adding links to Nilai from your phone

    Unfortunately this isn't nearly as easy as it should be. Adding bookmarklets to Apple's iPhone or iPad or Android-powered devices is just difficult. We're currently working on building a Nilai application for the iPhone to make this much easier.

    If you'd like to add links from your phone please see the bookmarklet instructions help article.

    - +

    Adding Nilai to your iPhone/iPad home screen

    I recommend doing this. Log into nilai.co and, once logged in, click the Add Bookmark button. One of the selections will be "Add to Home Screen". This will make it very easy to get back to Niali.

    - +

    I hope you enjoy using Nilai,
    Colin Devroe

    - - + +
    - +
    Back to your marks
    - +
    load->view('footer'); ?> \ No newline at end of file diff --git a/application/views/install.php b/application/views/install.php index c58cd9c7..5335e334 100644 --- a/application/views/install.php +++ b/application/views/install.php @@ -2,27 +2,27 @@
    - +

    Good News!

    You already have a database. You are running the latest version of the database schema. And you have one or more users. You're all set. Just log in!

    Create a user

    Your database is set up, it is running the latest database schema, but you do not have a user account yet. Go ahead and set one up.

    - +

    -

    -

    -

    - +

    +

    +

    + - +
    - +
    Documentation
    - +
    load->view('footer'); ?> \ No newline at end of file diff --git a/application/views/marks.php b/application/views/marks.php index c8bcde75..d121e0e6 100644 --- a/application/views/marks.php +++ b/application/views/marks.php @@ -4,52 +4,52 @@ session->flashdata('message')) { ?>
    × - session->flashdata('message');?> + session->flashdata('message');?>
    - + - +

    You've been invited to join some groups!

    -

    Heads up! invited you to join the "" group! - Accept Reject

    +

    Heads up! invited you to join the "" group! - Accept Reject

    - + - - - - + + session->userdata('userid'))) { ?>
    - Members - Edit + Members + Edit
    session->userdata('userid'))) { ?> - +
    - Members - Leave + Members + Leave
    -

    Links

    -

    - +

    Links

    +

    +
    - - + +

    No links were found in this list. If you need some link suggestions follow @nilaico on Twitter!

    @@ -59,22 +59,22 @@ // print_r($mark); // Parse URL to determine domain $parsedUrl = parse_url($mark['url']); - + if ($this->session->flashdata('restoredid') && $this->session->flashdata('restoredid') == $mark['usersmarkid']) { $restored = ' restored'; } else { $restored = ''; } ?> -
    -
    -

    text-only

    + -
    -

    +
    +

    session->userdata('userid')) { echo 'Note written by '.$mark['emailaddress']; } ?>

    -
    -

    +
    +

    - + -
    - +
    +
    - + -
    - +
    +
    - +
    - -

    You've saved and archived marks today. +

    You've saved and archived marks today. = $marks_archived_today ) { echo 'Get busy!'; } elseif ( $marks_saved_today < $marks_archived_today ) { @@ -125,19 +125,19 @@ } ?>

    -

    Add to Nilai

    Drag this bookmarklet to your browser's bookmark bar to get started.

    +

    Add to Nilai

    Drag this bookmarklet to your browser's bookmark bar to get started.

    - - + + -

    +


    (x) clear results

    -

    +

    - +
    • @@ -154,10 +154,10 @@
    -

    Version See what's new by following @nilaico for updates.

    - +

    Version See what's new by following @nilaico for updates.

    +
    - +
    load->view('footer'); ?> \ No newline at end of file diff --git a/application/views/signup.php b/application/views/signup.php index 53d18598..20395813 100644 --- a/application/views/signup.php +++ b/application/views/signup.php @@ -6,23 +6,23 @@

    Note: Sign up for free today and use all of Nilai's current features. The hosted version of Nilai will be a paid-for-service in the future. At that time, you'll be able to upgrade or export all of your bookmarks.

    - +
    × - Warning! + Warning!
    - - -

    -

    -

    I accept the terms of use.

    -

    - + + +

    +

    +

    I accept the terms of use.

    +

    +
    - +
    load->view('footer'); ?> \ No newline at end of file From 4bb2a1043f4e6dafc4cca21e0bfecd8361581d9a Mon Sep 17 00:00:00 2001 From: Jeff Johns Date: Wed, 8 Jan 2014 11:05:46 -0500 Subject: [PATCH 2/2] Updated version internally --- index.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/index.php b/index.php index 3c9c8779..c0ea5cf9 100644 --- a/index.php +++ b/index.php @@ -7,12 +7,12 @@ * * Set the current version here. Be sure to follow basic rules * for doing point releases, major releases, etc. - * + * * Don't forget to update the changelog! * /application/views/changelog.php - * + * */ -define('NILAI_VERSION','0.3.3'); +define('NILAI_VERSION','0.3.4'); /* *--------------------------------------------------------------- @@ -50,7 +50,7 @@ case 'development': error_reporting(E_ALL); break; - + case 'staging': break; case 'production':