Permalink
Browse files

Renamed all instances of 'nilai' to 'unmark' and updated a few minor …

…styles
  • Loading branch information...
twhitacre committed Feb 18, 2014
1 parent a4fff9a commit 99f822480a7df87e617047fda816c9799f1f867e
Showing with 320 additions and 396 deletions.
  1. BIN apple-touch-icon.png
  2. +8 −8 application/config/all/app.php
  3. +1 −1 application/config/config.php
  4. +2 −2 application/config/database-sample.php
  5. +1 −1 application/controllers/welcome.php
  6. +1 −1 application/helpers/hrecipe_helper.php
  7. +2 −2 application/libraries/Plain_Email.php
  8. +1 −1 application/views/email/forgot-password.php
  9. +2 −2 application/views/help/bookmarklet.php
  10. +0 −31 application/views/help/faq.php
  11. +0 −45 application/views/help/how.php
  12. +9 −9 application/views/layouts/footer.php
  13. +4 −4 application/views/layouts/header.php
  14. +8 −8 application/views/layouts/jsvars.php
  15. +3 −3 application/views/layouts/navigation.php
  16. +1 −1 application/views/layouts/sidebar.php
  17. +1 −1 application/views/marks/index.php
  18. +8 −8 application/views/marks/info.php
  19. +11 −11 application/views/singletons/reset.php
  20. +12 −12 application/views/welcome.php
  21. +0 −4 assets/css/nilai.css
  22. +4 −0 assets/css/unmark.css
  23. +11 −11 assets/css/{nilai.scss → unmark.scss}
  24. BIN assets/images/Nilai-March14.jpg
  25. BIN assets/images/apple-touch-icon.png
  26. BIN assets/images/imac.jpeg
  27. BIN assets/images/imac2.jpeg
  28. BIN assets/images/imac3.jpeg
  29. BIN assets/images/imacgroups.jpeg
  30. BIN assets/images/iphone.jpeg
  31. BIN assets/images/iphoneitaly.jpeg
  32. BIN assets/images/iphonepreviews.jpeg
  33. BIN assets/images/logo-400.jpeg
  34. BIN assets/images/logo-400.png
  35. BIN assets/images/logo-60.jpeg
  36. BIN assets/images/logo-60.png
  37. BIN assets/images/macbookair.jpeg
  38. BIN assets/images/macbookairitaly.jpeg
  39. BIN assets/images/paypal.gif
  40. BIN assets/images/poweredby_huffduffer.gif
  41. BIN assets/images/poweredby_huffduffer.jpeg
  42. BIN assets/images/screenshot_desktop.jpg
  43. BIN assets/images/screenshot_ipad.png
  44. BIN assets/images/screenshot_iphone.png
  45. +5 −5 assets/js/plugins/{nilai-graph.js → unmark-graph.js}
  46. +0 −7 assets/js/templates/nilai-templates.js
  47. +7 −0 assets/js/templates/unmark-templates.js
  48. +38 −38 assets/js/{nilai.actions.js → unmark.actions.js}
  49. +3 −3 assets/js/{nilai.add.js → unmark.add.js}
  50. +10 −10 assets/js/{nilai.client.js → unmark.client.js}
  51. +29 −29 assets/js/{nilai.init.js → unmark.init.js}
  52. +14 −14 assets/js/{nilai.js → unmark.js}
  53. +38 −38 assets/js/{nilai.login.js → unmark.login.js}
  54. +50 −50 assets/js/{nilai.marks.js → unmark.marks.js}
  55. +27 −27 assets/js/{nilai.reset.js → unmark.reset.js}
  56. BIN favicon.ico
  57. +6 −6 index.php
  58. +1 −1 license.txt
  59. +2 −2 readme.md
View
Binary file not shown.
@@ -55,12 +55,12 @@
have some links to *do* something with. The label of 'Do' will be added automatically.
*/
$config['new_account_links'] = array(
'Read Nilai\'s FAQ' => array(
'url' => 'http://nilai.co/help/faq',
'Read Unmark\'s FAQ' => array(
'url' => 'http://unmark.it/help/faq',
'label_id' => '7'
),
'How To Use Nilai' => array(
'url' => 'http://nilai.co/help/how',
'How To Use Unmark' => array(
'url' => 'http://unmark.it/help/how',
'label_id' => '7'
)
);
@@ -83,11 +83,11 @@
*/
// Reset email subject
$config['password_reset_email_subject'] = 'Nilai - Password reset';
$config['password_reset_email_subject'] = 'Unmark - Password reset';
// Reset email from field address and description
$config['email_from'] = array('address'=>'nilai@nilai.co', 'description' => 'Nilai');
$config['email_from'] = array('address'=>'noreply@unmark.it', 'description' => 'Unmark');
// Reset email reply to field address and description
$config['email_reply_to'] = array('address'=>'nilai@nilai.co', 'description' => 'Nilai');
$config['email_reply_to'] = array('address'=>'noreply@unmark.it', 'description' => 'Unmark');
// Reset email server settings
/*
* Array with settings accepted by CI email component
@@ -106,4 +106,4 @@
);
*/
// Updated password email subject
$config['password_updated_email_subject'] = 'Nilai - Password updated';
$config['password_updated_email_subject'] = 'Unmark - Password updated';
@@ -261,7 +261,7 @@
$config['sess_table_name'] = 'plain_sessions';
// WARNING: Session settings below refer to CodeIgniter session library which is not being used in Nilai
// WARNING: Session settings below refer to CodeIgniter session library which is not being used in Unmark
$config['sess_use_database'] = FALSE;
@@ -54,13 +54,13 @@
$db['default']['hostname'] = '127.0.0.1';
$db['default']['username'] = 'root';
$db['default']['password'] = 'root';
$db['default']['database'] = 'nilai';
$db['default']['database'] = 'unmark';
} else { // If not local, load this
$db['default']['hostname'] = 'localhost';
$db['default']['username'] = 'username';
$db['default']['password'] = 'password';
$db['default']['database'] = 'nilai';
$db['default']['database'] = 'unmark';
}
@@ -16,7 +16,7 @@ public function index()
// Needs to be installed
// This should be updated to be cleaner
if (! $this->db->table_exists('users')) {
print_r('<p>Nilai has not been installed yet. Please <a href="/install/">install</a> before continuing.</p>');
print_r('<p>Unmark has not been installed yet. Please <a href="/install/">install</a> before continuing.</p>');
exit;
}
@@ -2,7 +2,7 @@
include('simple_html_dom.php');
function parse_hrecipe($url) {
ini_set('user_agent', 'Nilai/1.0');
ini_set('user_agent', 'Unmark/1.0');
ini_set('memory_limit', '500M');
/* Alchemy API
@@ -42,7 +42,7 @@ public function resetPassword($email, $url)
$this->to($email);
$subject = $this->CI->config->item('password_reset_email_subject');
if(empty($subject)){
$subject = 'Nilai - Password reset';
$subject = 'Unmark - Password reset';
}
$this->subject($subject);
$this->message($message);
@@ -77,7 +77,7 @@ public function updatePassword($email)
$this->to($email);
$subject = $this->CI->config->item('password_updated_email_subject');
if(empty($subject)){
$subject = 'Nilai - Password updated';
$subject = 'Unmark - Password updated';
}
$this->subject($subject);
$this->message($message);
@@ -1,4 +1,4 @@
Password reset request for Nilai was just created for your account. To reset your password please visit following link:
Password reset request for Unmark was just created for your account. To reset your password please visit following link:
<br />
{URL}
<br />
@@ -10,7 +10,7 @@
</ol>
<h3>On iPad, iPhone or iPod touch</h3>
<textarea style="width:500px; height:150px;" class="clipboardCopy">javascript:(function()%7Bf%3D%27http://nilai.co/mark/add%3Furl%3D%27%2BencodeURIComponent(window.location.href)%2B%27%26title%3D%27%2BencodeURIComponent(document.title)%2B%27%26v%3D6%26%27%3Ba%3Dfunction()%7Bif(!window.open(f%2B%27noui%3D1%26jump%3Ddoclose%27,%27nilaiv2%27,%27location%3D1,links%3D0,scrollbars%3D0,toolbar%3D0,width%3D594,height%3D485%27))location.href%3Df%2B%27jump%3Dyes%27%7D%3Bif(/Firefox/.test(navigator.userAgent))%7BsetTimeout(a,0)%7Delse%7Ba()%7D%7D)()</textarea>
<textarea style="width:500px; height:150px;" class="clipboardCopy">javascript:(function()%7Bf%3D%27http://unmark.it/mark/add%3Furl%3D%27%2BencodeURIComponent(window.location.href)%2B%27%26title%3D%27%2BencodeURIComponent(document.title)%2B%27%26v%3D6%26%27%3Ba%3Dfunction()%7Bif(!window.open(f%2B%27noui%3D1%26jump%3Ddoclose%27,%27unmarkv2%27,%27location%3D1,links%3D0,scrollbars%3D0,toolbar%3D0,width%3D594,height%3D485%27))location.href%3Df%2B%27jump%3Dyes%27%7D%3Bif(/Firefox/.test(navigator.userAgent))%7BsetTimeout(a,0)%7Delse%7Ba()%7D%7D)()</textarea>
<ol><li>Bookmark this page</li><li>Copy the text in the box above</li><li>Go into your bookmarks on your iOS device</li><li>Edit the bookmark</li><li>Paste the text as the URL</li><li>Save it.</li><li>You're done!</li></ol>
@@ -19,7 +19,7 @@
<h3>Android devices</h3>
<p>I have no idea. If you do, please drop me a line.</p>
<p><a href="javascript:(function()%7Bf%3D%27http://nilai.co/mark/add%3Furl%3D%27%2BencodeURIComponent(window.location.href)%2B%27%26title%3D%27%2BencodeURIComponent(document.title)%2B%27%26v%3D6%26%27%3Ba%3Dfunction()%7Bif(!window.open(f%2B%27noui%3D1%26jump%3Ddoclose%27,%27nilaiv2%27,%27location%3D1,links%3D0,scrollbars%3D0,toolbar%3D0,width%3D594,height%3D485%27))location.href%3Df%2B%27jump%3Dyes%27%7D%3Bif(/Firefox/.test(navigator.userAgent))%7BsetTimeout(a,0)%7Delse%7Ba()%7D%7D)()" title="Install bookmarklet" style="color:red;">UNMARK</a> <strong>&lt;-- DRAG TO BOOKMARKS</strong></p>
<p><a href="javascript:(function()%7Bf%3D%27http://unmark.it/mark/add%3Furl%3D%27%2BencodeURIComponent(window.location.href)%2B%27%26title%3D%27%2BencodeURIComponent(document.title)%2B%27%26v%3D6%26%27%3Ba%3Dfunction()%7Bif(!window.open(f%2B%27noui%3D1%26jump%3Ddoclose%27,%27unmarkv2%27,%27location%3D1,links%3D0,scrollbars%3D0,toolbar%3D0,width%3D594,height%3D485%27))location.href%3Df%2B%27jump%3Dyes%27%7D%3Bif(/Firefox/.test(navigator.userAgent))%7BsetTimeout(a,0)%7Delse%7Ba()%7D%7D)()" title="Install bookmarklet" style="color:red;">UNMARK</a> <strong>&lt;-- DRAG TO BOOKMARKS</strong></p>
<p><a href="/home">Back to your marks</a></p>
</div>

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.
@@ -2,7 +2,7 @@
<div class="sidebar-content"><?php $this->load->view('layouts/sidebar'); ?></div>
</div>
</div> <!-- end main-wrapper -->
</div> <!-- end nilai-wrapper -->
</div> <!-- end unmark-wrapper -->
<?php $this->load->view('layouts/userforms'); ?>
@@ -12,18 +12,18 @@
<script src="/assets/js/plugins/hogan.js"></script>
<script src="/assets/js/plugins/pjax.js"></script>
<script src="/assets/js/plugins/Chart.min.js"></script>
<script src="/assets/js/plugins/nilai-graph.js"></script>
<script src="/assets/js/templates/nilai-templates.js"></script>
<script src="/assets/js/nilai.js"></script>
<script src="/assets/js/nilai.actions.js"></script>
<script src="/assets/js/nilai.marks.js"></script>
<script src="/assets/js/nilai.client.js"></script>
<script src="/assets/js/nilai.init.js"></script>
<script src="/assets/js/plugins/unmark-graph.js"></script>
<script src="/assets/js/templates/unmark-templates.js"></script>
<script src="/assets/js/unmark.js"></script>
<script src="/assets/js/unmark.actions.js"></script>
<script src="/assets/js/unmark.marks.js"></script>
<script src="/assets/js/unmark.client.js"></script>
<script src="/assets/js/unmark.init.js"></script>
<script type="text/javascript">
$(document).ready(function() {
nilai.createGraph(<?php print $stats['archived']['4 days ago'].", ".$stats['archived']['3 days ago'].", ".$stats['archived']['2 days ago'].", ".$stats['archived']['yesterday'].", ".$stats['archived']['today'].", ".$stats['saved']['4 days ago'].", ".$stats['saved']['3 days ago'].", ".$stats['saved']['2 days ago'].", ".$stats['saved']['yesterday'].", ".$stats['saved']['today']; ?>);
unmark.createGraph(<?php print $stats['archived']['4 days ago'].", ".$stats['archived']['3 days ago'].", ".$stats['archived']['2 days ago'].", ".$stats['archived']['yesterday'].", ".$stats['archived']['today'].", ".$stats['saved']['4 days ago'].", ".$stats['saved']['3 days ago'].", ".$stats['saved']['2 days ago'].", ".$stats['saved']['yesterday'].", ".$stats['saved']['today']; ?>);
});
</script>
@@ -6,7 +6,7 @@
<meta name="apple-mobile-web-app-capable" content="yes" />
<title>Unmark<?php if (! isset($_SESSION['logged_in'])) { echo ': Save your links for later.'; } ?></title>
<link href='http://fonts.googleapis.com/css?family=Lato:300,400,700,300italic,400italic,700italic|Merriweather:400,300,300italic,400italic,700,700italic|Montserrat:400,700' rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="/assets/css/nilai.css" />
<link rel="stylesheet" href="/assets/css/unmark.css" />
<link rel="icon" type="image/ico" href="/favicon.ico" />
<script src="/assets/js/plugins/modernizr-2.7.1.min.js"></script>
<script>
@@ -18,12 +18,12 @@
</head>
<?php if (isset($active_label)) : ?>
<body id="nilai" class="label-<?php print $active_label['label_id']; ?>" data-lookup="<?php print $lookup_type; ?>">
<body id="unmark" class="label-<?php print $active_label['label_id']; ?>" data-lookup="<?php print $lookup_type; ?>">
<?php else : ?>
<body id="nilai" data-lookup="<?php print $lookup_type; ?>">
<body id="unmark" data-lookup="<?php print $lookup_type; ?>">
<?php endif; ?>
<div id="nilai-wrapper">
<div id="unmark-wrapper">
<?php $this->load->view('layouts/navigation'); ?>
@@ -1,23 +1,23 @@
<script type="text/javascript">
var nilai = nilai || {};
nilai.vars = {};
nilai.vars.csrf_token = '<?php print $csrf_token; ?>';
var unmark = unmark || {};
unmark.vars = {};
unmark.vars.csrf_token = '<?php print $csrf_token; ?>';
<?php
// Check for Page Stats
if(isset($per_page)) {
print "nilai.vars.per_page = $per_page;\n";
print "unmark.vars.per_page = $per_page;\n";
}
// Check for Stats
if(isset($stats)) {
print "nilai.vars.stats_set = true;\n";
print "unmark.vars.stats_set = true;\n";
} else {
print "nilai.vars.stats_set = false;\n";
print "unmark.vars.stats_set = false;\n";
}
// Check for labels
if(isset($labels)) {
print "nilai.vars.labels_set = true;";
print "unmark.vars.labels_set = true;";
} else {
print "nilai.vars.labels_set = false;";
print "unmark.vars.labels_set = false;";
}
?>
</script>
@@ -67,13 +67,13 @@
<ul class="nav-list">
<li><a href="#" class="action" data-action="change_password">Change Password</a></li>
<li><a href="#" class="action" data-action="change_email">Change Email Address</a></li>
<li><a href="mailto:?subject=Checkout Nilai&amp;body=You should really check out Nilai. http://nilai.co">Invite Others</a></li>
<li><a href="mailto:?subject=Checkout Unmark&amp;body=You should really check out Unmark. http://unmark.it">Invite Others</a></li>
</ul>
<h4 class="nav-heading">Help</h4>
<ul class="nav-list">
<li><a href="/help/how.php">How to Use Nilai</a></li>
<li><a href="/help/faq">FAQ</a></li>
<li><a href="#">How to Use Unmark</a></li>
<li><a href="#">FAQ</a></li>
<li><a href="/help/bookmarklet">Get the Bookmarklet</a></li>
<li><a href="#">Get the Chrome Extension</a></li>
</ul>
@@ -1,7 +1,7 @@
<div class="sidebar-default">
<div class="sidebar-block">
<div class="sidebar-inner">
<canvas id="nilai-graph" class="graph" width="400" height="100"></canvas>
<canvas id="unmark-graph" class="graph" width="400" height="100"></canvas>
<p>You saved <?php print $stats['saved']['today']; ?> links today and archived <?php print $stats['archived']['today']; ?>.</p>
</div>
</div>
Oops, something went wrong.

0 comments on commit 99f8224

Please sign in to comment.