From: Alex Sadleir Date: Tue, 31 Dec 2013 15:35:03 +0000 Subject: fix import of bulleted lists X-Git-Url: https://maxious.lambdacomplex.org/git/?p=dcaas.git&a=commitdiff&h=1ad57b3b966827ac848a9765499f030df93dc684 --- fix import of bulleted lists --- --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,7 @@ [submodule "js/dynatable"] path = js/dynatable url = https://github.com/JangoSteve/jquery-dynatable.git +[submodule "lib/tag-cloud"] + path = lib/tag-cloud + url = https://github.com/lotsofcode/tag-cloud.git --- /dev/null +++ b/.idea/.name @@ -1,1 +1,1 @@ - +dcaas --- /dev/null +++ b/.idea/compiler.xml @@ -1,1 +1,24 @@ + + + + + + --- /dev/null +++ b/.idea/encodings.xml @@ -1,1 +1,6 @@ + + + + + --- /dev/null +++ b/.idea/misc.xml @@ -1,1 +1,8 @@ + + + + + + + --- /dev/null +++ b/.idea/modules.xml @@ -1,1 +1,10 @@ + + + + + + + + + --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -1,1 +1,5 @@ - + + + + --- /dev/null +++ b/.idea/vcs.xml @@ -1,1 +1,8 @@ + + + + + + + --- /dev/null +++ b/.idea/workspace.xml @@ -1,1 +1,612 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + localhost + 5050 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + --- a/README.md +++ b/README.md --- /dev/null +++ b/about.php @@ -1,1 +1,11 @@ - + +

About

+Icon "Cloud Computing" designed by Andrew Forrester from the Noun Project +setAttribute(PDO::ATTR_ERRMODE, + PDO::ERRMODE_EXCEPTION); +} catch (PDOException $e) { + // Print PDOException message + echo $e->getMessage(); +} +function local_url() +{ + return "http://" . $_SERVER['HTTP_HOST'] . rtrim(dirname($_SERVER['PHP_SELF']), '/\\') . "/"; +} + +function includeHeader($title) +{ + ?> + + + + + + + + + + + <?= $title ?> + + + + + + + + + + + + + + + + + + + + + +

+
+
+
+getMessage(); + } + ?> + +

+ + +query("select count(*) from dcaas_services")->fetch(PDO::FETCH_NUM); +$query_total = $db->query("select count(*) ".$query)->fetch(PDO::FETCH_NUM); +/* http://www.sqlite.org/lang_select.html +Instead of a separate OFFSET clause, the LIMIT clause may specify two scalar expressions separated by a comma. +In this case, the first expression is used as the OFFSET expression and the second as the LIMIT expression. +This is counter-intuitive, as when using the OFFSET clause the second of the two expressions is the OFFSET +and the first the LIMIT. This is intentional - it maximizes compatibility with other SQL database systems.*/ +$limit = "limit $offset, $perPage"; + +foreach ($db->query($select_columns .$query . " order by $sortby $limit", PDO::FETCH_ASSOC) as $row) { + $row['service'] = '' . $row['service_name'] . ""; + $result['records'][] = $row; +} +$result['queryRecordCount'] = intval($query_total[0]); +$result['totalRecordCount'] = intval($total[0]); +echo json_encode($result); +?> --- a/data/DCaaS+Catalogue+September+2013 PublicDCaaS_AFI_Part_3_Sec_5_Service_.csv +++ b/data/DCaaS+Catalogue+September+2013 PublicDCaaS_AFI_Part_3_Sec_5_Service_.csv @@ -9,7 +9,7 @@ 4D - Digital (Digest) Data Design,67060937171,ICT Services Continuity,"Your critical systems can be duplicated at 4D's premises for recovery in the event of a disaster.In the event of a disaster at your facility, your staff will be able to continue work from anywhere that they have an internet connection, by remotely connecting to their services and applications within the 4D datacentre. Where Microsoft software is required agencies prescribed to the Microsoft Volume Sourcing Agreement are required to supply the required software licenses.",IaaS,Disaster Recovery,,24 X 7 X 365,,0.999,> 2 Hours,Protected,Supplier Only,Supplier Only,24 X 7 X 365,Yes,Off,Yes,Off,Yes,Off,Yes,Off,Yes,Off,Yes,Yes,Off,Yes,Off,Off,Off,Yes,Off,Yes,> 1 Month,> 1 Month,"A virtual server with 1 CPU core, 2GBytes RAM running on Windows 2008 R2 plus a Microsoft SQL Server instance with 100 GByte of storage.",Australia,ACT,Marginally above 1.0 (4D uses free air cooling in its datacentre),Self assessed - Tier 2+. Willing to be certified by Uptime Institute if required.,,,,,,,,,,,,,,,, 4D - Digital (Digest) Data Design,67060937171,Online Backups,"Automated remote backup service that backs up your important business data to 4D's secure datacentre. Data is backed up at the block level. Any backed up file can be restored upon request or by the client.A once-off setup sees 4D taking a snapshot of your data and placing it in our datacentre. Nightly backups then send only the changes to your data (ie. the ""Delta"") securely across the internet to 4D. Backups are encrypted and compressed. Where Microsoft software is required agencies prescribed to the Microsoft Volume Sourcing Agreement are required to supply the required software licenses.",IaaS,Backup Services,,24 X 7 X 365,,0.999,> 2 Hours,Protected,Supplier or Customer Admin,Supplier Only,24 X 7 X 365,Yes,Off,Yes,Off,Yes,Off,Yes,Off,Yes,Off,Yes,Yes,Off,Yes,Off,Off,Off,Yes,Off,Yes,> 1 week,> 60 mins,1GB of compressed backed-up data,Australia,ACT,Marginally above 1.0 (4D uses free air cooling in its datacentre),Self assessed - Tier 2+. Willing to be certified by Uptime Institute if required.,,,,,,,,,,,,,,,, 4D - Digital (Digest) Data Design,67060937171,Physical Server,"Dell PowerEdge T610 with single processor, 16GB RAM, 4 x 500GB HDD, Windows Server 2008 R2.Includes technical support for physical server and operating system.Note that different configurations are available if required. Where Microsoft software is required agencies prescribed to the Microsoft Volume Sourcing Agreement are required to supply the required software licenses.",IaaS,Physical Server,,24 X 7 X 365,,0.999,> 2 Hours,Protected,Supplier Only,Supplier and Agency,24 X 7 X 365,Yes,Off,Yes,Off,Yes,Off,Yes,Off,Yes,Off,Yes,Yes,Off,Yes,Off,Off,Off,Yes,Off,Yes,> 1 Month,> 1 week,Per server,Australia,ACT,Marginally above 1.0 (4D uses free air cooling in its datacentre),Self assessed - Tier 2+. Willing to be certified by Uptime Institute if required.,,,,,,,,,,,,,,,, -4D - Digital (Digest) Data Design,67060937171,Test and Development Environment,Provision of virtual environment hosting user test and development environments allowing clients 24x7 access. Environment consists of a Microsoft Windows Server 2008 R2 virtual server hosting Microsoft Studio and allowing clients to install their test and development applications as required. Where Microsoft software is required agencies prescribed to the Microsoft Volume Sourcing Agreement are required to supply the required software licenses.,IaaS,Dev Test,,24 X 7 X 365,,0.999,> 2 Hours,Protected,Supplier or Customer Admin,Supplier and Agency,24 X 7 X 365,Yes,Off,Yes,Off,Yes,Off,Yes,Off,Yes,Off,Yes,Yes,Off,Yes,Off,Off,Off,Yes,Off,Yes,> 60 min,> 60 mins,Test and development environment for up to seven users. ,Australia,ACT,Marginally above 1.0 (4D uses free air cooling in its datacentre),Self assessed - Tier 2+. Willing to be certified by Uptime Institute if required.,,,,,,,,,,,,,,,, +4D - Digital (Digest) Data Design,67060937171,Test and Development Environment,Provision of virtual environment hosting user test and development environments allowing clients 24x7 access. Environment consists of a Microsoft Windows Server 2008 R2 virtual server hosting Microsoft Studio and allowing clients to install their test and development applications as required. Where Microsoft software is required agencies prescribed to the Microsoft Volume Sourcing Agreement are required to supply the required software licenses.,IaaS,Dev Test,,24 X 7 X 365,,0.999,> 2 Hours,Protected,Supplier or Customer Admin,Supplier and Agency,24 X 7 X 365,Yes,Off,Yes,Off,Yes,Off,Yes,Off,Yes,Off,Yes,Yes,Off,Yes,Off,Off,Off,Yes,Off,Yes,> 60 min,> 60 mins,Test and development environment for up to seven users.,Australia,ACT,Marginally above 1.0 (4D uses free air cooling in its datacentre),Self assessed - Tier 2+. Willing to be certified by Uptime Institute if required.,,,,,,,,,,,,,,,, 4D - Digital (Digest) Data Design,67060937171,Unified Communications,"Based on Microsoft Lync server. Comprises:Instant messaging and presence, conferencing, enterprise voice, office integration and mobile applications. Where Microsoft software is required agencies prescribed to the Microsoft Volume Sourcing Agreement are required to supply the required software licenses.",IaaS,Instant Messaging,,24 X 7 X 365,,0.999,> 2 Hours,Protected,Supplier or Customer Admin,Supplier and Agency,24 X 7 X 365,Yes,Off,Yes,Off,Yes,Off,Yes,Off,Yes,Off,Yes,Yes,Off,Yes,Off,Off,Off,Yes,Off,Yes,> 1 week,> 1 week,Virtual unified communications server and ten users.,Australia,ACT,Marginally above 1.0 (4D uses free air cooling in its datacentre),Self assessed - Tier 2+. Willing to be certified by Uptime Institute if required.,,,,,,,,,,,,,,,, 4D - Digital (Digest) Data Design,67060937171,Virtual Server,"4D offers a complete Virtual Server solution to clients, allowing them 24x7 access to their business applications from anywhere in the world that they have an internet connection.Each virtual server will be based on Microsoft Windows Server 2008 R2.This virtual server can be configured, and applications installed, as required; 4D can assist in this setup and installation if required. Where Microsoft software is required agencies prescribed to the Microsoft Volume Sourcing Agreement are required to supply the required software licenses.",IaaS,Virtual Server,,24 X 7 X 365,,0.999,> 2 Hours,Protected,Supplier or Customer Admin,Supplier and Agency,24 X 7 X 365,Yes,Off,Yes,Off,Yes,Off,Yes,Off,Yes,Off,Yes,Yes,Off,Yes,Off,Off,Off,Yes,Off,Yes,> 60 min,> 60 mins,"Virtual Server: includes 1 CPU core, 2GB RAM, and 100GB storage running on Windows 2008 R2. Additional storage can be purchased per the data storage service.",Australia,ACT,Marginally above 1.0 (4D uses free air cooling in its datacentre),Self assessed - Tier 2+. Willing to be certified by Uptime Institute if required.,,,,,,,,,,,,,,,, AAPT Pty Ltd,22052082416,virtual Data Centre / vInfrastructure - Backup Services,"AAPT's virtual Data Centre delivers a suite of secure, high availability cloud computing environments, comprising AAPT owned and operated servers, storage and networking equipment, hosted across geographically diverse managed data centres. AAPT's virtual Data Centre services are directly accessible over AAPT's high speed carrier-grade private network, or the public Internet.AAPT's vInfrastructure product provides a highly scalable environment comprising of fully customer configurable Cloud Computing resources, CPU, RAM along with Storage and a range of Backup options all managed through VMWare's vCloud Director management tool.AAPT operate dual CO and Data Centre capabilities within the same facility to maximise the customers access to all network services.",IaaS,Backup Services,,24 X 7 X 365,,0.9999,> 2 Hours,NA,Supplier or Customer Admin,Supplier Only,24 X 7 X 365,Yes,Yes,Yes,Off,Yes,Yes,Yes,Off,Yes,Yes,Yes,Off,Off,Yes,Off,Yes,Yes,Yes,Yes,Off,> 60 min,> 60 mins,"Resource Unit:1GB RAM, 1GHz CPU, 50GB Storage, 50GB Backup Storage",Australia,NSW,>2,2.0,Australia,NSW,>2,2.0,Australia,VIC,>2,2.0,,,,,,,, @@ -45,7 +45,7 @@ Bulletproof Networks Pty Ltd,84094558808,Managed Enterprise Silver,"Dedicated Virtual Machine Hosting
CPU: Dual Core
RAM: 6GB
HDD: 80GB Fibre Channel
10GB Inbound Data, Unmetered Outbound",Managed Service,Virtual Server,,24 X 7 X 365,,0.9999,> 2 Hours,NA,Supplier Only,Supplier Only,24 X 7 X 365,Yes,Yes,Yes,Off,Yes,Off,Yes,Off,Yes,Off,Yes,Yes,Off,Yes,Yes,Yes,Yes,Off,Yes,Yes,> 1 week,> 1 Month,Managed Enterprise Silver Dedicated VM Server,Australia,New South Wales,1.8,3+,,,,,,,,,,,,,,,, Bulletproof Networks Pty Ltd,84094558808,Managed Gold,"Dedicated Virtual Machine Hosting
CPU: Dual Core
RAM: 6GB
HDD: 100GB Fibre Channel
15GB Inbound Data, Unmetered Outbound",Managed Service,Virtual Server,,24 X 7 X 365,,0.9999,> 2 Hours,NA,Supplier Only,Supplier Only,24 X 7 X 365,Yes,Yes,Yes,Off,Yes,Off,Yes,Off,Yes,Off,Yes,Yes,Off,Yes,Yes,Yes,Yes,Off,Yes,Yes,> 1 week,> 1 Month,Managed Gold Dedicated VM Server,Australia,New South Wales,1.8,3+,,,,,,,,,,,,,,,, Bulletproof Networks Pty Ltd,84094558808,Managed Silver,"Dedicated Virtual Machine Hosting
CPU: Dual Core
RAM: 4GB
HDD: 80GB Fibre Channel
10GB Inbound Data, Unmetered Outbound",Managed Service,Virtual Server,,24 X 7 X 365,,0.9999,> 2 Hours,NA,Supplier Only,Supplier Only,24 X 7 X 365,Yes,Yes,Yes,Off,Yes,Off,Yes,Off,Yes,Off,Yes,Yes,Off,Yes,Yes,Yes,Yes,Off,Yes,Yes,> 1 week,> 1 Month,Managed Silver Dedicated VM Server,Australia,New South Wales,1.8,3+,,,,,,,,,,,,,,,, -C3 Business Solutions Pty Ltd,35122885465,C3 Insight,"C3 Insight is a complete, affordable data acquisition and reporting solution that is quick and easy to install and use. C3 Insight immediately addresses data governance challenges with a robust business rule engine that you can tailor to your specific requirements upfront. C3 Insight enables you to unlock the power of your data instantly with no downtime and no deep technical skills required. File load formats are completely flexible and include an MSExcel add-in. Already in use across both State and Federal government agencies, C3 Insight is fast and easy to set up and run, it will reduce the cost of data acquisition and reporting and will deliver immediate ROI and trusted information for your business.

Data governance, acquisition & validation continues to challenge government at all levels, particularly when the data is coming from other departments or outside agencies and sources. Getting the data together and getting it accurate and collated when you need it absorbs considerable budget, time and resources. And, even when the investment is made, there are often questions around data quality due to poor or non-existent governance processes. All that time and effort and still, no one trusts the data.

Streamlining and automating these processes is key to maximising efficiency and turning the swathes of government data currently sitting in individual agencies, departments and divisions into collated, useful, timely information for more informed decision making.

Already in use across both State and Federal government agencies, C3 Insight is fast and easy to set up and run, it will reduce the cost of data acquisition and reporting and will deliver immediate ROI and trusted information for your business.

See your business / organisation at a glance. Combine all the data you need, from multiple data sources, into personalised real-time dashboards. C3 Insights interactive dashboards let you filter, drill to detail, and analyse right in a browser. With C3 Insight, you can go from data to dashboards in just hours; not days, weeks or months.

Imagine connecting the data, people, and creativity of your organisation to help everyone make better business decisions. With C3 Insight you can. We do this by facilitating discussions and making your BI content incredibly easy to share. Embed your intelligence into wikis and company intranet for everyone to use and access.

You will love C3 Insights mobile app. It combines outstanding collaborative features with great usability - simply swipe to browse dashboards and reports, filter with a tap of a finger, or pinch and zoom. Our approach means that as soon as you create a report or dashboard, it's enabled on your favourite mobile device - no extra steps or development.

Real-time alerts let you know the moment something critical happens in your business. With C3 Insight it's so easy to create alerts that monitor your business data for you. Reports emailed, or alerts pushed, to your phone or iPad let you take immediate action.

Data visualisation is not only a great way to present your data, but a powerful way to explore your data as well. C3 Insight lets you pick and change visualisations effortlessly so you can spot outliers and trends with ease. With 44 chart types - from sophisticated trellis charts, to popular line and metre charts - the right visualisation is just a click away.

Data visualisation is not only a great way to present your data, but a powerful way to explore your data as well. C3 Insight lets you pick and change visualisations effortlessly so you can spot outliers and trends with ease. With 44 chart types - from sophisticated trellis charts, to popular line and metre charts - the right visualisation is just a click away.

Data analysis requires more than just basic filtering - you need to be able to explore your data. C3 Insights highly intuitive report builder lets you analyse your data in ways you didnt think possible. Drill Down, Drill Through or Drill Anywhere - even across multiple data sources. We dont put barriers between you and your data exploration.

C3 Insight is different. Unlike most BI products, we deliver all the BI functionality you need via a single-integrated platform. C3 Insight can be installed in an hour, and deployed to 1000s of users in seconds. From meta-data to dashboards, user security and scheduling, youll only ever interact with the one application. C3 Insight significantly reduces your training, deployment and administration costs.
", ,Business Intelligence,,24 X 7 X 365,,0.999,> 2 Hours,NA,Supplier or Customer Admin,Agency Only,24 X 7 Bus Ex Hols,Yes,Off,Yes,,Yes,,Yes,,Yes,Off,Yes,Yes,,Yes,Off,,Yes,,Yes,Yes,> 1 week,> 1 week,Per instance,Australia,NSW,1.85,3.0,Australia,NSW,1.85,2.0,,,,,,,,,,,, +C3 Business Solutions Pty Ltd,35122885465,C3 Insight,"C3 Insight is a complete, affordable data acquisition and reporting solution that is quick and easy to install and use. C3 Insight immediately addresses data governance challenges with a robust business rule engine that you can tailor to your specific requirements upfront. C3 Insight enables you to unlock the power of your data instantly with no downtime and no deep technical skills required. File load formats are completely flexible and include an MSExcel add-in. Already in use across both State and Federal government agencies, C3 Insight is fast and easy to set up and run, it will reduce the cost of data acquisition and reporting and will deliver immediate ROI and trusted information for your business.

Data governance, acquisition & validation continues to challenge government at all levels, particularly when the data is coming from other departments or outside agencies and sources. Getting the data together and getting it accurate and collated when you need it absorbs considerable budget, time and resources. And, even when the investment is made, there are often questions around data quality due to poor or non-existent governance processes. All that time and effort and still, no one trusts the data.

Streamlining and automating these processes is key to maximising efficiency and turning the swathes of government data currently sitting in individual agencies, departments and divisions into collated, useful, timely information for more informed decision making.

Already in use across both State and Federal government agencies, C3 Insight is fast and easy to set up and run, it will reduce the cost of data acquisition and reporting and will deliver immediate ROI and trusted information for your business.

See your business / organisation at a glance. Combine all the data you need, from multiple data sources, into personalised real-time dashboards. C3 Insights interactive dashboards let you filter, drill to detail, and analyse right in a browser. With C3 Insight, you can go from data to dashboards in just hours; not days, weeks or months.

Imagine connecting the data, people, and creativity of your organisation to help everyone make better business decisions. With C3 Insight you can. We do this by facilitating discussions and making your BI content incredibly easy to share. Embed your intelligence into wikis and company intranet for everyone to use and access.

You will love C3 Insights mobile app. It combines outstanding collaborative features with great usability - simply swipe to browse dashboards and reports, filter with a tap of a finger, or pinch and zoom. Our approach means that as soon as you create a report or dashboard, it's enabled on your favourite mobile device - no extra steps or development.

Real-time alerts let you know the moment something critical happens in your business. With C3 Insight it's so easy to create alerts that monitor your business data for you. Reports emailed, or alerts pushed, to your phone or iPad let you take immediate action.

Data visualisation is not only a great way to present your data, but a powerful way to explore your data as well. C3 Insight lets you pick and change visualisations effortlessly so you can spot outliers and trends with ease. With 44 chart types - from sophisticated trellis charts, to popular line and metre charts - the right visualisation is just a click away.

Data visualisation is not only a great way to present your data, but a powerful way to explore your data as well. C3 Insight lets you pick and change visualisations effortlessly so you can spot outliers and trends with ease. With 44 chart types - from sophisticated trellis charts, to popular line and metre charts - the right visualisation is just a click away.

Data analysis requires more than just basic filtering - you need to be able to explore your data. C3 Insights highly intuitive report builder lets you analyse your data in ways you didnt think possible. Drill Down, Drill Through or Drill Anywhere - even across multiple data sources. We dont put barriers between you and your data exploration.

C3 Insight is different. Unlike most BI products, we deliver all the BI functionality you need via a single-integrated platform. C3 Insight can be