.gitmodules resources/public/javascripts/jqwysi @@ -9,7 +9,7 @@ class CMSAdminHomeController extends CMSAdminComponent { public $model; public $model_name = "wildfire_user"; public $model_class = "WildfireUser"; - public $display_name = "Home"; + public $display_name = "Dashboard"; public $base_url; /** * As the home page of the admin area has no sub nav, this clears the links @@ -17,6 +17,8 @@ class CMSAdminHomeController extends CMSAdminComponent { function __construct(){ parent::__construct(); $this->sub_links = array(); + $this->sub_links["../content/create"] = "Create New Content"; + $this->sub_links["../.."] = "View Site"; } /** * protected function that handles the actual db authentication check on first login @@ -48,6 +50,7 @@ class CMSAdminHomeController extends CMSAdminComponent { Session::unset_var('errors'); $this->use_layout = "login"; $this->redirect_url = Session::get('referrer'); + $this->form = new LoginForm; } /** * Clears the session data via a call to the auth object - effectively logging you out @@ -61,12 +64,13 @@ class CMSAdminHomeController extends CMSAdminComponent { * home page - shows statistical summaries **/ public function index() { - $this->stat_links = ($li = CmsConfiguration::get("stat_link_url")) ? $this->parse_xml($li, 5, 'referrer') : array(); - $this->stat_search = ($li = CmsConfiguration::get("stat_search_url")) ? $this->parse_xml($li, 5, 'search') : array(); - $this->stat_dash = ($li = CmsConfiguration::get("stat_dash_url")) ? $this->parse_xml($li, 5, "visit_day") : array(); - $this->link_module = $this->render_partial("stat_links"); - $this->search_module = $this->render_partial("stat_search"); - $this->dash_module = $this->render_partial("stat_dash"); + $general_conf = CmsConfiguration::get("general"); + $this->stats_site_id = $general_conf["statsid"]; + $this->stat_search = unserialize(file_get_contents("http://stats.oneblackbear.com/index.php?module=API&method=Referers.getKeywords&idSite=". $this->stats_site_id."&period=week&date=yesterday&format=PHP&token_auth=ae290d98aa13255678682381827a6862")); + $this->stat_links = unserialize(file_get_contents("http://stats.oneblackbear.com/index.php?module=API&method=Referers.getWebsites&idSite=". $this->stats_site_id."&period=week&date=yesterday&format=PHP&token_auth=ae290d98aa13255678682381827a6862")); + unset($this->sub_links["index"]); + $content = new CmsContent; + $this->recent_content = $content->limit(7)->filter("status < 3")->order("id DESC")->all(); } /** * help pages - content is generated via partials (we really should write some more of these...) lib/controller/CMSAdminHomeController.php @@ -85,7 +85,7 @@ class WildfireFile extends WaxModel { * NOTE: this function exits * @param string $size */ - public function show($size=110){ + public function show($size=110, $compress = false){ $source = PUBLIC_DIR. $this->rpath."/".$this->filename; $extension = File::get_extension($this->filename); $file = CACHE_DIR.$this->id."_".$size . ".".$extension; @@ -105,7 +105,7 @@ class WildfireFile extends WaxModel { } } if(!is_file($file) || !is_readable($file)) { - File::resize_image($source, $file, $size); + File::resize_image($source, $file, $size, $compression); } if($this->image = File::display_image($file) ) { return true; lib/model/WildfireFile.php resources/public/images/.DS_Store resources/public/images/cms/cms-footer-bg.gif resources/public/images/cms/cms_header-bg.gif resources/public/images/cms/cms_wildfire-logo.gif @@ -1,21 +1 @@ /**** Please leave this file empty - it can be overrided by the application ******/ -$(document).ready(function() { - inline_status_change(); -}); - - -function inline_status_change(){ - if($('.status_change').length){ - $('.status_change').click(function(){ - current_status = $(this).attr('rel'); - dest = $(this).attr('href'); - dest = dest.replace('?status=0', '').replace('?status=1', ''); - replace = "#"+this.id; - $.get(dest, {status: current_status, ajax:'yes'}, function(response){ - $(replace).replaceWith(response); - inline_status_change(); - }); - return false; - }); - } -} resources/public/javascripts/cms/cms_application.js @@ -20,4 +20,26 @@ $(document).ready(function() { $("#item_list_container").tableSorter({dateFormat: 'dd/mm/yyyy', highlightClass: 'highlight_col', stripingRowClass: ['item_row1','item_row0'],stripeRowsOnStartUp: true}); } -}); \ No newline at end of file +}); + + +$(document).ready(function() { + inline_status_change(); +}); + + +function inline_status_change(){ + if($('.status_change').length){ + $('.status_change').click(function(){ + current_status = $(this).attr('rel'); + dest = $(this).attr('href'); + dest = dest.replace('?status=0', '').replace('?status=1', ''); + replace = "#"+this.id; + $.get(dest, {status: current_status, ajax:'yes'}, function(response){ + $(replace).replaceWith(response); + inline_status_change(); + }); + return false; + }); + } +} resources/public/javascripts/cms/cms_init.js resources/public/stylesheets/.DS_Store @@ -16,6 +16,9 @@ div, ul, ol { img{ border:0px; } +html { + background:#414141; +} body{ background:#EDEDED; text-align:left; @@ -147,12 +150,11 @@ p{ padding:6px 13px; } #sub-navigation-container ul li a { - color:#111111; line-height:265%; text-decoration:none; + color:white; } #sub-navigation-container ul li a:hover { - font-weight:bold; text-decoration:underline; } @@ -162,13 +164,7 @@ p{ #selected_nav a { background:#DEDEDE url(../../images/cms/cms-navigation-right-tab.gif) no-repeat right top; } -.sub_nav_selected { - background:url(../../images/cms/nav_selected_pointer.gif) no-repeat center bottom; -} -.sub_nav_selected a { - font-weight:bold; - text-decoration:underline; -} + @@ -225,6 +221,7 @@ p{ clear:both; margin-left:40px; width:95%; + margin-bottom:40px; } #files #content{ width:99%; @@ -444,67 +441,26 @@ h4{ } #footer { - color:#444444; - margin-top:60px; - background:url(../../images/cms/cms-footer-bg.gif) repeat-x; - padding:10px 40px 40px 40px; - text-align:right; + color:#e1e1e1; + background:#414141 url(../../images/cms/cms-footer-bg.gif) no-repeat bottom right; + padding:10px 40px 10px 40px; font-size:85%; + border-bottom:2px solid #333; } #footer a { - color:#fbc700; + color:#e1e1e1; font-weight:bold; text-decoration:none; } #footer a:hover { color:#92C905; } +#footer img { + vertical-align:middle; +} -.cms_home_module { - width:30%; - margin:0; - padding:0; - float:left; - margin-right:25px; - font-size:77%; -} -.cms_home_module h3 { - background:#282828; - margin:0 !important; - padding:4px 15px; - color:white; - font-weight:normal; - border:0 !important; - margin-bottom:7px !important; -} -.cms_home_module p { - font-size:107%; -} - -.home_module_line, .graph_line { - padding:0; - margin:5px 0 5px 15px; - float:left; - width:30%; - border:0; -} -.bar_graph, .home_module_value { - background:url(../../images/cms/cms-stat-graph.gif) repeat-x; - height:9px; - float:left; - margin:5px 15px 5px 0; -} -.home_module_value { - background:none; -} -.graph_separator { - clear:both; - border-top:1px solid #D1D1D1; - margin:5px 15px; - padding:0; -} #pagination li { float:left; margin-right:4px; @@ -852,6 +808,7 @@ li.pagination_link a { .form_container fieldset label { margin:0 0 4px 0; display:block; + padding-bottom:5px; } .form_container fieldset .check_box_label, @@ -884,9 +841,9 @@ li.pagination_link a { } .form_container fieldset .input_field { - width:98%; padding:3px 2px; clear:right; + margin-bottom:8px; } .form_container fieldset .select_field { @@ -990,7 +947,7 @@ li.pagination_link a { #primary-navigation { float:left; font-size:100%; - margin:0 0 0 50px; + margin:0 0 0 30px; } #primary-navigation li { display:block; @@ -1000,12 +957,17 @@ li.pagination_link a { line-height:55px; } #primary-navigation li a { - color:#E1E1E1; - text-shadow:#333333 1px 2px 0; + color:#222; + text-shadow:#e1e1e1 1px 1px 0; text-decoration:none; } #primary-navigation li.active { - background:url(../../images/cms/nav_highlight.gif) no-repeat bottom center; + background:#414141; + padding:0 10px; +} +#primary-navigation li.active a { + color:white; + text-shadow:none; } #cms_logo { float:left; @@ -1013,8 +975,8 @@ li.pagination_link a { } #sub-navigation-container { - background:#f0f0f0 url(../../images/cms/subnav_bg.gif) repeat-x bottom center; - border-bottom:1px solid #989898; + background:#414141; + border-bottom:1px solid #000; padding-top:8px; } #submenu { @@ -1028,24 +990,15 @@ li.pagination_link a { } #submenu li a { text-decoration:none; - color:#686868; + color:white; font-size:116%; } #submenu li a:hover { - text-decoration:none !important; - color:#262626; - font-weight:normal; -} -#submenu .sub_nav_selected a { - color:#1A1718; - font-weight:bold; -} -#submenu .sub_nav_selected { - border-bottom:4px solid #989898; - background:none; + text-decoration:underline !important; } + /*** End Wildfire 1.0 Updates **********/ /****** Advanced Uploader Styling *******/ @@ -1226,4 +1179,113 @@ a.edit_img{ } a.edit_img img{ border:1px solid #333; +} + +/* Dashboard styles */ +#dashboard #page-container { + margin:0; +} +#dashboard #content { + width:auto; +} +#dashboard #statistics { + float:right; + background-color:#414141; + padding:3px 15px 20px 15px; + margin-top:-32px; +} +#dashboard #statistics h2 { + color:#d1d1d1; + font-size:161.6%; +} +#dashboard #statistics h3 { + color:#92c2e9; + border:0; + margin-left:0; + margin-top:15px; + margin-bottom:4px; +} +#dashboard #statistics { + color:#f1f1f1; +} +#dashboard #statistics a { + color:#b34744; +} +#dashboard #statistics a:hover {text-decoration:underline;} +#dashboard #statistics .stat_count { + float:left; + width:27%; + font-size:77%; + padding:3px 0; +} +#dashboard #statistics .stat_label { + float:left; + width:65%; + font-size:77%; + padding:3px 0; + font-weight:normal; +} +#dashboard #quick_nav { + margin:20px 0; + background-color:white; + padding:10px 0; + width:250px; + float:left; + margin-top:0px; + +} +#dashboard #quick_nav h3 { + color:#2971a1; + border:0; + margin-bottom:4px; +} +#dashboard #quick_nav p { + color:#454546; + margin-top:0; +} +#dashboard #quick_nav #quick_search { + border-bottom:1px solid #ececeb; + padding:0 10px; + padding-bottom:15px; +} +#dashboard #quick_nav #quick_search img, #dashboard #quick_nav #quick_create img, #dashboard #quick_nav #quick_upload img { + float:left; + margin:0 10px 10px 0; +} +#dashboard .live_search { + background:url(../../images/cms/search_field_bg.gif) no-repeat center right; + border:1px solid #BBB; + padding:3px; + color:#444; +} +#dashboard #quick_nav #quick_create { + border-bottom:1px solid #ececeb; + padding:0 10px; + padding-bottom:15px; +} +#dashboard #quick_nav #quick_upload { + padding:0 10px; + padding-bottom:15px; +} +#dashboard #quick_nav #quick_create_title { + border:1px solid #BBB; + padding:3px; + color:#444; +} +#quick_create_submit { + margin-top:5px; +} +#dashboard #quick_nav a { + font-weight:normal; +} +#dashboard #quick_recent_content { + margin:0px 380px 20px 280px; + padding:10px; + background:white; + margin-top:30px; +} +#dashboard #quick_recent_content h3 { + color:#2971a1; + border:0; + margin-bottom:4px; } \ No newline at end of file resources/public/stylesheets/cms/cms-stylesheet.css @@ -1,39 +1,42 @@ +body { + background:#ebebeb; +} #login_box { - background:#1D3550 url(../../images/cms/login_box_top.gif) no-repeat left top; - width:298px; + background:#414141; margin:100px auto; + text-align:center; } #login_box #logo { - background:url(../../images/cms/cms_login_logo.gif) no-repeat center 20px; - width:298px; - height:80px; + background:url(../../images/cms/wildfire_login_logo.gif) no-repeat center 20px; + height:108px; } #login_box #login_area { - background:#1D3550 url(../../images/cms/login_box_bottom.gif) no-repeat left bottom; text-align:center; - width:258px; padding:0 10px; padding-bottom:15px; + width:300px; + margin:0 auto; } -#login_box[id] #login_area { - width:278px; +#login_box #login_area .form_container { + margin:0; + padding:0; + width:auto; } + #login_box #login_area label { color:white; font-size:85%; margin:0; } .user_messages { - background:#E79D9D; - margin:3px 10px; -} -#login_box .form_container { - margin:3px; - padding:3px; - width:252px; + background:#d02c40; + margin:8px 40px 0 40px; + -webkit-border-radius:3px; + border:0; + color:white; + font-size:100%; } -#login_box[id] .form_container { - width:286px; -} \ No newline at end of file + + resources/public/stylesheets/cms/cms_login.css @@ -4,7 +4,7 @@ */ define("CMS_VERSION", "0.5-devel"); -CMSApplication::register_module("home", array("display_name"=>"Admin Home", "link"=>"/admin/home/", 'dont_display'=>true)); +CMSApplication::register_module("home", array("display_name"=>"Dashboard", "link"=>"/admin/home/")); CMSApplication::register_module("settings", array("display_name"=>"Settings", "link"=>"/admin/settings/")); CMSApplication::register_module("sections", array("display_name"=>"Site Sections", "link"=>"/admin/sections/")); CMSApplication::register_module("categories", array("display_name"=>"Categories", "link"=>"/admin/categories/")); setup.php @@ -9,7 +9,6 @@ var content_permalink="<?=$model->permalink?>"; <?=stylesheet_asset("jquery", "jquery.tabs-ie")?> <![endif]--> <?=javascript_asset("cms","file")?> -<?=javascript_asset("cms","cms_content")?> <div id="container"> <div id="quicksave"> <a href="#" id="autosave"><img src="/images/cms/cms_quick_save.gif" title="Quick Save" /></a> @@ -28,7 +27,7 @@ var content_permalink="<?=$model->permalink?>"; <div id="content_editor" class="clearfix"> <div id="section-1" class="tabs-container"> <fieldset id="wysiwyg"> - <?=large(simple_wysiwyg($model, "content", array(), false))?> + <?=large(text_area($model, "content", array("class"=>"jqwysi"), false))?> </fieldset> </div> <div id="section-2" class="tabs-container"> view/CMSAdminContentController/_form.html @@ -5,7 +5,6 @@ <?=stylesheet_asset("jquery", "jquery.tabs-ie")?> <![endif]--> <?=javascript_asset("cms","file")?> -<?=javascript_asset("cms","cms_content")?> <div id="container"> <ul class="tabs-nav"> view/CMSAdminEmailController/_form.html @@ -12,7 +12,7 @@ <div id="advanced_uploader" class="clearfix"> <h2>Choose Your Files</h2> - <form id="form1" action="" method="post" enctype="multipart/form-data"> + <form id="form1" action="" method="post" enctype="multipart/form-data" onsubmit='set_post_params(); return false;'> <div id="flash_upload"> <div class="flash" id="fsUploadProgress"></div> <div id="divStatus">Click start to upload files</div> @@ -33,7 +33,7 @@ <input type="hidden" name="content_page_type" id="content_page_type" value="<?=$page->table?>" /> <input type="hidden" name="join_field" id="join_field" value="<?=Request::get('join_field')?>" /> </fieldset> - <input type="submit" value="Start Upload" id="start_button" onclick='set_post_params();return false' /> + <input type="submit" value="Start Upload" id="start_button" onclick="" /> </form> view/CMSAdminFileController/upload.html @@ -1,3 +1,94 @@ -<?=$dash_module?> -<?=$link_module?> -<?=$search_module?> \ No newline at end of file +<div id="statistics"> + <h2>Your Site's Performance</h2> + <?if($current_user->id < 4):?> + <h3>Recent Visits and Page Views</h3> + <object type="application/x-shockwave-flash" data="http://stats.oneblackbear.com/libs/open-flash-chart/open-flash-chart.swf" width="350px" height="150px" id="stats"> + <param name="allowScriptAccess" value="sameDomain" /> + <param name="quality" value="high" /> + <param name="bgcolor" value="#444" /> + <param name="wmode" value="transparent" /> + <param name="name" value="VisitsSummarygetLastUniqueVisitorsGraphChart_swf"> + <param name="movie" value="http://stats.oneblackbear.com/libs/open-flash-chart/open-flash-chart.swf" /> + <param name="flashvars" value="data=http%3A%2F%2Fstats.oneblackbear.com%2Findex.php%3Fmodule%3DVisitsSummary%26action%3DgetLastUniqueVisitorsGraph%26idSite%3D<?=$stats_site_id?>%26period%3Dday%26date%3Dlast10%26viewDataTable%3DgenerateDataChartEvolution%26token_auth=ae290d98aa13255678682381827a6862"> + <a title="You must install the Flash Plugin for your Browser in order to view this movie" href="http://www.adobe.com/products/flashplayer/"><img src="http://www.adobe.com/images/shared/product_mnemonics/50x50/flash_player_50x50.gif" alt="placeholder for flash movie" /></a> + </object> + + <?endif?> + <div class="clearfix"></div> + + + <h3>Recent Incoming Links</h3> + <?if(count($stat_links)):?> + <?foreach($stat_links as $link):?> + <div class="stat_count"><strong><?=$link["nb_visits"]?></strong> links from</div> + <div class="stat_label"><a href="http://<?=$link["label"]?>"><?=urldecode($link["label"])?></a></div> + <div class="graph_separator"></div> + <?endforeach?> + <?else:?> + <p><strong>Your site has not yet been setup to track your visitors</strong><br />Your recent incoming links will appear here shortly.</p> + <?endif?> + + <div class="clearfix"></div> + <h3>Recent Search Referrals</h3> + <?if(count($stat_search)):?> + <?foreach($stat_search as $search):?> + <div class="stat_count"><strong><?=$search["nb_visits"]?></strong> searches: </div> + <div class="stat_label"> + <a href="http://google.com/search?q=<?=$search["label"]?>"><?=urldecode($search['label'])?></a> + </div> + <div class="graph_separator"></div> + <?endforeach?> + <?else:?> + <p><strong>Your site has not yet been setup to track your visitors</strong><br />Your recent search engine referrals will appear here shortly.</p> + <?endif?> +</div> +<div id="quick_nav"> + <div id="quick_search"> + <img src="/images/cms/quick_search_icon.gif" /> + <h3>Quick Content Finder</h3> + <p>Start typing and results will start to appear:</p> + <form action="" method="get" accept-charset="utf-8"> + <input type="text" value="Search" class="live_search" /> + </form> + </div> + <div id="quick_create"> + <img src="/images/cms/quick_create_icon.gif" /> + <h3>Start Creating Content</h3> + <form action="" method="get" accept-charset="utf-8"> + <input type="text" value="Title" id="quick_create_title" /> + <input type="image" src="/images/cms/quick_create_button.gif" id="quick_create_submit" /> + </form> + </div> + <div id="quick_upload"> + <a href="/admin/files/"><img src="/images/cms/quick_upload_icon.gif" /> + <h3>Start Uploading Files</h3> + <p>Click here to upload upload images, documents and other files.</p> + </a> + </div> +</div> +<div id="quick_content_column"> + <div id="quick_recent_content"> + <h3>Recent Content</h3> + <table id="item_list_container" class="sortable"> + <tbody id="list_rows"> + <?foreach($recent_content as $row):?> + <tr id="row_<?=$row->id?>"> + <td class="column"> + <span class="status_change_span"> + <?if($row->is_published()):?> + <a href="./status/<?=$row->id?>?status=0" id="a_<?=$row->id?>" class="status_change" rel="0" title="Published"><img src="/images/cms/icon_published.gif" width="12" class="status_icon" /></a> + <?else:?> + <a href="./status/<?=$row->id?>?status=1" id="a_<?=$row->id?>" class="status_change" rel="1" title="Draft"><span><img src="/images/cms/icon_draft.gif" width="12" class="status_icon" /></a> + <?endif?> + </span> + <?=link_to($row->title, array("action"=>"edit", "id"=>$row->id))?> + </td> + <td class="column last"> + <div class="generic_button"><?=link_to("Edit", array("action"=>"edit", "id"=>$row->id))?></div> + </td> + </tr> + <?endforeach?> + </tbody> + </table> + </div> +</div> \ No newline at end of file view/CMSAdminHomeController/index.html @@ -14,10 +14,16 @@ </td> </tr> <tr> - <td><label for="email">Google Maps API Key</label></td> + <td><label for="email">Stats Site ID</label></td> <td> - <input id="googlekey" name="general[googlekey]" type="text" value="<?=$general["googlekey"]?>" /> - <p>Set if you want to use maps on the site</p> + <input id="statsid" name="general[statsid]" type="text" value="<?=$general["statsid"]?>" /> + <p>Pulls in the statistics for the home page</p> + </td> + </tr> + <tr> + <td><label for="email">Campaign Monitor API Key</label></td> + <td> + <input id="email" name="general[campaign_monitor_apikey]" type="text" value="<?=$general["campaign_monitor_apikey"]?>" /> </td> </tr> <tr> view/CMSAdminSettingsController/general.html @@ -5,16 +5,6 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> <?=stylesheet_asset('cms','reset-fonts-grids')?> - - <?=javascript_asset("jquery", "jquery.1.2.6")?> - <?=javascript_asset("jquery", "jquery.modal")?> - <?=javascript_asset("jquery", "jquery.interface")?> - <?=javascript_asset("jquery", "jquery.form")?> - <?=javascript_asset("jquery", "jquery.resize")?> - <?=javascript_asset("jquery", "jquery.effects")?> - <?=javascript_asset("cms", "widgEditor")?> - <?=javascript_asset("cms", "cms_init")?> - <?=javascript_asset("cms", "cms_application")?> <?=stylesheet_asset('jquery','jquery.modal')?> <?=stylesheet_asset('cms','cms-stylesheet')?> <?=stylesheet_asset('cms','wysiwyg-styles')?> @@ -22,6 +12,22 @@ <!--[if IE]> <?=stylesheet_asset('cms','ie_cms')?> <![endif]--> + + <script src="http://www.google.com/jsapi"></script> + <script> + google.load("jquery", "1.2.6"); + google.load("jqueryui", "1"); + </script> + <?=javascript_asset("jquery", "jquery.tablesort")?> + <?=javascript_asset("jquery", "jquery.modal")?> + <?=javascript_asset("jquery", "jquery.hint")?> + <?=javascript_asset("cms", "widgEditor")?> + <script type="text/javascript" charset="utf-8" src="/javascripts/jqwysi/src/wymeditor/jquery.wymeditor.js"></script> + <?=javascript_asset("", "widgEditor")?> + <?=javascript_asset("cms", "cms_init")?> + <?=javascript_asset("cms", "wildfire_".strtolower(WXInflections::underscore($display_name)))?> + <?=javascript_asset("cms", "cms_application")?> + <title>Content Management System</title> </head> @@ -42,7 +48,6 @@ <?if($sub_links):?> <div id="sub-navigation-container"> <ul id="submenu" class="clearfix"> - <li<?if($action=="index"):?> class="sub_nav_selected"<?endif?>><?=link_to("Index", array("action"=>"index"))?></li> <?foreach($sub_links as $sub_link=>$text):?> <?$class=""?> <?if($sub_link==$action || $sub_link==$type) $class="sub_nav_selected"?> @@ -58,7 +63,9 @@ <?=$content_for_layout?> </div> </div> - <div id="footer">Powered by <a href="http://php-wax.com/">PHP-WAX CMS</a> build <?=constant("CMS_VERSION")?></div> + <div id="footer"> + <img src="/images/cms/wildfire_footer_logo.gif" /> Powered by Wildfire Web Content Manager and held together nicely by the + <img src="/images/cms/wax_footer_logo.gif" /> framework. Wildfire Build <?=constant("CMS_VERSION")?></div> <div class="jqmWindow" id="preview_pane"> Loading please wait... </div> view/layouts/admin.html @@ -7,20 +7,16 @@ <?=stylesheet_asset('cms','reset-fonts-grids')?> <?=stylesheet_asset('cms','cms-stylesheet')?> <?=stylesheet_asset('cms','cms_login')?> + <?=javascript_asset('jquery','jquery.1.2.6.js')?> + <?=javascript_asset('jquery','jquery.hint.js')?> + <?=javascript_asset('cms','cms_login')?> <title>Wildfire Web Content Manager Login</title> </head> -<body> +<body id="login"> <div id="login_box"> - <div id="heading-login"> - <div id="logo"> - <h6>Wildfire web content management</h6> - </div> - - </div> - <div id="login_area"> - + <div id="logo"><h6>Wildfire web content management</h6></div> <?=info_messages()?> <?=$content_for_layout?> </div> view/layouts/login.html @@ -1,9 +1,9 @@ <form action="" name="loginForm" method="post" class="form_container"> <fieldset> - <?=large(text_field_tag("username"))?> - <?=form_divider()?> - <?=large(password_field_tag("password"))?> - <?=form_divider()?> - <?=large(submit_tag("Login"))?> + <?foreach($form->elements as $el):?> + <?=$el->render()?> + <?endforeach?> + <hr /> + <input type="image" src="/images/cms/login_button.gif" /> </fieldset> </form> \ No newline at end of file view/shared/login.html resources/public/images/cms/cms-folder-icon.gif resources/public/javascripts/cms/cms_content.js view/CMSAdminHomeController/_stat_dash.html view/CMSAdminHomeController/_stat_links.html view/CMSAdminHomeController/_stat_search.html 5e7552d3ce8b818f55e92b38aae9f2b94664dcbb Ross Riley ross@oneblackbear.com http://github.com/phpwax/wildfire/commit/4ef09378d6933152838d48140c12471c7190159b 4ef09378d6933152838d48140c12471c7190159b 2009-04-08T11:03:38-07:00 2009-04-08T11:03:38-07:00 work on new v2 branch 9b2714a96f60e6728eb0c390c0f502097dacb59d Ross Riley ross@oneblackbear.com