Skip to content

Commit f0b0e5b

Browse files
RanaRana
Rana
authored and
Rana
committed
* support multiple entity save at once.
* dynamic seo variable for title/meta info. * Fix bugs and minor tweaks.
1 parent bdf9a4e commit f0b0e5b

File tree

8 files changed

+57
-29
lines changed

8 files changed

+57
-29
lines changed

‎application/config/autoload.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
|
8181
*/
8282

83-
$autoload['config'] = array("pd_forms");
83+
$autoload['config'] = array("pd_forms","pd_seo");
8484

8585

8686
/*

‎application/config/pd_seo.php

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,26 @@
88
*/
99

1010
//Home page
11-
$config['PD_Home_index_title'] = "Home | CodeigniterPlus";
12-
$config['PD_Home_index_key'] = "CodeigniterPlus";
13-
$config['PD_Home_index_desc'] = "Ultimate Codeigniter Enhancements";
11+
$config['CP_home_index_title'] = "Home";
12+
$config['CP_home_index_key'] = "CodeigniterPlus";
13+
$config['CP_home_index_desc'] = "Ultimate Codeigniter Enhancements";
1414

1515
//Error Page
16-
$config['PD_Home_error_title'] = "Page Not Found | CodeigniterPlus";
17-
$config['PD_Home_error_key'] = "CodeigniterPlus";
18-
$config['PD_Home_error_desc'] = "Ultimate Codeigniter Enhancements";
16+
$config['CP_home_error_title'] = "Page Not Found";
17+
$config['CP_home_error_key'] = "CodeigniterPlus";
18+
$config['CP_home_error_desc'] = "Ultimate Codeigniter Enhancements";
1919

2020
//Contact Page
21-
$config['PD_Home_contact_title'] = "Contact | CodeigniterPlus";
22-
$config['PD_Home_contact_key'] = "CodeigniterPlus";
23-
$config['PD_Home_contact_desc'] = "Ultimate Codeigniter Enhancements";
21+
$config['CP_home_contact_title'] = "Contact";
22+
$config['CP_home_contact_key'] = "CodeigniterPlus";
23+
$config['CP_home_contact_desc'] = "Ultimate Codeigniter Enhancements";
24+
25+
//Login Page
26+
$config['DX_auth_login_title'] = "Login";
27+
$config['DX_auth_login_key'] = "CodeigniterPlus";
28+
$config['DX_auth_login_desc'] = "Ultimate Codeigniter Enhancements";
29+
30+
//Registration Page
31+
$config['DX_auth_register_title'] = "Register";
32+
$config['DX_auth_register_key'] = "CodeigniterPlus";
33+
$config['DX_auth_register_desc'] = "Ultimate Codeigniter Enhancements";

‎application/config/pd_user.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
| Key format is prefix + controller_name + method_name + attribute
1414
*/
1515
//User Index page
16-
$config['PD_User_index_title'] = "User | CodeigniterPlus";
17-
$config['PD_User_index_key'] = "CodeigniterPlus";
18-
$config['PD_User_index_desc'] = "Ultimate Codeigniter Enhancements";
16+
$config['CP_user_index_title'] = "Welcome {user}";
17+
$config['CP_user_index_key'] = "CodeigniterPlus";
18+
$config['CP_user_index_desc'] = "Ultimate Codeigniter Enhancements";
1919

‎application/core/MY_Controller.php

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,23 @@
2020
class MY_Controller extends CI_Controller
2121
{
2222
//common prefix that will be used for point template/config files
23-
private $prefix = "PD_";
23+
var $prefix = "CP_";
2424
var $data;
2525
var $page;
26+
var $meta;
27+
2628
/**
2729
* constructor
2830
*/
2931
function __construct()
3032
{
3133
parent::__construct();
3234
$this->init();
35+
$this->data["status"] = (object)NULL;
3336
//$this->load->library("unit_test");
3437
//$this->output->enable_profiler();
3538
$this->load->library('app/formvalidator');
39+
$this->load->library("session");
3640
}
3741

3842
/**
@@ -45,7 +49,7 @@ function init()
4549

4650
//changing the prefix for this controller
4751
$this->prefix = $this->prefix.$class_name."_";
48-
52+
4953
//changing smarty prefix as per this controller
5054
$this->mysmarty->prefix = "modules/".$class_name."/";
5155

@@ -60,7 +64,6 @@ function init()
6064
$this->page = (object)NULL;
6165
$this->page->noindex = false;
6266

63-
$this->data['status'] = (object)NULL;
6467
}
6568

6669
/**
@@ -82,15 +85,22 @@ function view($template_only=FALSE)
8285
//retrieve method name for using on the next step
8386
$method = $this->getFunctionName();
8487
$this->prefix = $this->prefix.$method."_";
85-
8688
//loading the seo_properties
87-
$this->page->title = $this->config->item($this->prefix."title");
89+
$this->page->title .= $this->config->item($this->prefix."title");
8890
$this->page->title .= empty($this->page->title)?"":" | ";
8991
$this->page->title .= get_domain();
9092

9193
$this->page->key = $this->config->item($this->prefix."key");
9294
$this->page->desc = $this->config->item($this->prefix."desc");
9395

96+
if($this->meta && is_array($this->meta)){
97+
foreach ($this->meta as $key => $value){
98+
$this->page->title = str_replace("{".$key."}", $value, $this->page->title);
99+
$this->page->desc = str_replace("{".$key."}", $value, $this->page->desc);
100+
}
101+
}
102+
103+
94104
//loading the seo_properties
95105
$this->mysmarty->page = $this->page;
96106

@@ -99,7 +109,7 @@ function view($template_only=FALSE)
99109
{
100110
$this->mysmarty->display($this->mysmarty->prefix.$method.".tpl");
101111
exit; //to avoid showing profiler/debug info
102-
}
112+
}
103113
$this->mysmarty->view($method);
104114
}
105115

‎application/core/My_DModel.php

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,11 +119,18 @@ function get_count()
119119
* @param type $entity Docrine Entity object
120120
* @return boolean
121121
*/
122-
function save($entity)
122+
function save($entities)
123123
{
124124
try
125125
{
126-
$this->em->persist($entity);
126+
if(is_array($entities)){
127+
foreach($entities as $entity){
128+
$this->em->persist($entity);
129+
}
130+
}
131+
else{
132+
$this->em->persist($entities);
133+
}
127134
$this->em->flush();
128135
return TRUE;
129136
}

‎application/modules/admin/controllers/message.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ public function __construct()
2323
$this->load->library('app/paginationlib');
2424
$this->load->library("app/mapper");
2525
$this->load->library("app/formvalidator");
26+
$this->load->model("messagemodel");
2627
$this->load->language("message");
2728

2829
}
@@ -138,7 +139,7 @@ public function add()
138139
}
139140

140141
$this->data["action_url"] = base_url()."admin/message/add";
141-
$this->data["message"] = new PdContact();
142+
$this->data["message"] = new PdMessage();
142143
return $this->view();
143144
}
144145
catch (Exception $err)

‎application/modules/myaccount/controllers/user.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public function index()
3939
try
4040
{
4141
//Info of currently logged in user is succefully retrieved
42-
$this->data["user"] = $this->dx_auth->get_username();
42+
$this->meta["user"] = $this->data["user"] = $this->dx_auth->get_username();
4343

4444

4545
return $this->view();

‎application/views/admin/modules/message/details.tpl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
<form action="{$action_url}" method="POST" class="well">
2-
<div class="row">
2+
<div class="row-fluid">
33
<label class="control-label" for="{$message_form.name.field}">{$message_form.name.label}</label><br/>
44
<input type="text" name="{$message_form.name.field}" value="{$message->getName()}" class="required" size="30" />
55
</div>
6-
<div class="row">
6+
<div class="row-fluid">
77
<label class="control-label" for="{$message_form.email.field}">{$message_form.email.label}</label><br/>
88
<input type="text" name="{$message_form.email.field}" value="{$message->getEmail()}" class="required" size="30" />
99
</div>
10-
<div class="row">
10+
<div class="row-fluid">
1111
<label class="control-label" for="{$message_form.subject.field}">{$message_form.subject.label}</label><br/>
1212
<input type="text" name="{$message_form.subject.field}" value="{$message->getSubject()}" class="required" size="30" />
1313
</div>
14-
<div class="row">
14+
<div class="row-fluid">
1515
<label class="control-label" for="{$message_form.message.field}">{$message_form.message.label}</label><br/>
1616
<input type="text" name="{$message_form.message.field}" value="{$message->getMessage()}" class="required" size="30" />
1717
</div>
18-
<div class="row">
19-
<input type="submit" name="submit" value="Save" class="btn btn-success" />&nbsp;<a class="btn btn-info" href="{$base_url}admin/message">Back to message list</a>
18+
<div class="row-fluid">
19+
<input type="submit" name="submit" value="Save" class="btn btn-success" />&nbsp;<a class="btn btn-info pull-right" href="{$base_url}admin/message">Back to message list</a>
2020
</div>
2121
</form>

0 commit comments

Comments
 (0)